Merge remote-tracking branch 'origin/master'

# Conflicts:
#	skolehjem/resources/views/app/layout/base.blade.php
This commit is contained in:
Anders
2020-08-05 08:34:23 +02:00
8 changed files with 4 additions and 9 deletions
@@ -7,7 +7,7 @@
</head>
<body>
<header class="row align-items-center" id="header">
<img class="w-50" id="sdeLogo" src="{{URL::asset('/images/logos/Logo-normal.svg')}}" alt="Syddansk Erhvervsskole">
<a href="{{ route("root.index") }}"><img class="w-50" id="sdeLogo" src="{{URL::asset('/images/logos/Logo-normal.svg')}}" alt="Syddansk Erhvervsskole"></a>
<button class="ml-auto" id="toggle">
<i id="icon" class="fas fa-bars"></i>
</button>