Compare commits

..

3 Commits

Author SHA1 Message Date
Deon George
dd64cba897 Tweak Brand Logo 2021-11-03 13:03:50 +11:00
Deon George
8093eb8b72 Remove id from <a>, not required 2021-10-18 12:55:17 +11:00
Deon George
af1ea1b5fd Add addHalf()/subHalf() functions 2021-10-12 14:40:34 +11:00
3 changed files with 24 additions and 4 deletions

View File

@@ -46,7 +46,7 @@
<div class="dropdown-divider"></div>
@if ($user->switched)
<a href="{{ url('/admin/switch/stop') }}" class="dropdown-item" id="switch">
<a href="{{ url('/admin/switch/stop') }}" class="dropdown-item">
<i class="fas fa-sign-out-alt mr-2"></i> {{ trans('adminlte_lang::message.switchoff') }}
</a>
@else

View File

@@ -2,7 +2,7 @@
<aside class="main-sidebar sidebar-dark-primary elevation-4 d-print-none">
<!-- Brand Logo -->
<a href="{{ url('home') }}" class="brand-link">
<img src="{{ asset('img/logo.png') }}" alt="Logo" class="brand-image">
<img src="{{ asset('img/logo.png') }}" alt="Logo" style="margin-left: 0; padding: 5px;" class="brand-image">
<span class="brand-text font-weight-light">{!! config('app.name_html_long','<b>App</b>Name') !!}</span>
</a>

View File

@@ -19,14 +19,34 @@ class Carbon extends CarbonBase
case 'half':
return (int) ceil($this->month / static::MONTHS_PER_HALF);
case 'quarter_string':
return sprintf('%dQ%d',$this->year,$this->quarter);
case 'quarter_string':
return sprintf('%dQ%d',$this->year,$this->quarter);
default:
return parent::__get($name);
}
}
public function addHalf(): self
{
return $this->addHalves(1);
}
public function addHalves(int $unit): self
{
return $this->addQuarters(2*$unit);
}
public function subHalf(): self
{
return $this->subHalves(1);
}
public function subHalves(int $unit): self
{
return $this->subQuarters(2*$unit);
}
/**
* Modify to the first occurrence of a given day of the week
* in the current quarter. If no dayOfWeek is provided, modify to the