From cb3df94dc3d8a72289ad4330709922a241c2aa8f Mon Sep 17 00:00:00 2001 From: codecalm Date: Sun, 16 Feb 2020 22:00:19 +0100 Subject: [PATCH] card padding fixes, sidenav fixes --- pages/_layouts/base.html | 8 ++++++++ pages/_layouts/docs.html | 4 ++-- scss/layout/_navbar.scss | 5 +++-- scss/ui/_cards.scss | 6 +++++- 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/pages/_layouts/base.html b/pages/_layouts/base.html index 82e8fb8d..f6807a50 100644 --- a/pages/_layouts/base.html +++ b/pages/_layouts/base.html @@ -30,6 +30,12 @@ {% include layout/og.html show=layout.og-component %} {% include layout/css.html %} + + {% assign dark-theme = page.dark-theme | default: site.dark-theme %} @@ -46,5 +52,7 @@ {% include layout/debug.html %} {% endif %} + + diff --git a/pages/_layouts/docs.html b/pages/_layouts/docs.html index b90a596c..eada1c87 100644 --- a/pages/_layouts/docs.html +++ b/pages/_layouts/docs.html @@ -42,8 +42,8 @@ page-header: Documentation {% endcomment %}
-
-
+
+
diff --git a/scss/layout/_navbar.scss b/scss/layout/_navbar.scss index 49a3454e..81b7e66e 100644 --- a/scss/layout/_navbar.scss +++ b/scss/layout/_navbar.scss @@ -171,7 +171,7 @@ Vertical navbar &.active { font-weight: 600; - &:before { + >.nav-link:before { left: 0; right: auto; top: 0; @@ -263,6 +263,7 @@ All navbars .nav-link { min-height: $navbar-height; + position: relative; } .nav-link-icon { @@ -288,7 +289,7 @@ All navbars position: relative; &.active { - &:before { + >.nav-link:before { content: ''; position: absolute; bottom: -1px; diff --git a/scss/ui/_cards.scss b/scss/ui/_cards.scss index ea4cb9ac..ffb30dbd 100644 --- a/scss/ui/_cards.scss +++ b/scss/ui/_cards.scss @@ -201,7 +201,11 @@ .card-lg > & { @include media-breakpoint-up(md) { - padding: 3rem; + padding: 2rem; + } + + @include media-breakpoint-up(lg) { + padding: 4rem; } } -- GitLab