From 5bb5999cde0adfcbf89792111c0337080a003a5d Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Fri, 22 Nov 2019 13:12:55 +0000 Subject: [PATCH] Add a few style-changes --- src/Templates/Page.ss | 72 +++++++++++++++++++++++---------------- src/Theme/_nav.scss | 37 ++++++++++++++++++++ src/Theme/_variables.scss | 1 + src/Theme/main.scss | 2 ++ 4 files changed, 83 insertions(+), 29 deletions(-) create mode 100644 src/Theme/_nav.scss create mode 100644 src/Theme/_variables.scss diff --git a/src/Templates/Page.ss b/src/Templates/Page.ss index 484d720..7e0a5c6 100644 --- a/src/Templates/Page.ss +++ b/src/Templates/Page.ss @@ -5,42 +5,56 @@ <% base_tag %> - $MetaTags() + $MetaTags(false) + <% if $Title %>$Title ● <% end_if %>$SiteConfig.Title <% require themedCSS("mantra") %> <% require themedJavascript("main") %> - <% if $Menu(1) %> -
-
+ <% end_if %> + +
+ $Content + $Form
\ No newline at end of file diff --git a/src/Theme/_nav.scss b/src/Theme/_nav.scss new file mode 100644 index 0000000..666c7f2 --- /dev/null +++ b/src/Theme/_nav.scss @@ -0,0 +1,37 @@ +.navbar { + .navbar-nav { + .nav-link { + position: relative; + + &::before { + content: ' '; + position: absolute; + top: 0; + bottom: 0; + left: 0; + right: 0; + margin-top: -($navbar-padding-x / 2); + margin-bottom: -($navbar-padding-x / 2); + } + } + + .active > .nav-link, .nav-link.active { + &::before { + background: rgba(255, 255, 255, 0.1); + } + } + } +} + +.navbar-brand { + .navbar-title { + @extend .d-inline-block; + } + + .navbar-tagline { + @extend .text-muted; + @extend .d-none; + @extend .d-lg-inline-block; + font-size: 0.5em; + } +} diff --git a/src/Theme/_variables.scss b/src/Theme/_variables.scss new file mode 100644 index 0000000..5febeb0 --- /dev/null +++ b/src/Theme/_variables.scss @@ -0,0 +1 @@ +$tagline-font-size: $small-font-size / 2; \ No newline at end of file diff --git a/src/Theme/main.scss b/src/Theme/main.scss index 19b0ca9..6aeca56 100644 --- a/src/Theme/main.scss +++ b/src/Theme/main.scss @@ -1 +1,3 @@ @import "~bootstrap/scss/bootstrap"; +@import "variables"; +@import "nav";