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

 Conflicts:

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

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

@@ -43,14 +43,14 @@
         <img src="{{URL::asset('/images/icons/Vagttelefon-hvid.svg')}}" alt="Vagttelefon">
         Vagttelefon
     </a>
-    <a href="{{ route("users.account") }}">
-        <img src="{{URL::asset('/images/icons/user-hvid.svg')}}" alt="Konto">
-        Konto
-    </a>
     <a href="{{ route("guides.index") }}">
         <img src="{{URL::asset('/images/icons/Vejledninger.svg')}}" alt="Guide">
         Vejledning
     </a>
+    <a href="{{ route("users.account") }}">
+        <img src="{{URL::asset('/images/icons/user-hvid.svg')}}" alt="Konto">
+        Konto
+    </a>
     <a href="{{ route('users.logout') }}">
         <img src="{{URL::asset('/images/icons/Logout.svg')}}" alt="Logud">
         Log Ud

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

@@ -1,15 +1,17 @@
 @extends('app.layout.base')
 
 @section('content')
-    <main>
+    <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">Menuplan</a>
             <a href="{{ route('events.index') }}" class="block text-center mb-1">Aktiviteter</a>
             <a href="{{ route('washing-reservations.appindex') }}" class="block text-center mb-1">Reservationer</a>
             <a href="{{ route('contacts.index') }}" class="block text-center mb-1">Kontoret</a>
             <a href="{{ route('phones.index') }}" class="block text-center mb-1">Vagttelefon</a>
+            <a href="{{ route('guides.index') }}" class="block text-center mb-1">Vejledninger</a>
         </div>
-        <div class="row" style="position: absolute; bottom: 8px; align-self: center;">
+    <!--
+        <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>
@@ -19,7 +21,17 @@
             <a href="https://www.instagram.com" target="_blank" class="link">
                 <img src="{{ URL::asset('/images/icons/instagram.png') }}" class="h-100" alt="Instagram">
             </a>
-
+        </div>-->
-        </div>
     </main>
 @endsection
+
+@section('scripts')
+    <script>
+        function mainHeight() {
+            document.getElementById('main').style.height = (window.innerHeight - document.getElementById('header').clientHeight) + "px";
+        }
+
+        window.onresize = mainHeight;
+        mainHeight();
+    </script>
+@endsection