Merge branch 'master' into master-mc-cleanup-functions

twbs · Jul 25, 2019 · cc376e5 · cc376e5
2 parents 526da87 + 172d580
commit cc376e5
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 68 deletions.
diff --git 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/_navbar.scss b/site/static/docs/4.3/assets/scss/_navbar.scss
@@ -0,0 +1,46 @@
+.bd-navbar {
+  min-height: 4rem;
+  background-color: $bd-purple-bright;
+
+  @include media-breakpoint-down(md) {
+    .navbar-nav-scroll {
+      width: 100%;
+      height: 2.5rem;
+      margin-top: .25rem;
+      overflow: hidden;
+
+      .navbar-nav {
+        padding-bottom: 2rem;
+        overflow-x: auto;
+        white-space: nowrap;
+        -webkit-overflow-scrolling: touch;
+      }
+    }
+  }
+
+  .navbar-nav {
+    .nav-link {
+      padding-right: .5rem;
+      padding-left: .5rem;
+      color: rgba($white, .85);
+
+      &.active,
+      &:hover,
+      &:focus {
+        color: $white;
+        background-color: transparent;
+      }
+
+      &.active {
+        font-weight: 600;
+      }
+    }
+  }
+
+  .navbar-nav-svg {
+    display: inline-block;
+    width: 1rem;
+    height: 1rem;
+    vertical-align: text-top;
+  }
+}
diff --git a/site/static/docs/4.3/assets/scss/_sidebar.scss b/site/static/docs/4.3/assets/scss/_sidebar.scss
@@ -1,15 +1,13 @@
 // 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);
+      overflow-y: auto;
     }
   }
 
@@ -19,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);
   }
@@ -58,11 +56,7 @@
     }
 
     > .bd-sidenav-group-link {
-      color: rgba(0, 0, 0, .85);
-    }
-
-    > .bd-sidenav {
-      display: block;
+      color: rgba($black, .85);
     }
   }
 }
@@ -75,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($black, .85);
       text-decoration: none;
       background-color: rgba($bd-purple-bright, .1);
     }
@@ -90,6 +84,6 @@
   > .active:hover > a,
   > .active:focus > a {
     font-weight: 600;
-    color: rgba(0, 0, 0, .85);
+    color: rgba($black, .85);
   }
 }
diff --git a/site/static/docs/4.3/assets/scss/_nav.scss → .../static/docs/4.3/assets/scss/_subnav.scss b/site/static/docs/4.3/assets/scss/_nav.scss → .../static/docs/4.3/assets/scss/_subnav.scss
@@ -1,7 +1,3 @@
-//
-// Main navbar
-//
-
 .bd-subnavbar {
   background-color: rgba(#fff, .75);
   backdrop-filter: blur(1rem);
@@ -64,50 +60,3 @@
     text-decoration: none;
   }
 }
-
-.bd-navbar {
-  min-height: 4rem;
-  background-color: $bd-purple-bright;
-
-  @include media-breakpoint-down(md) {
-    .navbar-nav-scroll {
-      width: 100%;
-      height: 2.5rem;
-      margin-top: .25rem;
-      overflow: hidden;
-
-      .navbar-nav {
-        padding-bottom: 2rem;
-        overflow-x: auto;
-        white-space: nowrap;
-        -webkit-overflow-scrolling: touch;
-      }
-    }
-  }
-
-  .navbar-nav {
-    .nav-link {
-      padding-right: .5rem;
-      padding-left: .5rem;
-      color: $bd-purple-light;
-
-      &.active,
-      &:hover,
-      &:focus {
-        color: $white;
-        background-color: transparent;
-      }
-
-      &.active {
-        font-weight: 600;
-      }
-    }
-  }
-
-  .navbar-nav-svg {
-    display: inline-block;
-    width: 1rem;
-    height: 1rem;
-    vertical-align: text-top;
-  }
-}
diff --git a/site/static/docs/4.3/assets/scss/docs.scss b/site/static/docs/4.3/assets/scss/docs.scss
@@ -30,7 +30,8 @@
 
 // Load docs components
 @import "variables";
-@import "nav";
+@import "navbar";
+@import "subnav";
 @import "masthead";
 @import "ads";
 @import "content";