Merge branch 'main' into jo-docs-thanks-pagejo-docs-thanks-page

9 files changed, 31 insertions, 37 deletions

diff --git a/site/assets/scss/_clipboard-js.scss b/site/assets/scss/_clipboard-js.scss
index 12be4037c..83b9a8b9e 100644
--- a/site/assets/scss/_clipboard-js.scss
+++ b/site/assets/scss/_clipboard-js.scss
@@ -29,7 +29,8 @@
   border: 1px solid;
   @include border-radius();
 
-  &:hover {
+  &:hover,
+  &:focus {
     color: $white;
     background-color: $primary;
   }
diff --git a/site/assets/scss/_component-examples.scss b/site/assets/scss/_component-examples.scss
index b29635500..005515922 100644
--- a/site/assets/scss/_component-examples.scss
+++ b/site/assets/scss/_component-examples.scss
@@ -187,7 +187,7 @@
     width: 16rem;
 
     @include media-breakpoint-up(md) {
-      --aspect-ratio: 50%; // 2x1
+      --bs-aspect-ratio: 50%; // 2x1
     }
   }
 }
@@ -201,6 +201,18 @@
   }
 }
 
+.bd-example-offcanvas {
+  @include border-start-radius(0);
+
+  .offcanvas {
+    position: static;
+    display: block;
+    height: 200px;
+    visibility: visible;
+    transform: translate(0);
+  }
+}
+
 // Tooltips
 .tooltip-demo a {
   white-space: nowrap;
@@ -265,6 +277,11 @@
   }
 }
 
+// Toasts
+.bd-example-toasts {
+  min-height: 240px;
+}
+
 //
 // Code snippets
 //
diff --git a/site/assets/scss/_content.scss b/site/assets/scss/_content.scss
index a6c1639b0..e55a7aa63 100644
--- a/site/assets/scss/_content.scss
+++ b/site/assets/scss/_content.scss
@@ -2,14 +2,14 @@
 // Bootstrap docs content theming
 //
 
-.bd-content {
-  // Offset for the sticky header
-  > [id] {
-    @include media-breakpoint-up(md) {
-      scroll-margin-top: 4rem;
-    }
+// Offset for the sticky header
+@include media-breakpoint-up(md) {
+  :root {
+    scroll-padding-top: 4rem;
   }
+}
 
+.bd-content {
   > h2:not(:first-child) {
     margin-top: 3rem;
   }
diff --git a/site/assets/scss/_footer.scss b/site/assets/scss/_footer.scss
index 48ad349de..87cee6d2b 100644
--- a/site/assets/scss/_footer.scss
+++ b/site/assets/scss/_footer.scss
@@ -3,16 +3,14 @@
 //
 
 .bd-footer {
-  @include font-size(.875rem);
-  color: #63707c;
-
   a {
-    font-weight: 600;
     color: $gray-700;
+    text-decoration: none;
 
     &:hover,
     &:focus {
       color: $link-color;
+      text-decoration: underline;
     }
   }
 }
diff --git a/site/assets/scss/_navbar.scss b/site/assets/scss/_navbar.scss
index 954304c3f..4a9b08b36 100644
--- a/site/assets/scss/_navbar.scss
+++ b/site/assets/scss/_navbar.scss
@@ -5,11 +5,6 @@
   .navbar-toggler {
     padding: 0;
     border: 0;
-
-    .bi {
-      width: 2rem;
-      fill: currentColor;
-    }
   }
 
   .navbar-nav {
diff --git a/site/assets/scss/_sidebar.scss b/site/assets/scss/_sidebar.scss
index 9a933831f..d893ba9dc 100644
--- a/site/assets/scss/_sidebar.scss
+++ b/site/assets/scss/_sidebar.scss
@@ -49,7 +49,7 @@
     padding: .25rem .5rem;
     font-weight: 600;
     color: rgba($black, .65);
-    background-color: none;
+    background-color: transparent;
     border: 0;
 
     &:hover,
diff --git a/site/assets/scss/_skippy.scss b/site/assets/scss/_skippy.scss
index 894db70db..ea82c625b 100644
--- a/site/assets/scss/_skippy.scss
+++ b/site/assets/scss/_skippy.scss
@@ -1,20 +1,7 @@
-// stylelint-disable declaration-no-important
-
 .skippy {
   background-color: $bd-purple;
 
   a {
     color: $white;
   }
-
-  &:focus-within a {
-    position: static !important;
-    width: auto !important;
-    height: auto !important;
-    padding: $spacer / 2 !important;
-    margin: $spacer / 4 !important;
-    overflow: visible !important;
-    clip: auto !important;
-    white-space: normal !important;
-  }
 }
diff --git a/site/assets/scss/_subnav.scss b/site/assets/scss/_subnav.scss
index c23d96a49..8377ff423 100644
--- a/site/assets/scss/_subnav.scss
+++ b/site/assets/scss/_subnav.scss
@@ -70,10 +70,6 @@
     box-shadow: 0 0 0 3px rgba($bd-purple-bright, .25);
   }
 
-  .bi {
-    fill: currentColor;
-  }
-
   .bi-collapse { display: none; }
 
   &:not(.collapsed) {
diff --git a/site/assets/scss/docs.scss b/site/assets/scss/docs.scss
index ec59ef2f0..2bdd65c7c 100644
--- a/site/assets/scss/docs.scss
+++ b/site/assets/scss/docs.scss
@@ -1,7 +1,7 @@
 /*!
  * Bootstrap Docs (https://getbootstrap.com/)
- * Copyright 2011-2020 The Bootstrap Authors
- * Copyright 2011-2020 Twitter, Inc.
+ * Copyright 2011-2021 The Bootstrap Authors
+ * Copyright 2011-2021 Twitter, Inc.
  * Licensed under the Creative Commons Attribution 3.0 Unported License.
  * For details, see https://creativecommons.org/licenses/by/3.0/.
  */