From 12a61f1331f5488544858daccbcd57dbc42788f0 Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Fri, 11 Nov 2022 11:46:22 +0300 Subject: [PATCH 1/2] svg styling --- public/css/app.css | 2 +- resources/assets/sass/app.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/css/app.css b/public/css/app.css index 9fcc9e415..e953b3f3b 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -1399,7 +1399,7 @@ input[type=file]::file-selector-button:hover{ background-color: #DCE2F9; } -.menu-list svg { +.menu-list ul svg { width: 22px; height: 24px; fill: none; diff --git a/resources/assets/sass/app.css b/resources/assets/sass/app.css index a1c665be5..14cac23fe 100644 --- a/resources/assets/sass/app.css +++ b/resources/assets/sass/app.css @@ -93,7 +93,7 @@ background-color: #DCE2F9; } - .menu-list svg { + .menu-list ul svg { width: 22px; height: 24px; fill: none; From d64353d656e20d3009566f569d9cebe10a20c3fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Mon, 14 Nov 2022 00:20:04 +0300 Subject: [PATCH 2/2] prevent errors for recurring #33kfqf6 --- app/Traits/Recurring.php | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/app/Traits/Recurring.php b/app/Traits/Recurring.php index ad347f6b2..73db91340 100644 --- a/app/Traits/Recurring.php +++ b/app/Traits/Recurring.php @@ -188,7 +188,11 @@ trait Recurring return false; } - return $schedule->current()->getStart(); + if (! $current = $schedule->current()) { + return false; + } + + return $current->getStart(); } public function getNextRecurring() @@ -210,7 +214,11 @@ trait Recurring return false; } - return $schedule->first()->getStart(); + if (! $first = $schedule->first()) { + return false; + } + + return $first->getStart(); } public function getLastRecurring() @@ -219,6 +227,10 @@ trait Recurring return false; } - return $schedule->last()->getStart(); + if (! $last = $schedule->last()) { + return false; + } + + return $last->getStart(); } }