Merge remote-tracking branch 'origin/master'

2020-06-24 07:40:33 +02:00
parent a6c20f8ee8 dd5a9fdbc6
commit fb90868be6
58 changed files with 36393 additions and 49 deletions
@@ -6,7 +6,8 @@
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
    <link type="text/css" rel="stylesheet" href="{{ mix("/css/webapp.css") }}">
 </head>
-<body style="background-color: #00788a;">
+<body>
+
    @yield("content")

    <script src="{{ mix("/js/app.js") }}"></script>
@@ -3,14 +3,48 @@
 <head>
    <title>@yield("title")</title>
    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+{{--    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">--}}
    <link type="text/css" rel="stylesheet" href="{{ mix("/css/webapp.css") }}">
 </head>
 <body>
-    @yield("header")
-    @yield("content")
+{{--    @yield("header")--}}
+<header class="row align-items-center">
+    <img class="w-50" id="sdeLogo" src="{{URL::asset('/images/logos/Logo-normal.svg')}}" alt="Syddansk Erhvervsskole">
+    <button class="ml-auto" onclick="toggleMenu('menu')" id="toggle">
+{{--        <img src="{{URL::asset('/images/icons/icon.svg')}}" id="menuIcon" alt="-">--}}
+        <i class="fas fa-bars"></i>
+    </button>
+</header>
+<div class="d-none bg-sde-blue col" id="menu">
+    <a href="">
+        <img src="{{URL::asset('/images/icons/Menuplan.svg')}}" alt="Menuplan">
+        Menuplan
+    </a>
+    <a href="">
+        <img src="{{URL::asset('/images/icons/Aktiviteter.svg')}}" alt="Aktiviteter">
+        Aktiviteter
+    </a>
+    <a href="">
+        <img src="{{URL::asset('/images/icons/Vaske booking liste.svg')}}" alt="Vaske booking liste">
+        Vaske booking liste
+    </a>
+    <a href="">
+        <img src="{{URL::asset('/images/icons/Galleri.svg')}}" alt="Galleri">
+        Galleri
+    </a>
+    <a href="">
+        <img src="{{URL::asset('/images/icons/Kontoret.svg')}}" alt="Kontoret">
+        Kontoret
+    </a>
+    <a href="">
+        <img src="{{URL::asset('/images/icons/Vagttelefon-hvid.svg')}}" alt="Vagttelefon">
+        Vagttelefon
+    </a>
+</div>

-    <script src="{{ mix("/js/app.js") }}"></script>
-    @yield("scripts")
+@yield("content")
+
+<script src="{{ mix("/js/app.js") }}"></script>
+@yield("scripts")
 </body>
 </html>
@@ -1,4 +1,4 @@
-@extends("app.layout.base")
+@extends("webapp.layout.base")

@section("title")
    Login
@@ -1,4 +1,4 @@
-@extends("app.layout.base")
+@extends("webapp.layout.base")

@section("title")
    Register