From 812fe9b321d3b31723cfb0aef96a6d3b47619dda Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sun, 10 Feb 2019 19:39:53 +0100
Subject: [PATCH 1/2] made navbar background gradient start with primary color

---
 templates/widgets/navbar.hamlet |  2 +-
 templates/widgets/navbar.lucius | 40 +++------------------------------
 2 files changed, 4 insertions(+), 38 deletions(-)

diff --git a/templates/widgets/navbar.hamlet b/templates/widgets/navbar.hamlet
index 86f1a3246..8d687034a 100644
--- a/templates/widgets/navbar.hamlet
+++ b/templates/widgets/navbar.hamlet
@@ -32,7 +32,7 @@ $newline never
                 <i .fas.fa-#{fromMaybe "none" menuItemIcon}>
                 <div .navbar__link-label>_{SomeMessage menuItemLabel}
           $of NavbarSecondary
-            <li .navbar__list-item.navbar__list-item--secondary :highlight (urlRoute menuItemRoute):.navbar__list-item--active>
+            <li .navbar__list-item :highlight (urlRoute menuItemRoute):.navbar__list-item--active>
               $if menuItemModal
                 <div .modal.js-modal #modal-#{menuIdent} data-trigger=#{menuIdent} data-closeable data-dynamic>
               <a .navbar__link-wrapper href=#{route} ##{menuIdent}>
diff --git a/templates/widgets/navbar.lucius b/templates/widgets/navbar.lucius
index 89c339c61..7cba47a78 100644
--- a/templates/widgets/navbar.lucius
+++ b/templates/widgets/navbar.lucius
@@ -37,9 +37,9 @@
   left: var(--asidenav-width-xl);
   height: var(--header-height);
   background: var(--color-darker); /* Old browsers */
-  background: -moz-linear-gradient(bottom, var(--color-dark) 0%, var(--color-darker) 100%); /* FF3.6-15 */
-  background: -webkit-linear-gradient(bottom, var(--color-dark) 0%,var(--color-darker) 100%); /* Chrome10-25,Safari5.1-6 */
-  background: linear-gradient(to top, var(--color-dark) 0%,var(--color-darker) 100%); /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */
+  background: -moz-linear-gradient(bottom, var(--color-primary) 0%, var(--color-primary) 80%, var(--color-dark) 100%); /* FF3.6-15 */
+  background: -webkit-linear-gradient(bottom, var(--color-primary) 0%, var(--color-primary) 80%, var(--color-dark) 100%); /* Chrome10-25,Safari5.1-6 */
+  background: linear-gradient(to top, var(--color-primary) 0%, var(--color-primary) 80%, var(--color-dark) 100%); /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */
   color: white;
   z-index: 20;
   box-shadow: 0 0 4px rgba(0, 0, 0, 0.2);
@@ -207,40 +207,6 @@
   }
 }
 
-.navbar__list-item--secondary {
-  margin-left: 20px;
-  color: var(--color-grey);
-
-  .navbar__link-wrapper {
-    color: var(--color-grey);
-  }
-}
-
-@media (min-width: 769px) {
-
-  .navbar__list-item--secondary {
-    .navbar__link-wrapper {
-      border: 1px solid var(--color-grey);
-    }
-  }
-}
-
-@media (max-width: 768px) {
-
-  .navbar__list-item--secondary {
-    margin-left: 0;
-
-    .navbar__link-wrapper {
-      box-shadow: none;
-    }
-  }
-}
-
-.navbar__list-item--secondary + .navbar__list-item--secondary {
-  margin-left: 0;
-  border-left: 0;
-}
-
 .navbar__list-item--active {
   background-color: var(--color-lightwhite);
   color: var(--color-dark);

From 554b186975b5757cad5205d8f3a36cbc0fdbf52c Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sun, 10 Feb 2019 19:42:03 +0100
Subject: [PATCH 2/2] =?UTF-8?q?fix=20overscroll=20bug=20on=20=C2=BBmain?=
 =?UTF-8?q?=C2=AB=20element?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/default-layout.lucius | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/templates/default-layout.lucius b/templates/default-layout.lucius
index 2280e1849..faf42548f 100644
--- a/templates/default-layout.lucius
+++ b/templates/default-layout.lucius
@@ -161,14 +161,6 @@ h4 {
 /* LAYOUT */
 .main {
   position: relative;
-  min-height: calc(100vh - var(--header-height));
-}
-
-@media (max-width: 768px) {
-
-  .main {
-    min-height: calc(100vh - var(--header-height-collapsed));
-  }
 }
 
 .main__content {