Merge branch 'master' into master-ysds-valid-radius

twbs · Feb 14, 2020 · cb49a84 · cb49a84
2 parents 25cbd01 + 7fd6dd9
commit cb49a84
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/.dependabot/config.yml b/.dependabot/config.yml
@@ -1,14 +1,10 @@
 # https://dependabot.com/docs/config-file/
 version: 1
 update_configs:
-  # Keep package.json (& lockfiles) up to date as soon as
-  # new versions are published to the npm registry
   - package_manager: "javascript"
     directory: "/"
     update_schedule: "weekly"
-    # Apply default reviewer and label to created pull requests
     default_reviewers:
-      - "Johann-S"
       - "XhmikosR"
     default_labels:
       - "dependencies"

diff --git a/build/change-version.js b/build/change-version.js
@@ -102,7 +102,6 @@ function main(args) {
     '.js',
     '.json',
     '.md',
-    '.nuspec',
     '.scss',
     '.txt',
     '.yml'

diff --git a/site/assets/scss/_component-examples.scss b/site/assets/scss/_component-examples.scss
@@ -224,6 +224,12 @@
   }
 }
 
+.bd-example-rounded-utils {
+  [class*="rounded"] {
+    margin: .25rem;
+  }
+}
+
 //
 // Code snippets
 //

diff --git a/site/assets/scss/_navbar.scss b/site/assets/scss/_navbar.scss
@@ -1,16 +1,15 @@
 .bd-navbar {
-  min-height: 4rem;
+  padding: .625rem 0;
   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;
+        padding: .5rem 0;
+        margin: -.5rem 0;
         overflow-x: auto;
         white-space: nowrap;
         -webkit-overflow-scrolling: touch;
@@ -22,14 +21,14 @@
     .nav-link {
       color: rgba($white, .85);
 
-      &.active,
       &:hover,
       &:focus {
         color: $white;
       }
 
       &.active {
         font-weight: 600;
+        color: $white;
       }
     }
   }

diff --git a/site/content/docs/4.3/utilities/borders.md b/site/content/docs/4.3/utilities/borders.md
@@ -47,7 +47,7 @@ Change the border color using utilities built on our theme colors.
 
 Add classes to an element to easily round its corners.
 
-{{< example >}}
+{{< example class="bd-example-rounded-utils" >}}
 {{< placeholder width="75" height="75" class="rounded" title="Example rounded image" >}}
 {{< placeholder width="75" height="75" class="rounded-top" title="Example top rounded image" >}}
 {{< placeholder width="75" height="75" class="rounded-right" title="Example right rounded image" >}}
@@ -63,7 +63,7 @@ Add classes to an element to easily round its corners.
 
 Use `.rounded-lg` or `.rounded-sm` for larger or smaller border-radius.
 
-{{< example >}}
+{{< example class="bd-example-rounded-utils" >}}
 {{< placeholder width="75" height="75" class="rounded-sm" title="Example small rounded image" >}}
 {{< placeholder width="75" height="75" class="rounded-lg" title="Example large rounded image" >}}
 {{< /example >}}
diff --git a/site/layouts/partials/docs-navbar.html b/site/layouts/partials/docs-navbar.html
@@ -1,6 +1,6 @@
-<header class="navbar navbar-expand navbar-dark flex-column flex-md-row bd-navbar px-0">
-  <div class="container-xl flex-wrap flex-md-nowrap py-0 px-3">
-    <a class="navbar-brand mr-0 mr-md-2" href="/" aria-label="Bootstrap">
+<header class="navbar navbar-expand navbar-dark bd-navbar">
+  <div class="container-xl flex-wrap flex-md-nowrap">
+    <a class="navbar-brand mr-2" href="/" aria-label="Bootstrap">
       {{ partial "icons/bootstrap-logo-solid.svg" (dict "class" "d-block" "width" "32" "height" "32") }}
     </a>