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

Conflicts: skolehjem/app/Http/Controllers/EventController.php
2020-08-10 10:17:41 +02:00
parent b27d05e55c fead36dd52
commit 3263663f3d
6 changed files with 12 additions and 5 deletions
@@ -69,7 +69,7 @@
    }

    div.header {
-        background-color: #4CAF50;
+        background-color: #00788a;
        color: white;
        padding: 1px;
        font-size: 10px;
@@ -88,7 +88,7 @@
        <div class="card">
            <div class="header">
                <p><b>{{ $new->name }}</b></p>
-                <h1>Æggeløb</h1>
+                <h1>{{ $new->subname }}</h1>
            </div>

            <div class="container">