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

Conflicts: skolehjem/resources/views/app/news/index.blade.php
2020-08-31 14:44:15 +02:00
parent 34b078b21a 9b26e5f1af
commit 101be37dfe
2 changed files with 2 additions and 3 deletions
@@ -9,7 +9,6 @@
            margin-top: .5rem;
            margin-bottom: 7px;
            width: auto;
-            heigt: auto;
            @if(request()->cookie("mode") == "dark")
                background-color: rgba(0,0,0, 0.3);
            @else