From 5979741e0a41b4bec0cb3de53aede95b7729569d Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Sun, 3 May 2020 11:42:13 +0100 Subject: [PATCH] Convert layout back to top navbar It just looks so much better!! --- static/src/scss/index.scss | 27 +++++---------------------- templates/base.html | 9 +++++++-- templates/navigation/index.html | 6 ++---- 3 files changed, 14 insertions(+), 28 deletions(-) diff --git a/static/src/scss/index.scss b/static/src/scss/index.scss index 8485ae3..8e04fb7 100644 --- a/static/src/scss/index.scss +++ b/static/src/scss/index.scss @@ -2,8 +2,6 @@ @import "homepage"; -$sidenav-width: 275px; - body { @extend .grey-text, .text-lighten-3; @@ -15,16 +13,10 @@ body { main { flex: 1 0 auto; - - @media #{$large-and-up} { - margin-left: $sidenav-width; - } - } footer.page-footer { padding-top: 0; - z-index: 1; } .sidenav { @@ -33,23 +25,14 @@ footer.page-footer { li > a { @extend .grey-text, .text-lighten-3; } - - width: $sidenav-width; - - @media #{$large-and-up} { - transform: translateX(0) !important; - z-index: 0; - } -} - -nav { - @media #{$large-and-up} { - display: none; - } } .header-image { - height: $sidenav-width * 1.5; + height: 40vh; + + @media #{$medium-and-down} { + height: 60vh; + } // Fix darkreader weirdness .parallax { diff --git a/templates/base.html b/templates/base.html index 667855c..1296408 100644 --- a/templates/base.html +++ b/templates/base.html @@ -24,12 +24,17 @@ - {% include "navigation/index.html" %} +
{% block main %}{% endblock %} diff --git a/templates/navigation/index.html b/templates/navigation/index.html index 37176d2..0e3f59d 100644 --- a/templates/navigation/index.html +++ b/templates/navigation/index.html @@ -1,4 +1,2 @@ - +{% include "navigation/item.html" with reverse="homepage" text="Home" %} +{% include "navigation/item.html" with reverse="about" text="About" %}