Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
91f7a4aa05
|
@ -153,6 +153,9 @@ class WashingReservationController extends Controller
|
|||
|
||||
$reservations = WashingReservation::query()->paginate( 20);
|
||||
|
||||
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]);
|
||||
}
|
||||
|
||||
|
|
|
@ -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 {
|
||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 3.7 KiB |
Binary file not shown.
Before Width: | Height: | Size: 34 KiB After Width: | Height: | Size: 58 KiB |
Binary file not shown.
Before Width: | Height: | Size: 8.6 KiB After Width: | Height: | Size: 3.4 KiB |
|
@ -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 {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
@section("header")
|
||||
<header class="row align-items-center" style="background-color: #00788a;">
|
||||
<img src="{{ URL::asset('/images/logos/Logo-hvid.svg') }}" class="h-100 brand" alt="Syddansk Erhvervsskole">
|
||||
<img src="{{ URL::asset('/images/logos/Logo-hvid.svg') }}" class="brand" alt="Syddansk Erhvervsskole">
|
||||
|
||||
@auth
|
||||
<a href="{{ route("users.account") }}" class="btn btn-dark text-white m-0 ml-auto">Bruger: {{ ucfirst(Auth::user()->name_first) }} {{ ucfirst(Auth::user()->name_last) }}</a>
|
||||
|
|
|
@ -6,8 +6,8 @@
|
|||
<link type="text/css" rel="stylesheet" href="{{ mix("/css/webapp.css") }}">
|
||||
</head>
|
||||
<body>
|
||||
<header class="row align-items-center" id="header">
|
||||
<a href="{{ route("root.index") }}"><img class="w-50" id="sdeLogo" src="{{URL::asset('/images/logos/Logo-normal.svg')}}" alt="Syddansk Erhvervsskole"></a>
|
||||
<header class="row align-items-center">
|
||||
<img class="w-50" id="sdeLogo" src="{{URL::asset('/images/logos/Logo-normal.svg')}}" onclick="location.href = '{{ route("root.index") }}';" alt="Syddansk Erhvervsskole">
|
||||
<button class="ml-auto" id="toggle">
|
||||
<i id="icon" class="fas fa-bars"></i>
|
||||
</button>
|
||||
|
|
|
@ -10,6 +10,7 @@
|
|||
<a href="{{ route('phones.index') }}" class="block text-center mb-1">Vagttelefon</a>
|
||||
<a href="{{ route('guides.index') }}" class="block text-center mb-1">Vejledninger</a>
|
||||
</div>
|
||||
<!--
|
||||
<div class="row" style="align-self: center; margin: 8px 0 8px 0;">
|
||||
<a href="https://www.facebook.com" target="_blank" class="link">
|
||||
<img src="{{ URL::asset('/images/icons/facebook-icon.png') }}" class="h-100" alt="Facebook">
|
||||
|
@ -20,7 +21,7 @@
|
|||
<a href="https://www.instagram.com" target="_blank" class="link">
|
||||
<img src="{{ URL::asset('/images/icons/instagram.png') }}" class="h-100" alt="Instagram">
|
||||
</a>
|
||||
</div>
|
||||
</div>-->
|
||||
</main>
|
||||
@endsection
|
||||
|
||||
|
|
Loading…
Reference in New Issue