diff --git a/skolehjem/public/css/admin.css b/skolehjem/public/css/admin.css index f9e66d7..a07022c 100644 --- a/skolehjem/public/css/admin.css +++ b/skolehjem/public/css/admin.css @@ -6592,7 +6592,6 @@ main { margin-left: -1rem; margin-top: 0; width: calc(100% + 1rem); - text-align: center; margin-bottom: 0; font-size: 1.15em; } diff --git a/skolehjem/public/css/webapp.css b/skolehjem/public/css/webapp.css index 4c99857..441aba7 100644 --- a/skolehjem/public/css/webapp.css +++ b/skolehjem/public/css/webapp.css @@ -6618,6 +6618,10 @@ main { font-size: 12vw; } + h2 { + font-size: 10vw; + } + h3 { font-size: 8vw; } diff --git a/skolehjem/resources/sass/admin/nav/nav.scss b/skolehjem/resources/sass/admin/nav/nav.scss index 5f1d02c..b540528 100644 --- a/skolehjem/resources/sass/admin/nav/nav.scss +++ b/skolehjem/resources/sass/admin/nav/nav.scss @@ -8,7 +8,6 @@ margin-left: -1rem; margin-top: 0; width: calc(100% + 1rem); - text-align: center; margin-bottom: 0; font-size: 1.15em; } diff --git a/skolehjem/resources/sass/webapp/_default.scss b/skolehjem/resources/sass/webapp/_default.scss index f1a4c7c..ad64af2 100644 --- a/skolehjem/resources/sass/webapp/_default.scss +++ b/skolehjem/resources/sass/webapp/_default.scss @@ -51,6 +51,10 @@ and (max-width : 900px) font-size: 12vw; } + h2 { + font-size: 10vw; + } + h3 { font-size: 8vw; } diff --git a/skolehjem/resources/views/admin/layout/base.blade.php b/skolehjem/resources/views/admin/layout/base.blade.php index a65f55d..9999867 100644 --- a/skolehjem/resources/views/admin/layout/base.blade.php +++ b/skolehjem/resources/views/admin/layout/base.blade.php @@ -12,31 +12,31 @@
diff --git a/skolehjem/resources/views/app/layout/base.blade.php b/skolehjem/resources/views/app/layout/base.blade.php index 40727c2..0944c59 100644 --- a/skolehjem/resources/views/app/layout/base.blade.php +++ b/skolehjem/resources/views/app/layout/base.blade.php @@ -26,7 +26,7 @@ Aktiviteter Aktiviteter - + Reservationer Reservationer diff --git a/skolehjem/resources/views/app/washing-reservations/create.blade.php b/skolehjem/resources/views/app/washing-reservations/create.blade.php index bb5df3f..82ab9f0 100644 --- a/skolehjem/resources/views/app/washing-reservations/create.blade.php +++ b/skolehjem/resources/views/app/washing-reservations/create.blade.php @@ -27,9 +27,6 @@
@csrf -

- Maskiner skal dynamisk opdateres alt efter om det er en fra bygning E eller en af de andre bygninger der vil vaske, da bygning E har egen vaskekælder! -

@@ -46,7 +43,7 @@ return moment(index, "e").locale("da").startOf("week").weekday(index).format("ddd"); }); - document.getElementById("title").innerText = moment().locale("da").day(weekDays[0]).week(week).isoWeek().toString(); + document.getElementById("title").innerHTML = 'Uge ' + moment().locale("da").day(weekDays[0]).week(week).isoWeek().toString(); const calendar = document.getElementById("calendar"); diff --git a/skolehjem/resources/views/app/washing-reservations/index.blade.php b/skolehjem/resources/views/app/washing-reservations/index.blade.php index 8333731..77705a6 100644 --- a/skolehjem/resources/views/app/washing-reservations/index.blade.php +++ b/skolehjem/resources/views/app/washing-reservations/index.blade.php @@ -1,31 +1,29 @@ @extends("app.layout.base") @section("title") - Booking Liste + Reservationer @endsection @section("content") -
-

Booking Liste

-
-
-
- -

{Måned} {År}

- -
-
-
-
-
-
+
+

Dine reservationer

+ @foreach($reservations as $reservation) +
+

{{ \App\WashingMachine::query()->find($reservation->machine_id)->name }}

+
+ Tid: {{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($reservation->time))->format('d/m/Y \k\l\. H:i') }} +
$reservation ]) }}"> + @csrf + @method("delete") + + +
-
-
+ @endforeach + @if(count($reservations) < 1) +

Du har ingen reservationer.

+ @endif + Reserver vaskemaskine
@endsection