Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master

skolehjem/app/Http/Controllers/EventController.php

@@ -172,6 +172,7 @@ class EventController extends Controller
      */
     public function update(Request $request, $id)
     {
+
         $data = $request->all();
 
         $event = Event::find($id);
@@ -182,6 +183,11 @@ class EventController extends Controller
             return redirect()->route("events.index", ['events' => $event]);
         }else{
             $event->update($data);
+
+            if($request->file("resource")) {
+                $event->resource_id = ResourceController::store($request)->id;
+            }
+
             $event->save();
 
             $events = Event::query()->get();
@@ -196,9 +202,6 @@ class EventController extends Controller
                 $news->resource_id = $event->resource_id;
                 $news->content = "<p>" . $this->closetags(substr($event->description, 0, 300));
 
-                if($request->file("resource")) {
-                    $event->resource_id = ResourceController::store($request)->id;
-                }
 
 
                 NewsController::storeAndGet($news);

skolehjem/app/Http/Controllers/GuideController.php

@@ -126,14 +126,16 @@ class GuideController extends Controller
      */
     public function update(Request $request, Guide $guide)
     {
-        $data = $request->validate([
+        $data = $request->all();
-            "name" => "required|max:255",
-            "guide_articles" => "required",
-            "guide_category_id" => "required",
-        ]);
 
         $guidee = Guide::query()->where("id", "=", $guide->id)->first();
         $guidee->update($data);
+
+        //If an image has been uploaded, store the file
+        if($request->file("resource")) {
+            $guidee->resource_id = ResourceController::store($request)->id;
+        }
+
         $saved = $guidee->save();
 
         if(!$saved){
@@ -236,26 +238,26 @@ class GuideController extends Controller
                 foreach ($guides as $guide) {
                     $output .= '<div class="card">';
                     if ($guide->resource_id !== null) {
-                        $output .= '<div class="header" style="background-size: cover; background-position: center; background-image: url(' . asset(\App\Resource::query()->where("id", "=", $guide->resource_id)->first()->filename) . ');">' .
+                        $output .= '<div class="header bs-cover bp-center" style="background-image: url(' . asset(\App\Resource::query()->where("id", "=", $guide->resource_id)->first()->filename) . ');">' .
-                            '<h3 style="text-shadow: 2px 2px 2px #00788A;">' . $guide->name . '</h3>' .
                             '</div>';
                     } else {
-                        $output .= '<div class="header">' .
+                        $output .= '<div class="header d-flex justify-content-center">' .
-                            '<h3>' . $guide->name . '</h3>' .
+                            '<img alt="Image" src="'. asset('/images/icons/image.svg')  . '" style="width: calc(100% - 20px)">' .
                             '</div>';
                     }
 
-                    $output .= '<div class="container">';
+                    $output .= '<div class="container">' .
-                    $tags = ['<p>', '<b>', '<em>', '<a>', '<u>', '<s>', '<sub>', '<ul>', '<li>', '<sup>', '<div>', '<blockquote>', '<ol>', '<strong>', '<br>', '<h1>', '<h2>', '<h3>', '<h4>', '<h5>', '<h6>', '<h7>', '<span>'];
+                        '<div class="row justify-content-center">'.
-                    $output .= '' . \App\Helpers::closetags(substr(strip_tags($guide->guide_articles, $tags), 0, 300)) . '' .
+                            '<h4>'. $guide->name .'</h4>'.
-                        '<div class="row" style="justify-content: center;">';
+                        '</div>'.
+                        '<div class="row justify-content-center">';
 
                     if (request()->cookie('languagesSetting') == "dk")
-                        $output .= '<a style="margin: 0; padding: 0; text-align: center; font-weight: 700;" class="sde-blue" href="'. route("guides.show", ["guide" => $guide->id ]) .'">Læs mere</a>';
+                        $output .= '<a class="text-center m-none p-none bold sde-blue" href="'. route("guides.show", ["guide" => $guide->id ]) .'">Læs mere</a>';
                     elseif (request()->cookie('languagesSetting') == "en")
-                        $output .= '<a style="margin: 0; padding: 0; text-align: center; font-weight: 700;" class="sde-blue" href="'. route("guides.show", ["guide" => $guide->id ]) .'">Read more</a>';
+                        $output .= '<a class="text-center m-none p-none bold sde-blue" href="'. route("guides.show", ["guide" => $guide->id ]) .'">Read more</a>';
                     else
-                        $output .= '<a style="margin: 0; padding: 0; text-align: center; font-weight: 700;" class="sde-blue" href="'. route("guides.show", ["guide" => $guide->id ]) .'">Læs mere</a>';
+                        $output .= '<a class="text-center m-none p-none bold sde-blue" href="'. route("guides.show", ["guide" => $guide->id ]) .'">Læs mere</a>';
 
                             $output .= '</div>'.
                         '</div>'.
@@ -263,11 +265,11 @@ class GuideController extends Controller
                 }
             } else { // If there are no guides with the given category, then display error message
                 if (request()->cookie('languagesSetting') == "dk")
-                    $output .= '<p style="margin-bottom: auto; text-align: center">Der er ingen vejledninger af denne kategori</p>';
+                    $output .= '<p class="mb-auto text-center">Der er ingen vejledninger af denne kategori</p>';
                 elseif (request()->cookie('languagesSetting') == "en")
-                    $output .= '<p style="margin-bottom: auto; text-align: center">There are no guides of this category</p>';
+                    $output .= '<p class="mb-auto text-center">There are no guides of this category</p>';
                 else
-                    $output .= '<p style="margin-bottom: auto; text-align: center">Der er ingen vejledninger af denne kategori</p>';
+                    $output .= '<p class="mb-auto text-center">Der er ingen vejledninger af denne kategori</p>';
             }
 
                 return Response($output);

skolehjem/app/Http/Controllers/MenuPlanController.php

@@ -76,8 +76,6 @@ class MenuPlanController extends Controller
             $menuPlan->save();
             $menuPlans = MenuPlan::query()->get();
 
-            $menuArray = [];
-
             if($request->newsoption == true){
                 $news = new News();
 
@@ -177,6 +175,10 @@ class MenuPlanController extends Controller
                     '<h2 class="ql-align-center"><strong>Torsdag:</strong></h2>'.
                     '<p class="ql-align-center">'.$menuplan->thursday.'</p>';
 
+                    $oldResourceID = News::query()->where('arrangement_id', '=', $menuplan->id)->first();
+
+                    if ($oldResourceID != null)
+                        $news->resource_id = $oldResourceID->resource_id;
 
                 NewsController::storeAndGet($news);
             }

skolehjem/app/Http/Controllers/NewsController.php

@@ -84,6 +84,10 @@ class NewsController extends Controller
      */
     public static function storeAndGet(News $news)
     {
+        $OldNews = News::query()->where('arrangement_id', "=", $news->arrangement_id);
+
+        $OldNews->delete();
+
         $news->save();
 
         Helpers::sendNewsNotification($news, User::query()->where("wants_emails", "=", true)->get());

skolehjem/app/Http/Controllers/WashingMachineController.php

@@ -160,8 +160,8 @@ class WashingMachineController extends Controller
             $output = "<tr>" .
                 "<th>Navn</th>" .
                 "<th>Lokation</th>" .
-                "<th style=\"width: 1em;\"><img class=\"w-100\" src=" . asset('/images/icons/pencil.svg') . " alt=\"Update\"></th>" .
+                "<th class='w-1em'><img class=\"w-100\" src=" . asset('/images/icons/pencil.svg') . " alt=\"Update\"></th>" .
-                "<th style=\"width: 1em;\"><img class=\"w-100\" src=" . asset('/images/icons/trashcan.svg') . " alt=\"Delete\"></th>" .
+                "<th class='w-1em'><img class=\"w-100\" src=" . asset('/images/icons/trashcan.svg') . " alt=\"Delete\"></th>" .
                 "</tr>";
 
             if ($request->option !== 'all') {

skolehjem/public/css/admin.css

@@ -131,6 +131,10 @@ input.appinput {
   display: flex;
 }
 
+.flex-column {
+  flex-direction: column;
+}
+
 .d-none {
   display: none !important;
 }
@@ -201,8 +205,40 @@ nav {
   color: darkgrey;
 }
 
+.position-fixed {
+  position: fixed;
+}
+
+.top-0 {
+  top: 0;
+}
+
+.zindex-100 {
+  z-index: 100;
+}
+
+.border-none {
+  border: none;
+}
+
+.outline-none {
+  outline: none;
+}
+
+.overflow-visible {
+  overflow: visible;
+}
+
+ol {
+  padding-right: 8px;
+}
+
 .text-white {
-  color: #ffffff;
+  color: #fff;
+}
+
+.text-black {
+  color: #000;
 }
 
 .text-center {
@@ -245,6 +281,26 @@ span.toggle__text.sde-blue {
   font-size: 5vw;
 }
 
+.justify-content-center {
+  justify-content: center;
+}
+
+.justify-unset {
+  justify-content: unset;
+}
+
+.justify-content-space {
+  justify-content: space-between;
+}
+
+.event-text-shadow {
+  text-shadow: 2px 2px 2px #00788A;
+}
+
+.font-20px {
+  font-size: 20px;
+}
+
 .m-auto {
   margin: auto;
 }
@@ -281,14 +337,46 @@ span.toggle__text.sde-blue {
   margin-top: 0;
 }
 
+.pl-0 {
+  padding-left: 0;
+}
+
+.pr-0 {
+  padding-right: 0;
+}
+
+.pb-0 {
+  padding-bottom: 0;
+}
+
+.pt-0 {
+  padding-top: 0;
+}
+
+.m-none {
+  margin: 0;
+}
+
+.p-none {
+  padding: 0;
+}
+
 .ml-1 {
   margin-left: 0.75rem;
 }
 
+.pl-1 {
+  padding-left: 0.75rem;
+}
+
 .mr-1 {
   margin-right: 0.75rem;
 }
 
+.pr-1 {
+  padding-right: 0.75rem;
+}
+
 .mb-1 {
   margin-bottom: 0.75rem;
 }
@@ -297,6 +385,10 @@ span.toggle__text.sde-blue {
   margin-top: 0.75rem;
 }
 
+.pt-1 {
+  padding-top: 0.75rem;
+}
+
 .ml-2 {
   margin-left: 3rem;
 }
@@ -309,10 +401,18 @@ span.toggle__text.sde-blue {
   margin-bottom: 3rem;
 }
 
+.mb-2rem {
+  margin-bottom: 2rem;
+}
+
 .mt-2 {
   margin-top: 3rem;
 }
 
+.mt-2rem {
+  margin-top: 2rem;
+}
+
 .ml-3 {
   margin-left: 3rem;
 }
@@ -329,6 +429,10 @@ span.toggle__text.sde-blue {
   margin-top: 4.75rem;
 }
 
+.ml-4px {
+  margin-left: 4px;
+}
+
 * {
   font-family: "Titillium Web";
 }
@@ -358,7 +462,6 @@ body {
 }
 
 a {
-  color: #000000;
   text-decoration: none;
 }
 
@@ -386,6 +489,18 @@ a {
   width: 15%;
 }
 
+.w-1em {
+  width: 1em;
+}
+
+.w-6em {
+  width: 6em;
+}
+
+.w-7em {
+  width: 7em;
+}
+
 .h-100 {
   height: 100%;
 }
@@ -402,6 +517,10 @@ a {
   background-color: #00788a;
 }
 
+.bg-white {
+  background-color: white;
+}
+
 .block-container {
   padding: 0 8px;
 }
@@ -430,6 +549,22 @@ a {
   margin-left: 8px;
 }
 
+.lh-2 {
+  line-height: 2rem;
+}
+
+.bs-cover {
+  background-size: cover;
+}
+
+.bp-center {
+  background-position: center;
+}
+
+.resize-vertical {
+  resize: vertical;
+}
+
 .toggle {
   --uiToggleSize: var(--toggleSize, 20px);
   --uiToggleIndent: var(--toggleIndent, .4em);

skolehjem/public/css/webapp.css

@@ -131,6 +131,10 @@ input.appinput {
   display: flex;
 }
 
+.flex-column {
+  flex-direction: column;
+}
+
 .d-none {
   display: none !important;
 }
@@ -201,8 +205,40 @@ nav {
   color: darkgrey;
 }
 
+.position-fixed {
+  position: fixed;
+}
+
+.top-0 {
+  top: 0;
+}
+
+.zindex-100 {
+  z-index: 100;
+}
+
+.border-none {
+  border: none;
+}
+
+.outline-none {
+  outline: none;
+}
+
+.overflow-visible {
+  overflow: visible;
+}
+
+ol {
+  padding-right: 8px;
+}
+
 .text-white {
-  color: #ffffff;
+  color: #fff;
+}
+
+.text-black {
+  color: #000;
 }
 
 .text-center {
@@ -245,6 +281,26 @@ span.toggle__text.sde-blue {
   font-size: 5vw;
 }
 
+.justify-content-center {
+  justify-content: center;
+}
+
+.justify-unset {
+  justify-content: unset;
+}
+
+.justify-content-space {
+  justify-content: space-between;
+}
+
+.event-text-shadow {
+  text-shadow: 2px 2px 2px #00788A;
+}
+
+.font-20px {
+  font-size: 20px;
+}
+
 .m-auto {
   margin: auto;
 }
@@ -281,14 +337,46 @@ span.toggle__text.sde-blue {
   margin-top: 0;
 }
 
+.pl-0 {
+  padding-left: 0;
+}
+
+.pr-0 {
+  padding-right: 0;
+}
+
+.pb-0 {
+  padding-bottom: 0;
+}
+
+.pt-0 {
+  padding-top: 0;
+}
+
+.m-none {
+  margin: 0;
+}
+
+.p-none {
+  padding: 0;
+}
+
 .ml-1 {
   margin-left: 0.75rem;
 }
 
+.pl-1 {
+  padding-left: 0.75rem;
+}
+
 .mr-1 {
   margin-right: 0.75rem;
 }
 
+.pr-1 {
+  padding-right: 0.75rem;
+}
+
 .mb-1 {
   margin-bottom: 0.75rem;
 }
@@ -297,6 +385,10 @@ span.toggle__text.sde-blue {
   margin-top: 0.75rem;
 }
 
+.pt-1 {
+  padding-top: 0.75rem;
+}
+
 .ml-2 {
   margin-left: 3rem;
 }
@@ -309,10 +401,18 @@ span.toggle__text.sde-blue {
   margin-bottom: 3rem;
 }
 
+.mb-2rem {
+  margin-bottom: 2rem;
+}
+
 .mt-2 {
   margin-top: 3rem;
 }
 
+.mt-2rem {
+  margin-top: 2rem;
+}
+
 .ml-3 {
   margin-left: 3rem;
 }
@@ -329,6 +429,10 @@ span.toggle__text.sde-blue {
   margin-top: 4.75rem;
 }
 
+.ml-4px {
+  margin-left: 4px;
+}
+
 * {
   font-family: "Titillium Web";
 }
@@ -358,7 +462,6 @@ body {
 }
 
 a {
-  color: #000000;
   text-decoration: none;
 }
 
@@ -386,6 +489,18 @@ a {
   width: 15%;
 }
 
+.w-1em {
+  width: 1em;
+}
+
+.w-6em {
+  width: 6em;
+}
+
+.w-7em {
+  width: 7em;
+}
+
 .h-100 {
   height: 100%;
 }
@@ -402,6 +517,10 @@ a {
   background-color: #00788a;
 }
 
+.bg-white {
+  background-color: white;
+}
+
 .block-container {
   padding: 0 8px;
 }
@@ -430,6 +549,22 @@ a {
   margin-left: 8px;
 }
 
+.lh-2 {
+  line-height: 2rem;
+}
+
+.bs-cover {
+  background-size: cover;
+}
+
+.bp-center {
+  background-position: center;
+}
+
+.resize-vertical {
+  resize: vertical;
+}
+
 .toggle {
   --uiToggleSize: var(--toggleSize, 20px);
   --uiToggleIndent: var(--toggleIndent, .4em);
@@ -7125,3 +7260,7 @@ main {
   }
 }
 
+iframe {
+  width: 100%;
+}
+

skolehjem/public/css/webappdark.css

@@ -131,6 +131,10 @@ input.appinput {
   display: flex;
 }
 
+.flex-column {
+  flex-direction: column;
+}
+
 .d-none {
   display: none !important;
 }
@@ -201,8 +205,40 @@ nav {
   color: darkgrey;
 }
 
+.position-fixed {
+  position: fixed;
+}
+
+.top-0 {
+  top: 0;
+}
+
+.zindex-100 {
+  z-index: 100;
+}
+
+.border-none {
+  border: none;
+}
+
+.outline-none {
+  outline: none;
+}
+
+.overflow-visible {
+  overflow: visible;
+}
+
+ol {
+  padding-right: 8px;
+}
+
 .text-white {
-  color: #ffffff;
+  color: #fff;
+}
+
+.text-black {
+  color: #000;
 }
 
 .text-center {
@@ -245,6 +281,26 @@ span.toggle__text.sde-blue {
   font-size: 5vw;
 }
 
+.justify-content-center {
+  justify-content: center;
+}
+
+.justify-unset {
+  justify-content: unset;
+}
+
+.justify-content-space {
+  justify-content: space-between;
+}
+
+.event-text-shadow {
+  text-shadow: 2px 2px 2px #00788A;
+}
+
+.font-20px {
+  font-size: 20px;
+}
+
 .m-auto {
   margin: auto;
 }
@@ -281,14 +337,46 @@ span.toggle__text.sde-blue {
   margin-top: 0;
 }
 
+.pl-0 {
+  padding-left: 0;
+}
+
+.pr-0 {
+  padding-right: 0;
+}
+
+.pb-0 {
+  padding-bottom: 0;
+}
+
+.pt-0 {
+  padding-top: 0;
+}
+
+.m-none {
+  margin: 0;
+}
+
+.p-none {
+  padding: 0;
+}
+
 .ml-1 {
   margin-left: 0.75rem;
 }
 
+.pl-1 {
+  padding-left: 0.75rem;
+}
+
 .mr-1 {
   margin-right: 0.75rem;
 }
 
+.pr-1 {
+  padding-right: 0.75rem;
+}
+
 .mb-1 {
   margin-bottom: 0.75rem;
 }
@@ -297,6 +385,10 @@ span.toggle__text.sde-blue {
   margin-top: 0.75rem;
 }
 
+.pt-1 {
+  padding-top: 0.75rem;
+}
+
 .ml-2 {
   margin-left: 3rem;
 }
@@ -309,10 +401,18 @@ span.toggle__text.sde-blue {
   margin-bottom: 3rem;
 }
 
+.mb-2rem {
+  margin-bottom: 2rem;
+}
+
 .mt-2 {
   margin-top: 3rem;
 }
 
+.mt-2rem {
+  margin-top: 2rem;
+}
+
 .ml-3 {
   margin-left: 3rem;
 }
@@ -329,6 +429,10 @@ span.toggle__text.sde-blue {
   margin-top: 4.75rem;
 }
 
+.ml-4px {
+  margin-left: 4px;
+}
+
 * {
   font-family: "Titillium Web";
 }
@@ -358,7 +462,6 @@ body {
 }
 
 a {
-  color: #000000;
   text-decoration: none;
 }
 
@@ -386,6 +489,18 @@ a {
   width: 15%;
 }
 
+.w-1em {
+  width: 1em;
+}
+
+.w-6em {
+  width: 6em;
+}
+
+.w-7em {
+  width: 7em;
+}
+
 .h-100 {
   height: 100%;
 }
@@ -402,6 +517,10 @@ a {
   background-color: #00788a;
 }
 
+.bg-white {
+  background-color: white;
+}
+
 .block-container {
   padding: 0 8px;
 }
@@ -430,6 +549,22 @@ a {
   margin-left: 8px;
 }
 
+.lh-2 {
+  line-height: 2rem;
+}
+
+.bs-cover {
+  background-size: cover;
+}
+
+.bp-center {
+  background-position: center;
+}
+
+.resize-vertical {
+  resize: vertical;
+}
+
 .toggle {
   --uiToggleSize: var(--toggleSize, 20px);
   --uiToggleIndent: var(--toggleIndent, .4em);
@@ -7125,6 +7260,10 @@ main {
   }
 }
 
+iframe {
+  width: 100%;
+}
+
 html,
 body {
   background-color: #2F3136;

skolehjem/resources/sass/app/general/_displays.scss

@@ -2,6 +2,10 @@
     display: flex;
 }
 
+.flex-column {
+    flex-direction: column;
+}
+
 .d-none {
     display: none !important;
 }
@@ -28,8 +32,6 @@
     cursor: pointer;
 }
 
-
-
 nav > .pagination {
     display: flex;
     list-style: none;
@@ -72,3 +74,31 @@ nav {
 .calendar-table__col.disabled > .calendar-table__item {
     color: darkgrey;
 }
+
+.position-fixed {
+    position: fixed;
+}
+
+.top-0 {
+    top: 0;
+}
+
+.zindex-100 {
+    z-index: 100;
+}
+
+.border-none {
+    border: none;
+}
+
+.outline-none {
+    outline: none;
+}
+
+.overflow-visible {
+    overflow: visible;
+}
+
+ol {
+    padding-right: 8px;
+}

skolehjem/resources/sass/app/general/_margins.scss

@@ -34,14 +34,46 @@
     margin-top: 0;
 }
 
+.pl-0 {
+    padding-left: 0;
+}
+
+.pr-0 {
+    padding-right: 0;
+}
+
+.pb-0 {
+    padding-bottom: 0;
+}
+
+.pt-0 {
+    padding-top: 0;
+}
+
+.m-none {
+    margin: 0;
+}
+
+.p-none {
+    padding: 0;
+}
+
 .ml-1 {
     margin-left: .75rem;
 }
 
+.pl-1 {
+    padding-left: .75rem;
+}
+
 .mr-1 {
     margin-right: .75rem;
 }
 
+.pr-1 {
+    padding-right: .75rem;
+}
+
 .mb-1 {
     margin-bottom: .75rem;
 }
@@ -50,6 +82,10 @@
     margin-top: .75rem;
 }
 
+.pt-1 {
+    padding-top: .75rem;
+}
+
 .ml-2 {
     margin-left: 3rem;
 }
@@ -62,10 +98,18 @@
     margin-bottom: 3rem;
 }
 
+.mb-2rem {
+    margin-bottom: 2rem;
+}
+
 .mt-2 {
     margin-top: 3rem;
 }
 
+.mt-2rem {
+    margin-top: 2rem;
+}
+
 .ml-3 {
     margin-left: 3rem;
 }
@@ -81,3 +125,7 @@
 .mt-3 {
     margin-top: 4.75rem;
 }
+
+.ml-4px {
+    margin-left: 4px;
+}

skolehjem/resources/sass/app/general/_sizes.scss

@@ -14,7 +14,6 @@ html, body {
 }
 
 a {
-    color: #000000;
     text-decoration: none;
 }
 
@@ -42,6 +41,18 @@ a {
     width: 15%;
 }
 
+.w-1em {
+    width: 1em;
+}
+
+.w-6em {
+    width: 6em;
+}
+
+.w-7em {
+    width: 7em;
+}
+
 .h-100 {
     height: 100%;
 }
@@ -58,6 +69,10 @@ a {
     background-color: $sde-blue;
 }
 
+.bg-white {
+    background-color: white;
+}
+
 .block-container {
     padding: 0 8px;
 }
@@ -85,3 +100,19 @@ a {
     align-self: center;
     margin-left: 8px;
 }
+
+.lh-2 {
+    line-height: 2rem;
+}
+
+.bs-cover {
+    background-size: cover;
+}
+
+.bp-center {
+    background-position: center;
+}
+
+.resize-vertical {
+    resize: vertical;;
+}

skolehjem/resources/sass/app/general/_texts.scss

@@ -1,5 +1,9 @@
 .text-white {
-    color: #ffffff;
+    color: #fff;
+}
+
+.text-black {
+    color: #000;
 }
 
 .text-center {
@@ -41,3 +45,23 @@
 span.toggle__text.sde-blue {
     font-size: 5vw;
 }
+
+.justify-content-center {
+    justify-content: center;
+}
+
+.justify-unset {
+    justify-content: unset;
+}
+
+.justify-content-space {
+    justify-content: space-between;
+}
+
+.event-text-shadow {
+    text-shadow: 2px 2px 2px #00788A;
+}
+
+.font-20px {
+    font-size: 20px;
+}

skolehjem/resources/sass/webapp/_default.scss

@@ -554,3 +554,8 @@ $primary-color: $blue;
     from {bottom: 30px; opacity: 1;}
     to {bottom: 0; opacity: 0;}
 }
+
+iframe {
+    width: 100%;
+}
+

skolehjem/resources/views/admin/contacts/index.blade.php

@@ -27,10 +27,10 @@
             <th>E-mail</th>
             <th>Tlf</th>
             @if(auth()->user()->can('contact.edit'))
-                <th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
+                <th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
             @endif
             @if(auth()->user()->can('contact.delete'))
-                <th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
+                <th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
             @endif
         </thead>
         <tbody>

skolehjem/resources/views/admin/events/edit.blade.php

@@ -24,7 +24,7 @@
     </style>
     <link href="{{ asset("/css/quill/quill.snow.css") }}" rel="stylesheet">
     <h1>Rediger Aktivitet:</h1>
-    <form method="post" action="{{route("events.update", ["event" => $event])}}">
+    <form method="post" action="{{route("events.update", ["event" => $event])}}" enctype="multipart/form-data">
         @csrf
         @method("PUT")
         <label for="name">Aktivitet Navn:</label>
@@ -43,7 +43,7 @@
         <label class="toggle">
             <input class="toggle__input" type="checkbox" name="newsoption">
             <span class="toggle__label">
-                    <span class="toggle__text">Opret som nyhed</span>
+                    <span class="toggle__text">Opdater / Opret som nyhed?</span>
                 </span>
         </label>
         <input id="disable" type="submit" class="btn btn-dark text-white" value="Rediger">

skolehjem/resources/views/admin/events/index.blade.php

@@ -29,12 +29,12 @@
             <th>Aktivitet Navn</th>
             <th>Aktivitet Ansvarlig</th>
             <th>Aktivitet Dato</th>
-            <th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/eye.svg') }}" alt="Show"></th>
+            <th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/eye.svg') }}" alt="Show"></th>
             @if(auth()->user()->can('event.edit'))
-                <th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
+                <th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
             @endif
             @if(auth()->user()->can('event.delete'))
-                <th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
+                <th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
             @endif
         </thead>
         <tbody>

skolehjem/resources/views/admin/events/signups.blade.php

@@ -15,7 +15,7 @@
             <th>Tilmeldtes Fornavn</th>
             <th>Tilmeldtes Efternavn</th>
             <th>Tilmeldtes Tlf Nr</th>
-            <th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
+            <th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
         </thead>
         <tbody>
             @foreach($events as $event)

skolehjem/resources/views/admin/feedbacks/index.blade.php

@@ -18,11 +18,11 @@
     </style>
     <table class="tbl letterSpaceTable" id="table_id">
         <thead>
-            <th style="width: 6em;">Dato</th>
+            <th class="w-6em">Dato</th>
             <th>Feedback Besked</th>
-            <th style="width: 7em;">Feedback type</th>
+            <th class="w-7em">Feedback type</th>
             @if(auth()->user()->can('feedback.delete'))
-                <th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
+                <th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
             @endif
         </thead>
         <tbody>

skolehjem/resources/views/admin/guides-category/show.blade.php

@@ -8,11 +8,11 @@
     <script src="{{ asset("/js/jquery-3.2.1.min.js") }}"></script>
 </head>
 <body>
-<header class="row align-items-center" style="background-color: #00788a;">
+<header class="row align-items-center bg-sde-blue">
     <img src="{{ URL::asset('/images/logos/Logo-hvid.svg') }}" class="brand" alt="Syddansk Erhvervsskole">
-    <p class="text-white" style="margin-left: auto; padding-right: 24px; font-size: 1vw;">Lokation: {{ $location->name }}</p>
+    <p class="text-white ml-auto" style="padding-right: 24px; font-size: 1vw;">Lokation: {{ $location->name }}</p>
 </header>
-<main style="min-height: calc(100% - 72px); background-color: #ffffff;" id="mainDiv">
+<main class="bg-white" style="min-height: calc(100% - 72px);" id="mainDiv">
     <?php
         date_default_timezone_set('Europe/Copenhagen');
         $i = 1;
@@ -37,7 +37,7 @@
             @endif
         @endforeach
         @if($i == 1)
-            <b class="w-100 text-center" style="font-size: 2vw; padding-top: 16px;">Der er ingen vaskemaskine reservationer for i dag.</b>
+            <b class="w-100 text-center pt-1" style="font-size: 2vw;">Der er ingen vaskemaskine reservationer for i dag.</b>
         @endif
     </div>
 </main>

skolehjem/resources/views/admin/guides/create.blade.php

@@ -49,7 +49,7 @@
                     <span class="toggle__text">Opret som nyhed</span>
                 </span>
         </label>
-        <div class="form-group" style="display: flex; flex-direction: column" id="delete_event">
+        <div class="form-group d-flex flex-column" id="delete_event">
             <label for="date">Dato til når nyheden skal slettes (valgfri):</label>
             <input type="datetime-local" name="news_expiration_date" id="date">
         </div>

skolehjem/resources/views/admin/guides/edit.blade.php

@@ -24,7 +24,7 @@
     </style>
     <link href="{{ asset("/css/quill/quill.snow.css") }}" rel="stylesheet">
     <h1>Rediger vejledning:</h1>
-    <form method="post" action="{{route("guides.update", ["guide" => $guide])}}">
+    <form method="post" action="{{route("guides.update", ["guide" => $guide])}}" enctype="multipart/form-data">
         @csrf
         @method("PUT")
         <label for="title">Navn</label>
@@ -52,7 +52,7 @@
         <label class="toggle">
             <input class="toggle__input" type="checkbox" name="newsoption">
             <span class="toggle__label">
-                    <span class="toggle__text">Opret som nyhed</span>
+                    <span class="toggle__text">Opdater / Opret som nyhed?</span>
                 </span>
         </label>
         <input id="disable" type="submit" class="btn btn-dark text-white" value="Rediger">

skolehjem/resources/views/admin/guides/index.blade.php

@@ -28,11 +28,10 @@
             <th>Navn</th>
             <th>Kategori</th>
             @if(auth()->user()->can('guides.edit'))
-                <!--<th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/preview.svg') }}" alt="preview"></th>-->
+                <th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
-                <th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
             @endif
             @if(auth()->user()->can('guides.delete'))
-                <th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
+                <th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
             @endif
         </tr>
         @foreach($guides as $guide)
@@ -67,10 +66,10 @@
             <tr>
                 <th>Vejlednings kategorier</th>
                 @if(auth()->user()->can('guides.edit'))<!--Jeg ved ikke om vi lave mere specifike permissions-->
-                    <th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
+                    <th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
                 @endif
                 @if(auth()->user()->can('guides.delete'))<!--Jeg ved ikke om vi lave mere specifike permissions-->
-                    <th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
+                    <th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
                 @endif
             </tr>
             @foreach(\App\GuidesCategory::query()->get() as $guideCategory)

skolehjem/resources/views/admin/index.blade.php

@@ -111,7 +111,7 @@
         </table>
         @if(\App\Event::query()->orderBy("date", "asc")->first() !== null)
             <div class="event_card">
-                <div class="header" style="padding-top: 0">
+                <div class="header pt-0">
                     <table class="tbl mt-0 letterSpaceTable">
                         <tr>
                             <td><label>Aktivitets navn  <span class="dot"></span> {!! (\App\Event::query()->orderBy("date", "asc")->first()->name) !!}</label></td>
@@ -124,15 +124,15 @@
                         </tr>
                     </table>
                 </div>
-                <div class="container letterSpaceTable" style="margin-top: 8px;">
+                <div class="container letterSpaceTable mt-1">
                      <table style="border: 1px solid lightgrey; width: 100%;">
                          <tr>
                              <td> {!!(\App\Event::query()->orderBy("date", "asc")->first()->description)!!}</td>
                          </tr>
                      </table>
                     <input type="hidden" name="event_id" value="{{ \App\Event::query()->orderBy("date", "asc")->first()->id }}">
-                    <div class="row" style="justify-content: space-between; margin-top: 16px;">
+                    <div class="row justify-content-space mt-1">
-                        <a style="margin: 0; padding: 0; font-weight: 700;" class="sde-blue text-center" href="{{route("events.signups", ["event" => \App\Event::query()->orderBy("date", "asc")->first()->id ])}}">Se deltagere</a>
+                        <a class="sde-blue text-center m-none p-none bold" href="{{route("events.signups", ["event" => \App\Event::query()->orderBy("date", "asc")->first()->id ])}}">Se deltagere</a>
                     </div>
                 </div>
             </div>

skolehjem/resources/views/admin/layout/base.blade.php

@@ -112,11 +112,6 @@
         font-size: 25px;
     }
 
-    .tooltip:hover .tooltiptext {
-        /*visibility: visible;*/
-    }
-
-
     .letterSpaceingNavBar{
         letter-spacing: 1.2px;
     }
@@ -125,64 +120,64 @@
 <main class="row">
     <div class="col nav" style="background-color: #333333;">
         <div class="segment hamburger" style="height: 60px;">
-            <div class="text-white row align-items-center" style="margin-left: -1rem; margin-top: 0; margin-bottom: 0; font-size: 1.15rem; height: calc(100% - 2rem); padding: 1rem 2rem; width: calc(100% - 3rem); background-color: #333333 !important;">
+            <div class="text-white row align-items-center mt-0 mb-0" style="margin-left: -1rem; font-size: 1.15rem; height: calc(100% - 2rem); padding: 1rem 2rem; width: calc(100% - 3rem); background-color: #333333 !important;">
-                <a href="javascript:void(0)" id="open" style="padding: 0; margin-left: auto; display: none;" onclick="openNav()" class="open-btn text-white"><i class="fa fa-bars"></i></a>
+                <a href="javascript:void(0)" id="open" style="display: none;" onclick="openNav()" class="open-btn text-white p-none ml-auto"><i class="fa fa-bars"></i></a>
-                <a href="javascript:void(0)" id="close" style="padding: 0; margin-left: auto;" onclick="closeNav()" class="close-btn text-white"><i class="fa fa-times"></i></a>
+                <a href="javascript:void(0)" id="close" onclick="closeNav()" class="close-btn text-white p-none ml-auto"><i class="fa fa-times"></i></a>
             </div>
         </div>
 
 
         <div class="segment letterSpaceingNavBar @if(\Illuminate\Support\Facades\Request::route()->getName() == "root.index") active @endif">
-            <div class="tooltip"><h3 class="text-white"><a href="{{ route('root.index') }}" class="text-white"><img src="{{asset("/images/icons/statistics.svg")}}" class="fa"><span style="margin-left: 4px;">Statistik</span></a></h3><span class="tooltiptext">Statistik</span></div>
+            <div class="tooltip"><h3 class="text-white"><a href="{{ route('root.index') }}" class="text-white"><img src="{{asset("/images/icons/statistics.svg")}}" class="fa"><span class="ml-4px">Statistik</span></a></h3><span class="tooltiptext">Statistik</span></div>
         </div>
         @if(auth()->user()->can('user.show'))
         <div class="segment letterSpaceingNavBar @if(\Illuminate\Support\Facades\Request::route()->getName() == "users.index") active @endif">
-            <div class="tooltip"><h3 class="text-white"><a href="{{ route('users.index') }}" class="text-white"><img src="{{asset("/images/icons/users-hvid.svg")}}" class="fa"><span style="margin-left: 4px;">Brugere</span></a></h3><span class="tooltiptext">Brugere</span></div>
+            <div class="tooltip"><h3 class="text-white"><a href="{{ route('users.index') }}" class="text-white"><img src="{{asset("/images/icons/users-hvid.svg")}}" class="fa"><span class="ml-4px">Brugere</span></a></h3><span class="tooltiptext">Brugere</span></div>
         </div>
         @endif
         @if(auth()->user()->can('roles.show'))
         <div class="segment letterSpaceingNavBar @if(\Illuminate\Support\Facades\Request::route()->getName() == "roles.index") active @endif">
-            <div class="tooltip"><h3 class="text-white"><a href="{{ route('roles.index') }}" class="text-white"><img src="{{asset("/images/icons/role.svg")}}" class="fa"><span style="margin-left: 4px;">Roller</span></a></h3><span class="tooltiptext">Roller</span></div>
+            <div class="tooltip"><h3 class="text-white"><a href="{{ route('roles.index') }}" class="text-white"><img src="{{asset("/images/icons/role.svg")}}" class="fa"><span class="ml-4px">Roller</span></a></h3><span class="tooltiptext">Roller</span></div>
         </div>
         @endif
         @if(auth()->user()->can('news.show'))
         <div class="segment letterSpaceingNavBar @if(\Illuminate\Support\Facades\Request::route()->getName() == "news.index") active @endif">
-            <div class="tooltip"><h3 class="text-white"><a href="{{ route('news.index') }}" class="text-white"><img src="{{asset("/images/icons/news.svg")}}" class="fa"><span style="margin-left: 4px;">Nyheder</span></a></h3><span class="tooltiptext">Nyheder</span></div>
+            <div class="tooltip"><h3 class="text-white"><a href="{{ route('news.index') }}" class="text-white"><img src="{{asset("/images/icons/news.svg")}}" class="fa"><span class="ml-4px">Nyheder</span></a></h3><span class="tooltiptext">Nyheder</span></div>
         </div>
         @endif
         @if(auth()->user()->can('menuplan.show'))
         <div class="segment letterSpaceingNavBar @if(\Illuminate\Support\Facades\Request::route()->getName() == "menu-plans.index") active @endif">
-            <div class="tooltip"><h3 class="text-white"><a href="{{ route('menu-plans.index') }}" class="text-white"><img src="{{asset("/images/icons/Menuplan.svg")}}" class="fa"><span style="margin-left: 4px;">Menuplan</span></a></h3><span class="tooltiptext">Menuplan</span></div>
+            <div class="tooltip"><h3 class="text-white"><a href="{{ route('menu-plans.index') }}" class="text-white"><img src="{{asset("/images/icons/Menuplan.svg")}}" class="fa"><span class="ml-4px">Menuplan</span></a></h3><span class="tooltiptext">Menuplan</span></div>
         </div>
         @endif
         @if(auth()->user()->can('event.show'))
         <div class="segment letterSpaceingNavBar @if(\Illuminate\Support\Facades\Request::route()->getName() == "events.index") active @endif">
-            <div class="tooltip"><h3 class="text-white"><a href="{{ route('events.index') }}" class="text-white"><img src="{{asset("/images/icons/Aktiviteter.svg")}}" class="fa"><span style="margin-left: 4px;">Aktiviteter</span></a></h3><span class="tooltiptext">Aktiviteter</span></div>
+            <div class="tooltip"><h3 class="text-white"><a href="{{ route('events.index') }}" class="text-white"><img src="{{asset("/images/icons/Aktiviteter.svg")}}" class="fa"><span class="ml-4px">Aktiviteter</span></a></h3><span class="tooltiptext">Aktiviteter</span></div>
         </div>
         @endif
         @if(auth()->user()->can('washing.machine.show'))
         <div class="segment letterSpaceingNavBar @if(\Illuminate\Support\Facades\Request::route()->getName() == "washing-machines.index") active @endif">
-            <div class="tooltip"><h3 class="text-white"><a href="{{ route('washing-machines.index') }}" class="text-white"><img src="{{asset("/images/icons/wash.svg")}}" class="fa"><span style="margin-left: 4px;">Vaskemaskiner</span></a></h3><span class="tooltiptext">Vaskemaskiner</span></div>
+            <div class="tooltip"><h3 class="text-white"><a href="{{ route('washing-machines.index') }}" class="text-white"><img src="{{asset("/images/icons/wash.svg")}}" class="fa"><span class="ml-4px">Vaskemaskiner</span></a></h3><span class="tooltiptext">Vaskemaskiner</span></div>
         </div>
         @endif
         @if(auth()->user()->can('washing.machine.reservation.show'))
         <div class="segment letterSpaceingNavBar @if(\Illuminate\Support\Facades\Request::route()->getName() == "washing-reservations.index") active @endif">
-            <div class="tooltip"><h3 class="text-white"><a href="{{ route('washing-reservations.index') }}" class="text-white"><img src="{{asset("/images/icons/wash_res.svg")}}" class="fa"><span style="margin-left: 4px;">Reservationer</span></a></h3><span class="tooltiptext">Reservationer</span></div>
+            <div class="tooltip"><h3 class="text-white"><a href="{{ route('washing-reservations.index') }}" class="text-white"><img src="{{asset("/images/icons/wash_res.svg")}}" class="fa"><span class="ml-4px">Reservationer</span></a></h3><span class="tooltiptext">Reservationer</span></div>
         </div>
         @endif
         @if(auth()->user()->can('contact.show'))
         <div class="segment letterSpaceingNavBar @if(\Illuminate\Support\Facades\Request::route()->getName() == "contacts.index") active @endif">
-            <div class="tooltip"><h3 class="text-white"><a href="{{ route('contacts.index') }}" class="text-white"><img src="{{asset("/images/icons/phone.svg")}}" class="fa"><span style="margin-left: 4px;">Kontakter</span></a></h3><span class="tooltiptext">Kontakter</span></div>
+            <div class="tooltip"><h3 class="text-white"><a href="{{ route('contacts.index') }}" class="text-white"><img src="{{asset("/images/icons/phone.svg")}}" class="fa"><span class="ml-4px">Kontakter</span></a></h3><span class="tooltiptext">Kontakter</span></div>
         </div>
         @endif
         @if(auth()->user()->can('guides.show'))
         <div class="segment letterSpaceingNavBar @if(\Illuminate\Support\Facades\Request::route()->getName() == "guides.index") active @endif">
-            <div class="tooltip"><h3 class="text-white"><a href="{{ route('guides.index') }}" class="text-white"><img src="{{asset("/images/icons/Vejledninger.svg")}}" class="fa"><span style="margin-left: 4px;">Vejledning</span></a></h3><span class="tooltiptext">Vejledning</span></div>
+            <div class="tooltip"><h3 class="text-white"><a href="{{ route('guides.index') }}" class="text-white"><img src="{{asset("/images/icons/Vejledninger.svg")}}" class="fa"><span class="ml-4px">Vejledning</span></a></h3><span class="tooltiptext">Vejledning</span></div>
         </div>
         @endif
         @if(auth()->user()->can('feedback.show'))
         <div class="segment letterSpaceingNavBar @if(\Illuminate\Support\Facades\Request::route()->getName() == "feedbacks.index") active @endif">
-            <div class="tooltip"><h3 class="text-white"><a href="{{ route('feedbacks.index') }}" class="text-white"><img src="{{asset("/images/icons/feedback.svg")}}" class="fa"><span style="margin-left: 4px;">Feedback</span></a></h3><span class="tooltiptext">Feedback</span></div>
+            <div class="tooltip"><h3 class="text-white"><a href="{{ route('feedbacks.index') }}" class="text-white"><img src="{{asset("/images/icons/feedback.svg")}}" class="fa"><span class="ml-4px">Feedback</span></a></h3><span class="tooltiptext">Feedback</span></div>
         </div>
         @endif
     </div>

skolehjem/resources/views/admin/layout/header.blade.php

@@ -1,6 +1,6 @@
 @section("header")
-    <header class="row align-items-center" style="background-color: #00788a;">
+    <header class="row align-items-center bg-sde-blue">
-        <img src="{{ URL::asset('/images/logos/Logo-hvid.svg') }}" style="cursor: pointer;" onclick="window.location.href = '{{ route("root.index") }}';" class="brand" alt="Syddansk Erhvervsskole">
+        <img src="{{ URL::asset('/images/logos/Logo-hvid.svg') }}" onclick="window.location.href = '{{ route("root.index") }}';" class="brand cursor-pointer" 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>

skolehjem/resources/views/admin/locations/index.blade.php

@@ -18,12 +18,12 @@
     <table class="tbl">
         <tr>
             <th>Navn</th>
-            <th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/eye.svg') }}" alt="Show"></th>
+            <th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/eye.svg') }}" alt="Show"></th>
             @if(auth()->user()->can('locations.edit'))
-                <th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
+                <th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
             @endif
             @if(auth()->user()->can('locations.delete'))
-                <th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
+                <th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
             @endif
         </tr>
         @foreach($locations as $location)

skolehjem/resources/views/admin/locations/show.blade.php

@@ -8,11 +8,11 @@
     <script src="{{ asset("/js/jquery-3.2.1.min.js") }}"></script>
 </head>
 <body>
-<header class="row align-items-center" style="background-color: #00788a;">
+<header class="row align-items-center bg-sde-blue">
     <img src="{{ URL::asset('/images/logos/Logo-hvid.svg') }}" class="brand" alt="Syddansk Erhvervsskole">
-    <p class="text-white" style="margin-left: auto; padding-right: 24px; font-size: 1vw;">Lokation: {{ $location->name }}</p>
+    <p class="text-white ml-auto" style="padding-right: 24px; font-size: 1vw;">Lokation: {{ $location->name }}</p>
 </header>
-<main style="min-height: calc(100% - 72px); background-color: #ffffff;" id="mainDiv">
+<main class="bg-white" style="min-height: calc(100% - 72px);" id="mainDiv">
     <?php
         date_default_timezone_set('Europe/Copenhagen');
         $i = 1;
@@ -37,7 +37,7 @@
             @endif
         @endforeach
         @if($i == 1)
-            <b class="w-100 text-center" style="font-size: 2vw; padding-top: 16px;">Der er ingen vaskemaskine reservationer for i dag.</b>
+            <b class="w-100 text-center pt-1" style="font-size: 2vw;">Der er ingen vaskemaskine reservationer for i dag.</b>
         @endif
     </div>
 </main>

skolehjem/resources/views/admin/menuplans/edit.blade.php

@@ -40,7 +40,7 @@
         <label class="toggle">
             <input class="toggle__input" type="checkbox" name="newsoption">
             <span class="toggle__label">
-                    <span class="toggle__text">Opret som nyhed</span>
+                    <span class="toggle__text">Opdater / Opret som nyhed?</span>
                 </span>
         </label>
         <input id="disable" type="submit" class="btn btn-dark text-white" value="Rediger Menuplan">

skolehjem/resources/views/admin/menuplans/index.blade.php

@@ -25,12 +25,12 @@
     <table class="tbl letterSpaceTable" id="table_id">
         <thead>
             <th>Uge</th>
-            <th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/print-hvid.svg') }}" alt="Print"></th>
+            <th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/print-hvid.svg') }}" alt="Print"></th>
             @if(auth()->user()->can('menuplan.edit'))
-                <th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
+                <th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
             @endif
             @if(auth()->user()->can('menuplan.delete'))
-                <th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
+                <th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
             @endif
         </thead>
         <tbody>

skolehjem/resources/views/admin/menuplans/show.blade.php

@@ -1,31 +0,0 @@
-@extends("admin.layout.base")
-@extends("admin.layout.header")
-
-@section("title")
-    Menuplan - Vis
-@endsection
-
-@section("path")
-    <a href="{{ route('menu-plans.show', [ "id" => $menuplan->id ]) }}" class="text-white">Vis Menuplan</a> /
-@endsection
-
-@section("content")
-    <table class="tbl">
-        <tr>
-            <th>Fredag</th>
-            <th>Tirsdag</th>
-            <th>Onsdag</th>
-            <th>Torsdag</th>
-            <th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
-            <th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
-        </tr>
-        <tr>
-            <td>{Fredag}</td>
-            <td>{Tirsdag}</td>
-            <td>{Onsdag}</td>
-            <td>{Torsdag}</td>
-            <td><a href=""><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
-            <td><a href=""><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></a></td>
-        </tr>
-    </table>
-@endsection

skolehjem/resources/views/admin/news/edit.blade.php

@@ -23,9 +23,9 @@
         <label for="title">Navn</label>
         <label hidden id="error" for="errormesseages">Dette navn findes allerede</label>
         <input value="{{$news->subname}}" type="text" name="subname" id="title" required>
-        <small class="form-text text-muted">For at kunne indsætte et link, skal du markere den text du vil lave som et link først.</small>
         <label for="date">Rediger datoen til når nyheden skal slettes (Hvis nyheden ikke skal slettes efter en bestemt dato, slet ALT i dato felete, så det er tomt!)</label>
         <input type="datetime-local" value="{{$news->news_expiration_date}}" name="news_expiration_date" id="date">
+        <small class="form-text text-muted">For at kunne indsætte et link, skal du markere den text du vil lave som et link først.</small>
         <div id="editor">{!! $news->content !!}</div>
         <textarea name="content" class="d-none" id="hiddenArea"></textarea>
         <input id="disable" type="submit" class="btn btn-dark text-white" value="Rediger">

skolehjem/resources/views/admin/news/index.blade.php

@@ -25,10 +25,10 @@
             <th>Navn</th>
             <th>Udløbsdato</th>
             @if(auth()->user()->can('news.edit'))
-                <th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
+                <th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
             @endif
             @if(auth()->user()->can('news.delete'))
-                <th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
+                <th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
             @endif
         </thead>
         <tbody>

skolehjem/resources/views/admin/roles/create.blade.php

@@ -75,7 +75,7 @@
             <input type="text" name="description" id="description" placeholder="Admin rollen bruges til administratorene" required>
 
 
-        <div class="mb-2" style="width: 100%;">
+        <div class="mb-2 w-100">
             <button id="kontoButton" type="button" class="btn btn-sde-blue mb-1 mr-1" value="konto">App rettigheder</button>
             <button id="adminButton" type="button" class="btn btn-sde-blue mb-1">Admin rettigheder</button>
         </div>

skolehjem/resources/views/admin/roles/edit.blade.php

@@ -76,7 +76,7 @@
             <input type="text" name="description" id="description" placeholder="Admin rollen bruges til administratorene" value="{{ $role->description }}" required>
 
 
-        <div class="mb-2" style="width: 100%;">
+        <div class="mb-2 w-100">
             <button id="kontoButton" type="button" class="btn btn-sde-blue mb-1 mr-1" value="konto">Rediger app rettigheder</button>
             <button id="adminButton" type="button" class="btn btn-sde-blue mb-1">Rediger admin rettigheder</button>
         </div>

skolehjem/resources/views/admin/roles/index.blade.php

@@ -25,10 +25,10 @@
             <th>Navn</th>
             <th>Beskrivelse</th>
             @if(auth()->user()->can('roles.edit'))
-                <th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
+                <th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
             @endif
             @if(auth()->user()->can('roles.delete'))
-                <th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
+                <th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
             @endif
         </thead>
         <tbody>

skolehjem/resources/views/admin/users/account.blade.php

@@ -17,7 +17,7 @@
             <th>Email</th>
             <th>Tlf nr</th>
             <th>Rolle(r)</th>
-            <th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
+            <th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
         </tr>
             <tr>
                 <td>{{ Auth::user()->name_first }}</td>

skolehjem/resources/views/admin/users/create.blade.php

@@ -10,7 +10,24 @@
 @endsection
 
 @section("content")
+    <style>
+        .select2-container--default .select2-results > .select2-results__options {
+            max-height: 120px !important;
+        }
+
+        .select2-results__option, .select2-search__field {
+            color: black;
+        }
+    </style>
     <script src="toast.js"></script>
+    <link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-beta.1/dist/css/select2.min.css" rel="stylesheet" />
+    <script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-beta.1/dist/js/select2.min.js"></script>
+    <script>
+        // In your Javascript (external .js resource or <script> tag)
+        $(document).ready(function() {
+            $('.js-example-basic-multiple').select2();
+        });
+    </script>
     <h1 id="errormesseages" >Opret Bruger:</h1>
     <form method="post" action="{{ route("users.store") }}" onsubmit="return checkInputs()" enctype="multipart/form-data">
         @csrf
@@ -36,12 +53,12 @@
         <label hidden id="errorphone">Der findes allerede en bruger med dette telefon nr!</label>
             <input type="tel" name="phone" id="phone" placeholder="12345678" pattern="[0-9]{2}[0-9]{2}[0-9]{2}[0-9]{2}" required>
         <label for="roles">Rolle:</label>
-        <select name="roles[]" id="roles" class="mb-2" multiple="multiple" required>
+        <select id="roles" class="js-example-basic-multiple mb-2" name="roles[]" multiple="multiple" required>
-            <option disabled selected value> -- Vælg Rolle(r) -- </option>
+            <optgroup label="Roller">
-            <option value="">Ingen Rolle</option>
                 @foreach($roles as $role)
                     <option value="{{ $role->name }}">{{ $role->name }}</option>
                 @endforeach
+            </optgroup>
         </select>
         <label for="fileuploade">Skift brugerens profile billede:</label>
         <input id="fileuploade" type="file" name="resource" accept="image/*">

skolehjem/resources/views/admin/users/edit.blade.php

@@ -10,6 +10,23 @@
 @endsection
 
 @section("content")
+    <style>
+        .select2-container--default .select2-results > .select2-results__options {
+            max-height: 120px !important;
+        }
+
+        .select2-results__option, .select2-search__field {
+            color: black;
+        }
+    </style>
+    <link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-beta.1/dist/css/select2.min.css" rel="stylesheet" />
+    <script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-beta.1/dist/js/select2.min.js"></script>
+    <script>
+        // In your Javascript (external .js resource or <script> tag)
+        $(document).ready(function() {
+            $('.js-example-basic-multiple').select2();
+        });
+    </script>
     <h1>Rediger Bruger:</h1>
     <form method="post" action="{{ route("users.update", ['user' => $user]) }}" onsubmit="return checkInputs()" enctype="multipart/form-data">
         @csrf
@@ -36,16 +53,14 @@
         <label hidden id="errorphone">Der findes allerede en bruger med dette telefon nr!</label>
             <input type="tel" name="phone" id="phone" value="{{ $user->phone }}" placeholder="12345678" pattern="[0-9]{2}[0-9]{2}[0-9]{2}[0-9]{2}" required>
         <label for="role">Rolle: (Brug ctrl og shift til at vælge flere)</label>
-        <select class="w-100" name="roles[]" id="roles" class="mb-2" multiple="multiple" required>
+
+        <select id="roles" class="js-example-basic-multiple mb-2" name="roles[]" multiple="multiple" required>
+            <optgroup label="Roller">
                 @if(count($user->roles) == 0)
-                    <option disabled selected> -- Vælg Rolle(r) -- </option>
-                    <option value>Ingen Rolle</option>
                     @foreach($roles as $role)
                         <option value="{{ $role->name }}">{{ $role->name }}</option>
                     @endforeach
                 @else
-                    <option disabled> -- Vælg Rolle(r) -- </option>
-                    <option value>Ingen Rolle</option>
                     @foreach($roles as $role)
                         {{ $selected = "" }}
                         @foreach($user->roles as $userRole)
@@ -56,6 +71,7 @@
                         <option {{ $selected }} value="{{ $role->name }}">{{ $role->name }}</option>
                     @endforeach
                 @endif
+            </optgroup>
         </select>
         <label for="fileuploade">Skift brugerens profile billede:</label>
             <input id="fileuploade" type="file" name="resource" accept="image/*">

skolehjem/resources/views/admin/users/forgot.blade.php

@@ -5,7 +5,7 @@
 @endsection
 
 @section("content")
-    <main style="background-color: #00788a; height: 100%;">
+    <main class="h-100 bg-sde-blue">
         <div class="brand">
             <img src="{{URL::asset('/images/logos/Logo-hvid.svg')}}" alt="Syddansk Erhvervsskole">
         </div>

skolehjem/resources/views/admin/users/index.blade.php

@@ -62,12 +62,12 @@
             <th>Mail</th>
             <th>Telefon</th>
             <th>Rolle(r)</th>
-            <th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/eye.svg') }}" alt="ShowImage"></th>
+            <th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/eye.svg') }}" alt="ShowImage"></th>
             @if(auth()->user()->can('user.edit'))
-                <th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
+                <th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
             @endif
             @if(auth()->user()->can('user.delete'))
-                <th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
+                <th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
             @endif
         </thead>
         <tbody>
@@ -88,9 +88,9 @@
                         @endfor
                     </td>
                     @if($user->resource_id !== null)
-                        <td style="overflow: visible"><a class="showUsers"><img src="{{ asset('/images/icons/eye-dark.svg') }}"><img src="{{ asset(\App\Resource::query()->where("id", "=", $user->resource_id)->first()->filename) }}" class="showUserImages"></a></td>
+                        <td class="overflow-visible"><a class="showUsers"><img src="{{ asset('/images/icons/eye-dark.svg') }}"><img src="{{ asset(\App\Resource::query()->where("id", "=", $user->resource_id)->first()->filename) }}" class="showUserImages"></a></td>
                     @else
-                        <td style="overflow: visible"><a class="showUsers noImages"><img src="{{ asset('/images/icons/eye-dark.svg') }}"><img src="" class="showUserImages"></a></td>
+                        <td class="overflow-visible"><a class="showUsers noImages"><img src="{{ asset('/images/icons/eye-dark.svg') }}"><img src="" class="showUserImages"></a></td>
                     @endif
                     @if(auth()->user()->can('user.edit'))
                         <td><a href="{{ route("users.edit", [ "user" => $user->id ]) }}"><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>

skolehjem/resources/views/admin/users/login.blade.php

@@ -5,7 +5,7 @@
 @endsection
 
 @section("content")
-    <main style="background-color: #00788a; height: 100%;">
+    <main class="bg-sde-blue h-100">
         <div class="brand">
             <img src="{{URL::asset('/images/logos/Logo-hvid.svg')}}" alt="Syddansk Erhvervsskole">
         </div>

skolehjem/resources/views/admin/washing-machines/index.blade.php

@@ -38,10 +38,10 @@
             <th>Navn</th>
             <th>Lokation</th>
             @if(auth()->user()->can('washing.machine.edit'))
-                <th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
+                <th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
             @endif
             @if(auth()->user()->can('washing.machine.delete'))
-                <th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
+                <th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
             @endif
         </thead>
         @foreach($machines as $machine)
@@ -70,12 +70,12 @@
     <table class="tbl">
         <thead>
             <th>Navn</th>
-            <th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/eye.svg') }}" alt="Show"></th>
+            <th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/eye.svg') }}" alt="Show"></th>
             @if(auth()->user()->can('locations.edit'))
-                <th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
+                <th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
             @endif
             @if(auth()->user()->can('locations.delete'))
-                <th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
+                <th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
             @endif
         </thead>
         @foreach(\App\Location::query()->get() as $location)

skolehjem/resources/views/admin/washing-machines/show.blade.php

@@ -13,8 +13,8 @@
     <table class="tbl">
         <tr>
             <th>Navn</th>
-            <th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
+            <th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
-            <th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
+            <th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
         </tr>
         <tr>
             <td>{Navn}</td>

skolehjem/resources/views/admin/washing-reservations/index.blade.php

@@ -25,7 +25,7 @@
             <th>Tidspunkt</th>
             <th>Bruger</th>
             @if(auth()->user()->can('washing.machine.reservation.delete'))
-                <th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
+                <th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
             @endif
         </thead>
         <tbody>

skolehjem/resources/views/admin/washing-reservations/show.blade.php

@@ -1,31 +0,0 @@
-@extends("admin.layout.base")
-@extends("admin.layout.header")
-
-@section("title")
-    Vaske Reservationer - Vis
-@endsection
-
-@section("path")
-    <a href="{{ route('washing-reservations.index') }}" class="text-white">Vis Vaske Reservationer</a> /
-@endsection
-
-@section("content")
-    <table class="tbl">
-        <tr>
-            <th>Fornavn</th>
-            <th>Efternavn</th>
-            <th>Telefon Nr.</th>
-            <th>Vaskemaskine</th>
-            <th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
-            <th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
-        </tr>
-        <tr>
-            <th>Fornavn</th>
-            <th>Efternavn</th>
-            <th>Telefon Nr.</th>
-            <th>Vaskemaskine</th>
-            <th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
-            <th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
-        </tr>
-    </table>
-@endsection

skolehjem/resources/views/app/about/index.blade.php

@@ -4,17 +4,15 @@
 @endsection
 
 @section("content")
-    <main style="justify-content: unset">
+    <main class="justify-unset">
-        <h1 class="text-center sde-blue mb-0" style="margin-bottom: 2rem">{{ __('msg.omkring') }}</h1>
+        <h1 class="text-center sde-blue mb-2rem">{{ __('msg.omkring') }}</h1>
         <h4 class="mb-0 mt-1">Version:</h4>
         <p>1.0</p>
         <h4 class="mb-0 mt-1">{{__("msg.omappen")}}:</h4>
         <p>{{__("msg.infoomappen")}}</p>
-        <!--<h4 class="mb-1 mt-1">{{__("msg.programmedby")}}:</h4>
+        <!--{{__("msg.programmedby")}}:</h4>
-        <span style="margin-bottom: 0.2rem;"><span style="float: left;">Anders Rasmussen,</span><span style="float: right;">anders164a@gmail.com</span></span>
+        Anders Rasmussen, Anders164a@gmail.com
-        <span style="margin-bottom: 0.2rem;">Frederik Milling Pytlick,<span style="float: right;">frederikpyt@gmail.com</span></span>
+        Frederik Milling Pytlick, Frederikpyt@gmail.com
-        <span style="margin-bottom: 0.2rem;">Vedran Zelen,<span style="float: right;">zelenvedran@gmail.com</span></span>
+        Victor Neerholt, Victorneerholt@gmail.com-->
-        <span style="margin-bottom: 0.2rem;">Victor Neerholt,<span style="float: right;">victorneerholt@gmail.com</span></span>
-        <span style="margin-bottom: 0.2rem;">Sebastian Davaris,<span style="float: right;">sebastian@davaris.dk</span></span>-->
     </main>
 @endsection

skolehjem/resources/views/app/contacts/index.blade.php

@@ -4,7 +4,7 @@
 @endsection
 
 @section("content")
-    <main style="justify-content: unset">
+    <main class="justify-unset">
         <h1 class="text-center sde-blue mt-0 mb-0">{{__('msg.kontakter')}}</h1>
         @if(!$contacts->isEmpty())
             @foreach($contacts as $contact)

skolehjem/resources/views/app/events/index.blade.php

@@ -14,21 +14,15 @@
             width: auto;
             heigt: auto;
             box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
-        }
+            border-radius: 10px;
-        div.header {
-            background-color: #00788a;
-            color: white;
-            padding: 8px;
-            font-size: 10px;
-            text-align: center;
         }
         div.container {
             padding: 8px;
             text-align: justify;
             line-height: 1.5;
         }
-        ol {
+        .header > img {
-            padding-right: 8px;
+            border-radius: 10px 10px 0px 0px
         }
         /*Alert box*/
         .alert {
@@ -61,7 +55,7 @@
     </style>
 
     <main>
-        <h1 class="text-center sde-blue mb-0" style="margin-bottom: 2rem">{{ __('msg.aktiviteter') }}</h1>
+        <h1 class="text-center sde-blue mb-2rem">{{ __('msg.aktiviteter') }}</h1>
         <!--Alert box, display when a event is delete: start-->
         @if(count(\App\Notification::query()->where("user_id", "=", auth()->user()->id)->get()) > 0)
             <div class="alertBoxBackground" id="notifications">
@@ -81,39 +75,30 @@
             @foreach($events as $event)
                 <div class="card">
                     @if($event->resource_id !== null)
-                        <div class="header" style="background-size: cover; background-position: center; background-image: url('{{ asset(\App\Resource::query()->where("id", "=", $event->resource_id)->first()->filename) }}');">
-                            <h3 style="text-shadow: 2px 2px 2px #00788A;">{{ $event->name }}</h3>
-                            <p style="text-shadow: 2px 2px 2px #00788A"; class="text-center mt-0">{{__('msg.af')}}: {{ $event->accountable }}</p>
-                            <p style="text-shadow: 2px 2px 2px #00788A"; class="text-center mt-0">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }}</p>
-                        </div>
-                    @else
                         <div class="header">
-                            <h3>{{ $event->name }}</h3>
+                            <img class="w-100" src="{{ asset(\App\Resource::query()->where("id", "=", $event->resource_id)->first()->filename) }}">
-                            <p class="text-center mt-0">Af: {{ $event->accountable }}</p>
-                            <p class="text-center mt-0">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }}</p>
                         </div>
                     @endif
-                    <div class="container" style="margin-top: 8px;">
+                    <div class="container" class="mt-1">
-                        {!! \App\Helpers::closetags(substr($event->description, 0, 300) )!!}
+                        <p class="m-none">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }}</p>
-                        <input type="hidden" name="event_id" value="{{ $event->id }}">
+                        <h4 class="m-none">{{ $event->name }}</h4>
-                        {!! session()->get('error#' . $event->id) !!}
+                        <p class="mt-0">{{__('msg.af')}}: {{ $event->accountable }}</p>
-                        {!! session()->get('signup#' . $event->id) !!}
+                        <div class="row justify-content-space mt-1">
-                        <div class="row" style="justify-content: space-between; margin-top: 16px;">
                             @if (count(\App\UserEvent::query()->where('event_id', '=', $event->id)->where('user_id', '=', Auth::user()->id)->get()) > 0)
-                                <a style="margin: 0; padding: 0; font-weight: 700;" class="sde-blue text-center" href="javascript:void(0);" onclick="ajaxCall({{ $event->id }}, this)" >{{__('msg.afmeld')}}</a>
+                                <a class="sde-blue text-center m-none p-none bold" href="javascript:void(0);" onclick="ajaxCall({{ $event->id }}, this)" >{{__('msg.afmeld')}}</a>
                             @else {{-- ^ If you're already participating in the event, then show a ´cancel´ button - v Else show a ´participate´ button --}}
-                            <a style="margin: 0; padding: 0; font-weight: 700;" class="sde-blue text-center" href="javascript:void(0);" onclick="ajaxCall({{ $event->id }}, this)" >{{__('msg.tilmeld')}}</a>
+                            <a class="sde-blue text-center m-none p-none bold" href="javascript:void(0);" onclick="ajaxCall({{ $event->id }}, this)" >{{__('msg.tilmeld')}}</a>
                             @endif
-                            <a style="margin: 0; padding: 0; font-weight: 700;" class="sde-blue text-center" href="{{route("events.show", ["event" => $event->id ])}}">{{__('msg.læsmere')}}</a>
+                            <a class="sde-blue text-center m-none p-none bold" href="{{route("events.show", ["event" => $event->id ])}}">{{__('msg.læsmere')}}</a>
-                            <a style="margin: 0; padding: 0; font-weight: 700;" class="sde-blue text-center" href="{{route("events.accountsignups", ["event" => $event->id ])}}">{{__('msg.sedeltagere')}}</a>
+                            <a class="sde-blue text-center m-none p-none bold" href="{{route("events.accountsignups", ["event" => $event->id ])}}">{{__('msg.sedeltagere')}}</a>
                         </div>
                     </div>
                 </div>
             @endforeach
         @else
-            <p class="text-center" style="margin-bottom: auto">{{__('msg.dereringenaktiviteter')}}!</p>
+            <p class="text-center mb-auto">{{__('msg.dereringenaktiviteter')}}!</p>
         @endif
-        <a href="{{ route("userevents.index") }}" style="margin-top: auto" class="mt-2 btn text-center btn-sde-blue" id="tilmeld">{{__('msg.setilmeldteaktiviteter')}}</a>
+        <a href="{{ route("userevents.index") }}" class="mt-auto btn text-center btn-sde-blue" id="tilmeld">{{__('msg.setilmeldteaktiviteter')}}</a>
         <div id="snackbar"></div>
     </main>
 @endsection

skolehjem/resources/views/app/events/show.blade.php

@@ -9,19 +9,15 @@
         iframe, .ql-video {
             width: 100%;
         }
-
-        h2, h3, h4 {
-            margin-top: 0;
-        }
     </style>
     <main>
-        <h1 style="margin-bottom: 2rem" class="text-center sde-blue mt-0">{{__('msg.aktiviteter')}}</h1>
+        <h1 class="text-center sde-blue mt-0 mb-2rem">{{__('msg.aktiviteter')}}</h1>
-        <div style="padding: 4px; margin-top: .25rem; text-align: justify; ">
+        <div>
             <h2 class="text-center sde-blue mt-0 mb-1">{{ $event->name }}</h2>
             <p class="text-center mt-0">{{__('msg.af')}}: {{ $event->accountable }}</p>
             <p class="text-center mt-0">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }}</p>
         {!!$event->description!!}
         </div>
-        <button style="margin-top: auto" onclick="window.history.back()" class="btn btn-sde-blue text-white mb-1 mt-1" >{{__('msg.tilbage')}}</button>
+        <button onclick="window.history.back()" class="btn btn-sde-blue text-white mb-1 mt-auto" >{{__('msg.tilbage')}}</button>
     </main>
 @endsection

skolehjem/resources/views/app/events/signups.blade.php

@@ -51,12 +51,12 @@
         }
     </style>
     <main style="min-height: calc(100% - 61.3px)">
-        <table class="tbl" style="margin: 2rem 8px 0px 8px; width: calc(100% - 16px);">
+        <table class="tbl mt-2rem mr-1 mb-0 ml-1" style="width: calc(100% - 16px);">
             @if(count($events) == 0)
                 <p class="text-center mt-2">{{__('msg.ingentilmeldte')}}</p>
             @else
                 <tr>
-                    <th style="text-align: center;">{{ __('msg.tilmeldtesnavn') }}</th>
+                    <th class="text-center">{{ __('msg.tilmeldtesnavn') }}</th>
                 </tr>
             @endif
             @foreach($events as $UE)
@@ -67,6 +67,6 @@
                 @endif
             @endforeach
         </table>
-        <button onclick="document.location = document.referrer;" style="margin-top: auto; margin-bottom: 8px;" class="btn btn-sde-blue text-white">{{ __('msg.tilbage') }}</button>
+        <button onclick="document.location = document.referrer;" class="btn btn-sde-blue text-white mb-1 mt-auto">{{ __('msg.tilbage') }}</button>
     </main>
 @endsection

skolehjem/resources/views/app/events/yourevents.blade.php

@@ -33,7 +33,7 @@
     </style>
 
     <main>
-        <h1 class="text-center sde-blue mb-0" style="margin-bottom: 2rem">{{__('msg.tilmeldteaktiviteter')}}</h1>
+        <h1 class="text-center sde-blue mb-2rem">{{__('msg.tilmeldteaktiviteter')}}</h1>
         {!! session()->get('eventunsubscribed') !!}
         @if(!$userevents->isEmpty())
             @foreach($userevents as $userevent)
@@ -42,10 +42,10 @@
                     @method("delete")
                     <div class="card">
                         @if($userevent->resource_id !== null)
-                            <div class="header" style="background-size: cover; background-position: center; background-image: url('{{ asset(\App\Resource::query()->where("id", "=", $userevent->resource_id)->first()->filename) }}');">
+                            <div class="header bs-cover bp-center" style="background-image: url('{{ asset(\App\Resource::query()->where("id", "=", $userevent->resource_id)->first()->filename) }}');">
-                                <h3 style="text-shadow: 2px 2px 2px #00788A;">{{ $userevent->name }}</h3>
+                                <h3 class="event-text-shadow">{{ $userevent->name }}</h3>
-                                <p style="text-shadow: 2px 2px 2px #00788A"; class="text-center mt-0">{{__('msg.af')}}: {{ $userevent->accountable }}</p>
+                                <p class="event-text-shadow text-center mt-0">{{__('msg.af')}}: {{ $userevent->accountable }}</p>
-                                <p style="text-shadow: 2px 2px 2px #00788A"; class="text-center mt-0">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($userevent->date))->format('d/m/Y \k\l\. H:i') }}</p>
+                                <p class="event-text-shadow text-center mt-0">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($userevent->date))->format('d/m/Y \k\l\. H:i') }}</p>
                             </div>
                         @else
                             <div class="header">
@@ -55,14 +55,14 @@
                             </div>
                         @endif
                         <div class="container">
-                            <div class="row" style="justify-content: space-between;">
+                            <div class="row justify-content-space">
                                 @if (count(\App\UserEvent::query()->where('event_id', '=', $userevent->id)->where('user_id', '=', Auth::user()->id)->get()) > 0)
-                                    <a style="margin: 0; padding: 0; font-weight: 700;" class="sde-blue text-center" href="javascript:void(0);" onclick="ajaxCall({{ $userevent->id }}, this)" id="t">{{__('msg.afmeld')}}</a>
+                                    <a class="sde-blue text-center m-none p-none bold" href="javascript:void(0);" onclick="ajaxCall({{ $userevent->id }}, this)" id="t">{{__('msg.afmeld')}}</a>
                                 @else {{-- ^ If you're already participating in the event, then show a ´cancel´ button - v Else show a ´participate´ button --}}
-                                <a style="margin: 0; padding: 0; font-weight: 700;" class="sde-blue text-center" href="javascript:void(0);" onclick="ajaxCall({{ $userevent->id }}, this)" >{{__('msg.tilmeld')}}</a>
+                                <a class="sde-blue text-center m-none p-none bold" href="javascript:void(0);" onclick="ajaxCall({{ $userevent->id }}, this)" >{{__('msg.tilmeld')}}</a>
                                 @endif
-                                <a style="margin: 0; padding: 0; font-weight: 700;" class="sde-blue text-center" href="{{route("events.show", ["event" => $userevent->id ])}}">{{__('msg.læsmere')}}</a>
+                                <a class="sde-blue text-center m-none p-none bold" href="{{route("events.show", ["event" => $userevent->id ])}}">{{__('msg.læsmere')}}</a>
-                                <a style="margin: 0; padding: 0; font-weight: 700;" class="sde-blue text-center" href="{{route("events.accountsignups", ["event" => $userevent->id ])}}">{{__('msg.sedeltagere')}}</a>
+                                <a class="sde-blue text-center m-none p-none bold" href="{{route("events.accountsignups", ["event" => $userevent->id ])}}">{{__('msg.sedeltagere')}}</a>
                             </div>
                         </div>
                     </div>
@@ -71,7 +71,7 @@
         @else
             <p class="text-center">{{__('msg.duharikketilmeldtdignogenaktiviteter')}}!</p>
         @endif
-        <a onclick="window.history.back()" type="submit" style="margin-top: auto" class="mt-2 btn text-center btn-sde-blue">{{__('msg.tilbage')}}</a>
+        <a onclick="window.history.back()" type="submit" class="mt-auto btn text-center btn-sde-blue">{{__('msg.tilbage')}}</a>
         <div id="snackbar"></div>
     </main>
 @endsection

skolehjem/resources/views/app/feedbacks/create.blade.php

@@ -5,13 +5,8 @@
 @endsection
 
 @section("content")
-    <style>
-        textarea {
-            color: black;
-        }
-    </style>
     <main style="min-height: calc(100% - 61.34px)" class="text-center">
-        <div method="post" style="margin-top: 4rem; margin-bottom: auto; max-width: 100%; padding: 0 0.45rem 0 0.45rem; display: flex; flex-direction: column; justify-content: center;">
+        <div method="post" class="mt-3 mb-auto d-flex flex-column pl-1 pr-1">
             @csrf
             <span>{{__("msg.risros")}}</span>
             <select id="suggestion_form" name="suggestion_form" class="mb-2" required>
@@ -20,7 +15,7 @@
                 <option value="Andet">{{__("msg.andet")}}</option>
             </select>
             <span>{{__("msg.besked")}}:</span>
-            <textarea id="message" name="message" placeholder="{{__("msg.besked")}}" style="resize: vertical;" required></textarea>
+            <textarea class="text-black resize-vertical" id="message" name="message" placeholder="{{__("msg.besked")}}" required></textarea>
             <button onclick="ajaxCall(document.getElementById('suggestion_form'), document.getElementById('message'))" class="btn btn-sde-blue mt-2">{{__("msg.send")}}</button>
         </div>
         <div id="snackbar"></div>

skolehjem/resources/views/app/guides/index.blade.php

@@ -32,18 +32,9 @@
 
         div.container {
             padding: 8px;
-            text-align: justify;
             line-height: 1.5;
         }
 
-        ol {
-            padding-right: 8px;
-        }
-
-        input, select {
-           /* margin-bottom: 0;*/
-        }
-
         .select2-container--default .select2-results > .select2-results__options {
             max-height: 120px !important;
         }
@@ -51,10 +42,6 @@
         .select2-results__option, .select2-search__field {
             color: black;
         }
-
-        .justify-content-center {
-            justify-content: center;
-        }
     </style>
     <script src="{{ asset("/js/jquery-3.2.1.min.js") }}"></script>
     <link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-beta.1/dist/css/select2.min.css" rel="stylesheet" />
@@ -66,11 +53,11 @@
         });
     </script>
     <main style="min-height: calc(100% - 61.34px);">
-        <h1 class="text-center sde-blue mt-0" style="margin-bottom: 2rem;">{{__('msg.vejledning')}}</h1>
+        <h1 class="text-center sde-blue mt-0 mb-2rem">{{__('msg.vejledning')}}</h1>
         @if(!$guides->isEmpty())
             @if (count(\App\GuidesCategory::query()->get()) > 1)
                 <h4 class="mt-0 mb-0">{{ __("msg.kategorier") }}</h4>
-                <select id="categorySelect" class="js-example-basic-single" name="state" style="margin-bottom: 2rem !important;">
+                <select id="categorySelect" class="js-example-basic-single mb-2rem" name="state">
                     <option value="All" selected>{{ __("msg.allekategorier") }}</option>
                     @foreach (\App\GuidesCategory::query()->get() as $Category)
                         <option value="{{ $Category->id }}">{{ $Category->guidesCategoryName }}</option>
@@ -82,29 +69,27 @@
                 @foreach($guides as $guide)
                     <div class="card">
                         @if($guide->resource_id !== null)
-                            <div class="header" style="background-size: cover; background-position: center; background-image: url('{{ asset(\App\Resource::query()->where("id", "=", $guide->resource_id)->first()->filename) }}');">
+                            <div class="header bs-cover bp-center" style="background-image: url('{{ asset(\App\Resource::query()->where("id", "=", $guide->resource_id)->first()->filename) }}');">
-
                             </div>
                         @else
                             <div class="header d-flex justify-content-center">
-                                <img src="{{ asset('/images/icons/image.svg')  }}" style="width: calc(100% - 20px)">
+                                <img alt="Image" src="{{ asset('/images/icons/image.svg')  }}" style="width: calc(100% - 20px)">
                             </div>
                         @endif
-                        <div class="container">
+                        <div class="container w-100">
-                            <div class="row" style="justify-content: center;">
+                            <div class="row justify-content-center">
                                 <h4>{{ $guide->name}}</h4>
                             </div>
-                            <div class="row" style="justify-content: center;">
+                            <div class="row justify-content-center">
-                                <a style="margin: 0; padding: 0; text-align: center; font-weight: 700;" class="sde-blue" href="{{route("guides.show", ["guide" => $guide->id ])}}">{{__('msg.læsmere')}}</a>
+                                <a class="text-center m-none p-none bold sde-blue" href="{{route("guides.show", ["guide" => $guide->id ])}}">{{__('msg.læsmere')}}</a>
                             </div>
                         </div>
                     </div>
                 @endforeach
             </div>
         @else
-            <p style="margin: 0 18px; margin-bottom: auto; text-align: center">{{__('msg.dereringenvejledninger')}}.</p>
+            <p class="mb-auto text-center">{{__('msg.dereringenvejledninger')}}.</p>
         @endif
-        <button onclick="window.history.back()" style="margin-top: auto;" class="btn btn-sde-blue text-white mb-1 mt-1" >{{__('msg.tilbage')}}</button>
     </main>
 
     <script>

skolehjem/resources/views/app/guides/show.blade.php

@@ -5,18 +5,12 @@
 @endsection
 
 @section("content")
-    <style>
-        h2, h3, h4 {
-            margin-top: 0;
-        }
-    </style>
     <main>
-        <h1 style="margin-bottom: 2rem" class="text-center sde-blue mt-0">{{__('msg.vejledning')}}</h1>
+        <div>
-        <div style="padding: 4px; margin-top: .25rem; text-align: justify; ">
+            <h2 class="text-center sde-blue">{{ $guide->name }}</h2>
-        <h2 class="text-center sde-blue mt-0">{{ $guide->name }}</h2>
             {!!$guide->guide_articles!!}
         </div>
-        <button style="margin-top: auto" onclick="window.history.back()" class="btn btn-sde-blue text-white mb-1 mt-1" >{{__('msg.tilbage')}}</button>
+        <button onclick="window.history.back()" class="btn btn-sde-blue text-white mb-1 mt-auto" >{{__('msg.tilbage')}}</button>
 
     </main>
 

skolehjem/resources/views/app/layout/base.blade.php

@@ -42,14 +42,14 @@
     </script>
 </head>
 <body onresize="setMain()" onload="setMain();">
-<header class="row align-items-center" id="header" style="position: fixed; z-index: 100; top: 0; width: calc(100% - 1.75rem - 1.75rem); background: #00788a; transition: top 0.3s;">
+<header class="row align-items-center position-fixed top-0 zindex-100 bg-sde-blue" id="header" style="width: calc(100% - 1.75rem - 1.75rem); transition: top 0.3s;">
     @if(request()->cookie("mode") == "dark")
         <img class="w-50" id="sdeLogo" src="{{URL::asset('/images/logos/Logo-hvid.svg')}}" onclick="location.href = '{{ route("root.index") }}';" alt="Syddansk Erhvervsskole">
     @else
         <img class="w-50" id="sdeLogo" src="{{URL::asset('/images/logos/Logo-hvid.svg')}}" onclick="location.href = '{{ route("root.index") }}';" alt="Syddansk Erhvervsskole">
     @endif
-    <button class="ml-auto btn-sde-blue" style="border: none; font-size: 20px; outline: none;" id="toggle">
+    <button class="ml-auto btn-sde-blue font-20px border-none outline-none" id="toggle">
-        <i id="icon" class="fas fa-bars" style="color: white;"></i>
+        <i id="icon" class="fas fa-bars text-white"></i>
     </button>
 </header>
 <div class="d-none bg-sde-blue col" id="menu">
@@ -176,7 +176,6 @@
     }
 
     document.getElementsByTagName("main")[0].style.paddingTop = (10+document.getElementById("header").clientHeight) + "px";
-    //document.getElementById("menu").style.paddingTop = document.getElementById("header").clientHeight + "px";
 </script>
 </body>
 </html>

skolehjem/resources/views/app/menuplans/index.blade.php

@@ -7,7 +7,7 @@
     <?php
         $Week = date('W'); //Current week
     ?>
-    <main style="justify-content: unset">
+    <main class="justify-unset">
         @if($menuPlans->contains('week', $Week)) {{-- If any of the menues in the menu table has the number of the week in the 'week' column, do this --}}
             @foreach($menuPlans as $menuplan)
                 @if($menuplan->week == $Week)

skolehjem/resources/views/app/news/index.blade.php

@@ -120,7 +120,7 @@
 
 
     </style>
-    <main style="justify-content: unset; padding: 0">
+    <main class="justify-unset p-none">
     <?php
     date_default_timezone_set('Europe/Copenhagen');
     ?>
@@ -204,7 +204,7 @@
                           <span class="createdat">{{__('msg.opret')}}{{ date('Y-m-d H:i:s', strtotime($new->created_at))}}</span>
                       </div>
                       @if($new->resource_id !== null)
-                          <div class="header" style="background-size: cover; background-position: center; background-image: url('{{ asset(\App\Resource::query()->where("id", "=", $new->resource_id)->first()->filename) }}');"></div>
+                          <div class="header bs-cover bp-center" style="background-image: url('{{ asset(\App\Resource::query()->where("id", "=", $new->resource_id)->first()->filename) }}');"></div>
                           <div class="information">{{__('msg.kategori')}}  <span class="dot"></span> {{\App\GuidesCategory::query()->where('id', '=', \App\Guide::query()->where('id','=', $new->arrangement_id)->first()->guide_category_id)->first()->guidesCategoryName}}</div>
                       @endif
 

skolehjem/resources/views/app/settings/index.blade.php

@@ -66,31 +66,31 @@
         }
     </style>
     <script src="{{ asset("/js/jquery-3.2.1.min.js") }}"></script>
-    <main style="justify-content: unset">
+    <main class="justify-unset">
         <label for="langu" class="mt-2">Sprog / Languages:</label>
         <select name="langName" id="lang">
             @if(request()->cookie('languagesSetting') == "dk")
-                <option style="color: black;" selected name="langDK" value="dk">Dansk</option>
+                <option class="text-black" selected name="langDK" value="dk">Dansk</option>
             @else
-                <option style="color: black;" name="langDK" value="dk">Dansk</option>
+                <option class="text-black" name="langDK" value="dk">Dansk</option>
             @endif
             @if(request()->cookie('languagesSetting') == "en")
-                <option selected style="color: black;" name="langEN" value="en">English</option>
+                <option selected class="text-black" name="langEN" value="en">English</option>
             @else
-                <option name="langEN" style="color: black;" value="en">English</option>
+                <option name="langEN" class="text-black" value="en">English</option>
             @endif
         </select>
         <label for="dark">Tema / Theme:</label>
         <select name="light" id="darkmode">
             @if(request()->cookie('mode') == "light")
-                <option selected name="ligthmode" style="color: black;" value="Light">{{ __("msg.lys") }}</option>
+                <option selected name="ligthmode" class="text-black" value="Light">{{ __("msg.lys") }}</option>
             @else
-                <option name="light" style="color: black;" value="light">{{ __("msg.lys") }}</option>
+                <option name="light" class="text-black" value="light">{{ __("msg.lys") }}</option>
             @endif
             @if(request()->cookie('mode') == "dark")
-                <option selected name="darkmode" style="color: black;" value="dark">{{ __("msg.mørk") }}</option>
+                <option selected name="darkmode" class="text-black" value="dark">{{ __("msg.mørk") }}</option>
             @else
-                <option name="dark" style="color: black;" value="dark">{{ __("msg.mørk") }}</option>
+                <option name="dark" class="text-black" value="dark">{{ __("msg.mørk") }}</option>
             @endif
         </select>
         <label for="dark">E-mail Notifikationer / E-mail Notifications:</label>

skolehjem/resources/views/app/users/account.blade.php

@@ -6,15 +6,15 @@
 
 @section("content")
     <script src="{{ asset("/js/jquery-3.2.1.min.js") }}"></script>
-    <main style="justify-content: unset">
+    <main class="justify-unset">
         <h1 class="text-center sde-blue mt-1">{{__('msg.konto')}}</h1>
         @if(\App\Resource::query()->where("id", "=", Auth::user()->resource_id)->first() !== null)
-            <img style="width: calc(100% - 72px); margin: auto;" src="{{ \App\Resource::query()->where("id", "=",Auth::user()->resource_id)->first()->filename }}">
+            <img class="m-auto" style="width: calc(100% - 72px);" src="{{ \App\Resource::query()->where("id", "=",Auth::user()->resource_id)->first()->filename }}">
         @else
             @if(request()->cookie("mode") == "dark")
-                <img style="width: calc(100% - 72px); margin: auto;" src="{{ asset("/images/icons/user-hvid.svg") }}">
+                <img class="m-auto" style="width: calc(100% - 72px);" src="{{ asset("/images/icons/user-hvid.svg") }}">
             @else
-                <img style="width: calc(100% - 72px); margin: auto;" src="{{ asset("/images/icons/user.svg") }}">
+                <img class="m-auto" style="width: calc(100% - 72px);" src="{{ asset("/images/icons/user.svg") }}">
             @endif
         @endif
         <h4 class="mt-2">{{__('msg.navn')}}: {{ Auth::user()->name_first . " " . Auth::user()->name_last }}</h4>

skolehjem/resources/views/app/users/edit.blade.php

@@ -5,7 +5,7 @@
 @endsection
 
 @section("content")
-    <main style="justify-content: unset">
+    <main class="justify-unset">
         <h1 class="text-center sde-blue mt-1">{{__('msg.konto')}}</h1>
         <form method="post" action="{{ route("users.accountupdate", ['user' => Auth::user()]) }}" onsubmit="return checkInputs()">
             @csrf

skolehjem/resources/views/app/users/editpass.blade.php

@@ -5,7 +5,7 @@
 @endsection
 
 @section("content")
-    <main style="justify-content: unset">
+    <main class="justify-unset">
         <h1 class="text-center sde-blue mt-1">{{__('msg.konto')}}</h1>
         <form method="post" action="{{ route("users.accountupdate", ['user' => Auth::user()]) }}">
             @csrf
@@ -27,7 +27,7 @@
             </div>
             {!! session()->get('error#notsamepass') !!}
             {!! session()->get('error#oldpass') !!}
-            <button type="submit" style="margin-top: auto;" class="btn text-center btn-sde-blue mt-1">{{__('msg.rediger')}}</button>
+            <button type="submit" class="btn text-center btn-sde-blue mt-auto">{{__('msg.rediger')}}</button>
             <a onclick="window.history.back()" class="btn text-center btn-sde-blue mt-1">{{__('msg.tilbage')}}</a>
         </form>
 

skolehjem/resources/views/app/users/editpic.blade.php

@@ -5,19 +5,19 @@
 @endsection
 
 @section("content")
-    <main style="justify-content: unset">
+    <main class="justify-unset">
         <h1 class="text-center sde-blue mt-1">{{__('msg.konto')}}</h1>
         <form method="post" action="{{ route("users.accountupdate", ['user' => Auth::user()]) }}" enctype="multipart/form-data">
             @csrf
             @method("put")
 
             @if(\App\Resource::query()->where("id", "=", Auth::user()->resource_id)->first() !== null)
-                <img style="width: calc(100% - 72px); margin: auto;" src="{{ \App\Resource::query()->where("id", "=",Auth::user()->resource_id)->first()->filename }}">
+                <img class="m-auto" style="width: calc(100% - 72px);" src="{{ \App\Resource::query()->where("id", "=",Auth::user()->resource_id)->first()->filename }}">
             @else
                 @if(request()->cookie("mode") == "dark")
-                    <img style="width: calc(100% - 72px); margin: auto;" src="{{ asset("/images/icons/user-hvid.svg") }}">
+                    <img class="m-auto" style="width: calc(100% - 72px);" src="{{ asset("/images/icons/user-hvid.svg") }}">
                 @else
-                    <img style="width: calc(100% - 72px); margin: auto;" src="{{ asset("/images/icons/user.svg") }}">
+                    <img class="m-auto" style="width: calc(100% - 72px);" src="{{ asset("/images/icons/user.svg") }}">
                 @endif
             @endif
 

skolehjem/resources/views/app/users/forgot.blade.php

@@ -5,7 +5,7 @@
 @endsection
 
 @section("content")
-    <main style="background-color: #00788a; height: 100%;">
+    <main class="h-100 bg-sde-blue">
         <div class="brand">
             <img src="{{URL::asset('/images/logos/Logo-hvid.svg')}}" alt="Syddansk Erhvervsskole">
         </div>

skolehjem/resources/views/app/users/index.blade.php

@@ -1,40 +0,0 @@
-@extends('app.layout.base')
-
-@section('content')
-
-    <p>/skolehjem-webapp/skolehjem/resources/views/app/users/index.blade.php</p>
-    <!--Kan i huske at vi nogen gange så det gammel gui, ja det er så det her-->
-    <!--
-    <main id="main" style="justify-content: space-between;">
-        <div class="d-flex col block-container mt-2">
-            <a href="{{ route('menu-plans.index') }}" class="block text-center mb-1">{{ __('msg.menuplan') }}</a>
-            <a href="{{ route('events.index') }}" class="block text-center mb-1">{{ __('msg.aktiviteter') }}</a>
-            <a href="{{ route('washing-reservations.appindex') }}" class="block text-center mb-1">{{ __('msg.reservationer') }}</a>
-            <a href="{{ route('contacts.index') }}" class="block text-center mb-1">{{ __('msg.kontoret') }}</a>
-            <a href="{{ route('phones.index') }}" class="block text-center mb-1">{{ __('msg.vagttelefon') }}</a>
-            <a href="{{ route('guides.index') }}" class="block text-center mb-1">{{ __('msg.vejledning') }}</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">
-            </a>
-            <a href="https://www.youtube.com" target="_blank" class="link">
-                <img src="{{ URL::asset('/images/icons/yt.png') }}" class="h-100" alt="Youtube">
-            </a>
-            <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>
-    </main>-->
-@endsection
-
-@section('scripts')
-    <script>
-        function mainHeight() {
-            document.getElementById('main').style.height = (window.innerHeight - document.getElementById('header').clientHeight) + "px";
-        }
-
-        window.onresize = mainHeight;
-        mainHeight();
-    </script>
-@endsection

skolehjem/resources/views/app/users/login.blade.php

@@ -5,7 +5,7 @@
 @endsection
 
 @section("content")
-    <main style="background-color: #00788a; height: 100%;">
+    <main class="bg-sde-blue h-100">
         <!--Make the app open in fullscreen-->
         <link rel="stylesheet" type="text/css" href="/../../../css/addtohomescreen.css">
         <script src="/../../../js/addtohomescreen.js"></script>
@@ -18,7 +18,7 @@
             <input class="appinput" type="email" name="email" placeholder="Email" required>
             <div class="input-group text-left">
                 <input type="password" class="appinput form-control" name="password" id="password" placeholder="Password" required>
-                <span class="fa fa-fw fa-eye field-icon toggle-password" id="fa-password" onclick="show('password', 'fa-password')" style="background-color: #00788a; color: white;"></span>
+                <span class="fa fa-fw fa-eye field-icon toggle-password bg-sde-blue text-white" id="fa-password" onclick="show('password', 'fa-password')"></span>
             </div>
             <label class="toggle">
                 <input class="toggle__input" type="checkbox" name="rememberpassword">
@@ -30,7 +30,7 @@
             {!! session()->get('error#wrongcredentials') !!}
             {!! session()->get('success#loggedout') !!}
             <input class="btn btn-dark" type="submit" value="Sign in">
-            <button type="button" class="btn btn-dark" onclick="location.href = '{{ route("users.signup") }}'" style="line-height: 2rem;">Register</button>
+            <button type="button" class="btn btn-dark lh-2" onclick="location.href = '{{ route("users.signup") }}'">Register</button>
         </form>
         <a class="text-white text-center" href="{{ route('users.show-forgot') }}">Forgot password?</a>
     </main>

skolehjem/resources/views/app/users/register.blade.php

@@ -5,7 +5,7 @@
 @endsection
 
 @section("content")
-    <main style="background-color: #00788a; height: 100%;">
+    <main class="bg-sde-blue h-100">
         <div class="brand">
             <img src="{{ URL::asset('/images/logos/Logo-hvid.svg') }}" alt="Syddansk Erhvervsskole">
         </div>

skolehjem/resources/views/app/users/signup.blade.php

@@ -5,7 +5,7 @@
 @endsection
 
 @section("content")
-    <main style="background-color: #00788a; height: 100%;">
+    <main class="bg-sde-blue h-100">
         <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
         <div class="brand">
             <img src="{{URL::asset('/images/logos/Logo-hvid.svg')}}" alt="Syddansk Erhvervsskole">
@@ -20,20 +20,7 @@
             <input class="appinput" type="email" id="email" name="email" placeholder="E-mail" required>
             <input class="appinput" type="password" pattern="(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}" title="Must contain at least one number and one uppercase and lowercase letter, and at least 8 or more characters" name="password" id="password1" placeholder="Password" required>
             <input class="appinput" type="password" name="password2" id="password2" placeholder="Confirm password" required>
-            <input class="appinput" type="tel" id="phone" name="phone" placeholder="Phone number" pattern="[0-9]{2}[0-9]{2}[0-9]{2}[0-9]{2}" required style="margin-bottom: 1.5rem;">
+            <input class="appinput" type="tel" id="phone" name="phone" placeholder="Phone number" pattern="[0-9]{2}[0-9]{2}[0-9]{2}[0-9]{2}" required class="mb-2rem">
-            <!--<label style="color: white">Education end date:</label>
-            <input class="appinput" type="date" name="eduenddate" placeholder="Education end date" required>-->
-            <!--Koncept-->
-            <!--<label style="color: white" for="edu">Education:</label>
-            <select style="color: white" name="edu" id="edu">
-                <option value="datapro">Datatekniker med programmering</option>
-                <option value="datainf">Datatekniker med infrastruktur</option>
-                <option value="dataits">Datatekniker med IT-Support</option>-->
-                <!--<option value="saab">Murer</option>
-                <option value="opel">Tømmer</option>
-                <option value="audi">Maler</option>-->
-            <!--</select>-->
-            <!--Koncept-->
             <input class="btn btn-dark" type="submit" id="disable" value="Sign up">
             <input onclick="window.history.back()" class="btn btn-dark text-center  " value="Back">
         </form>

skolehjem/resources/views/app/vagttelefons/index.blade.php

@@ -4,7 +4,7 @@
 @endsection
 
 @section("content")
-    <main style="justify-content: unset">
+    <main class="justify-unset">
         <img class="mt-3" src="{{ URL::asset('/images/icons/Vagttelefon-normal.svg') }}" alt="Vagttelefon" style="height: 16vw;">
         <h1 class="text-center sde-blue mt-0">{{__('msg.vagttelefon')}}</h1>
         <p class="mt-0 mb-0">Den kan bruges i dagtimerne til almindelig kontakt om ting vedrørende kollegiet.</p>
@@ -17,8 +17,8 @@
                 <span class="toggle__text sde-blue semi-bold">{{__('msg.accepter')}}</span>
             </span>
         </label>
-        <span class="text-center sde-black-20 mt-2" style="margin-top: auto;">+45 24 62 94 50</span>
+        <span class="text-center sde-black-20 mt-auto">+45 24 62 94 50</span>
-        <a class="btn text-center btn-sde-blue btn-disabled" style="margin-bottom: 8px;" id="call">{{__('msg.ring')}}</a>
+        <a class="btn text-center btn-sde-blue btn-disabled mb-1" id="call">{{__('msg.ring')}}</a>
     </main>
 @endsection
 

skolehjem/resources/views/app/washing-reservations/create.blade.php

@@ -10,7 +10,7 @@
             color: black;
         }
     </style>
-    <main style="justify-content: unset">
+    <main class="justify-unset">
         <h1 class="text-center sde-blue mb-0">{{__('msg.bookingliste')}}</h1>
         {!! session()->get('ReservationExists') !!}
         <div class="col w-100 mt-1">