From c6c5f8657e3935da98c537fe75ab2eefe8751b6c Mon Sep 17 00:00:00 2001 From: Jocelyn Delalande Date: Thu, 2 Feb 2017 11:48:40 +0100 Subject: [PATCH] Adapt navigation bar to bootstrap 4 Also fixed some weird alignment issues. I think this will need more work later (revamp the navbar layout to avoid that sensation of thing which are floating at random places in the navbar). --- budget/static/css/main.css | 18 +++++++++++++---- budget/templates/layout.html | 39 ++++++++++++++++-------------------- 2 files changed, 31 insertions(+), 26 deletions(-) diff --git a/budget/static/css/main.css b/budget/static/css/main.css index 0a07e94..80d3b1c 100644 --- a/budget/static/css/main.css +++ b/budget/static/css/main.css @@ -5,15 +5,25 @@ /* General */ body { - margin-top: 40px; + /* For fixed navbar */ + padding-top: 3.5rem; + padding-bottom: 2rem; } /* Navbar */ -.navbar h1{ margin-left: 75px; } +.navbar h1 { + font-size: 1rem; + margin: 0; + padding: 0; +} .navbar .primary-nav { padding-left: 75px; } -.navbar .secondary-nav { padding-right: 75px; } -.brand{ font-family: 'Lobster', arial, serif; } +.navbar .secondary-nav { + text-align: right; + flex-direction: row-reverse; + +} +.navbar-brand{ font-family: 'Lobster', arial, serif; } /* Header */ diff --git a/budget/templates/layout.html b/budget/templates/layout.html index e9adb30..50f3019 100644 --- a/budget/templates/layout.html +++ b/budget/templates/layout.html @@ -14,7 +14,7 @@