diff --git a/skolehjem/app/Http/Controllers/WashingReservationController.php b/skolehjem/app/Http/Controllers/WashingReservationController.php index f0ff297..afbcf38 100644 --- a/skolehjem/app/Http/Controllers/WashingReservationController.php +++ b/skolehjem/app/Http/Controllers/WashingReservationController.php @@ -153,7 +153,10 @@ class WashingReservationController extends Controller $reservations = WashingReservation::query()->paginate( 20); - return redirect()->route("washing-reservations.index", [ "reservations" => $reservations]); + if(app('router')->getRoutes()->match(app('request')->create(url()->previous()))->getName() == "washing-reservations.appindex") + return redirect()->route("washing-reservations.appindex"); + else + return redirect()->route("washing-reservations.index", [ "reservations" => $reservations]); } public function api(Request $request){ diff --git a/skolehjem/public/css/admin.css b/skolehjem/public/css/admin.css index dffabea..8651d77 100644 --- a/skolehjem/public/css/admin.css +++ b/skolehjem/public/css/admin.css @@ -6599,8 +6599,9 @@ header { .brand { width: calc(15% - 2rem); - padding: 0 1rem 0 1rem; + padding: 0.5rem 1rem; min-width: calc(194px - 2rem); + height: calc(100% - 1rem); } main { diff --git a/skolehjem/public/images/icons/facebook-icon.png b/skolehjem/public/images/icons/facebook-icon.png index a3a6cdd..d25dd32 100644 Binary files a/skolehjem/public/images/icons/facebook-icon.png and b/skolehjem/public/images/icons/facebook-icon.png differ diff --git a/skolehjem/public/images/icons/instagram.png b/skolehjem/public/images/icons/instagram.png index 4be2809..893aab6 100644 Binary files a/skolehjem/public/images/icons/instagram.png and b/skolehjem/public/images/icons/instagram.png differ diff --git a/skolehjem/public/images/icons/yt.png b/skolehjem/public/images/icons/yt.png index b01ee11..71ef8fd 100644 Binary files a/skolehjem/public/images/icons/yt.png and b/skolehjem/public/images/icons/yt.png differ diff --git a/skolehjem/resources/sass/admin/header/header.scss b/skolehjem/resources/sass/admin/header/header.scss index 11eb69f..95fb783 100644 --- a/skolehjem/resources/sass/admin/header/header.scss +++ b/skolehjem/resources/sass/admin/header/header.scss @@ -4,8 +4,9 @@ header { .brand { width: calc(15% - 2rem); - padding: 0 1rem 0 1rem; + padding: 0.5rem 1rem; min-width: calc(194px - 2rem); + height: calc(100% - 1rem); } main { diff --git a/skolehjem/resources/views/admin/layout/header.blade.php b/skolehjem/resources/views/admin/layout/header.blade.php index dcc6af3..77e6157 100644 --- a/skolehjem/resources/views/admin/layout/header.blade.php +++ b/skolehjem/resources/views/admin/layout/header.blade.php @@ -1,6 +1,6 @@ @section("header")
- Syddansk Erhvervsskole + Syddansk Erhvervsskole @auth Bruger: {{ ucfirst(Auth::user()->name_first) }} {{ ucfirst(Auth::user()->name_last) }} diff --git a/skolehjem/resources/views/app/layout/base.blade.php b/skolehjem/resources/views/app/layout/base.blade.php index b1222a9..46965f2 100644 --- a/skolehjem/resources/views/app/layout/base.blade.php +++ b/skolehjem/resources/views/app/layout/base.blade.php @@ -6,8 +6,8 @@ -