From: Martijn Cuppens <martijn.cuppens@gmail.com>
Date: Thu, 25 Jul 2019 06:18:36 +0000 (+0200)
Subject: Sidebar theming tweaks
X-Git-Tag: v5.0.0-alpha1~919
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f4f15c0180e17eaa69cf9310b205da073260d5b;p=thirdparty%2Fbootstrap.git

Sidebar theming tweaks
---

diff --git a/site/layouts/partials/docs-sidebar.html b/site/layouts/partials/docs-sidebar.html
index 94b73094de..80b994799d 100644
--- a/site/layouts/partials/docs-sidebar.html
+++ b/site/layouts/partials/docs-sidebar.html
@@ -1,4 +1,4 @@
-<nav class="collapse bd-links pb-3" id="bd-docs-nav" aria-label="Main navigation">
+<nav class="collapse bd-links" id="bd-docs-nav" aria-label="Main navigation">
   {{- $url := split .Permalink "/" -}}
   {{- $page_slug := index $url (sub (len $url) 2) -}}
 
diff --git a/site/static/docs/4.3/assets/scss/_sidebar.scss b/site/static/docs/4.3/assets/scss/_sidebar.scss
index 5a5e607600..e8cc5bdab7 100644
--- a/site/static/docs/4.3/assets/scss/_sidebar.scss
+++ b/site/static/docs/4.3/assets/scss/_sidebar.scss
@@ -1,16 +1,12 @@
 // stylelint-disable declaration-no-important
 
-.bd-sidebar {
-  order: 0;
-}
-
 .bd-links {
   @include media-breakpoint-up(md) {
     @supports (position: sticky) {
       position: sticky;
       top: 5rem;
       z-index: 1000;
-      height: calc(100vh - 7rem);
+      height: calc(100vh - 5rem);
       overflow-y: auto;
     }
   }
@@ -21,21 +17,21 @@
   }
 }
 
-.bd-sidenav {
+:not(.active) > .bd-sidenav {
   display: none;
 }
 
 .bd-sidenav-group-link {
   padding: .25rem .625rem .25rem .5rem;
   font-weight: 600;
-  color: rgba(0, 0, 0, .65);
+  color: rgba($black, .65);
   @include border-radius(.25rem);
 
   > * { pointer-events: none; }
 
   &:hover,
   &:focus {
-    color: rgba(0, 0, 0, .85);
+    color: rgba($black, .85);
     text-decoration: none;
     background-color: rgba($bd-purple-bright, .1);
   }
@@ -60,11 +56,7 @@
     }
 
     > .bd-sidenav-group-link {
-      color: rgba(0, 0, 0, .85);
-    }
-
-    > .bd-sidenav {
-      display: block;
+      color: rgba($black, .85);
     }
   }
 }
@@ -77,12 +69,12 @@
     display: inline-block;
     padding: .25rem .5rem;
     @include font-size(.875rem);
-    color: rgba(0, 0, 0, .65);
+    color: rgba($black, .65);
     @include border-radius(.25rem);
 
     &:hover,
     &:focus {
-      color: rgba(0, 0, 0, .85);
+      color: rgba($white, .85);
       text-decoration: none;
       background-color: rgba($bd-purple-bright, .1);
     }
@@ -92,6 +84,6 @@
   > .active:hover > a,
   > .active:focus > a {
     font-weight: 600;
-    color: rgba(0, 0, 0, .85);
+    color: rgba($black, .85);
   }
 }