Merge branch '6.2RC'6.2

1 files changed, 39 insertions, 85 deletions

diff --git a/vendor/twbs/bootstrap/site/assets/scss/_content.scss b/vendor/twbs/bootstrap/site/assets/scss/_content.scss
index 030a1a256..f2b5cfc54 100644
--- a/vendor/twbs/bootstrap/site/assets/scss/_content.scss
+++ b/vendor/twbs/bootstrap/site/assets/scss/_content.scss
@@ -1,32 +1,42 @@
-// stylelint-disable no-duplicate-selectors, selector-max-combinators, selector-max-compound-selectors, selector-max-type, selector-no-qualifying-type
-
 //
-// Automatically style Markdown-based tables like a Bootstrap `.table`.
+// Bootstrap docs content theming
 //
 
+// Offset for the sticky header
+@include media-breakpoint-up(md) {
+  :root {
+    scroll-padding-top: 4rem;
+  }
+}
+
 .bd-content {
-  order: 1;
+  > h2:not(:first-child) {
+    margin-top: 3rem;
+  }
 
-  // Hack the sticky header
-  > h2[id],
-  > h3[id],
-  > h4[id] {
-    pointer-events: none;
+  > h3 {
+    margin-top: 2rem;
+  }
 
-    &::before {
-      display: block;
-      height: 6rem;
-      margin-top: -6rem;
-      content: "";
+  > ul li,
+  > ol li {
+    margin-bottom: .25rem;
+
+    // stylelint-disable selector-max-type, selector-max-compound-selectors
+    > p ~ ul {
+      margin-top: -.5rem;
+      margin-bottom: 1rem;
     }
+    // stylelint-enable selector-max-type, selector-max-compound-selectors
   }
 
-  > table {
-    width: 100%;
+  // Override Bootstrap defaults
+  > .table {
     max-width: 100%;
-    margin-bottom: 1rem;
+    margin-bottom: 1.5rem;
+    @include font-size(.875rem);
 
-    @include media-breakpoint-down(md) {
+    @include media-breakpoint-down(lg) {
       display: block;
       overflow-x: auto;
 
@@ -35,92 +45,36 @@
       }
     }
 
-    // Cells
-    > thead,
-    > tbody,
-    > tfoot {
-      > tr {
-        > th,
-        > td {
-          padding: $table-cell-padding;
-          vertical-align: top;
-          border: 1px solid $table-border-color;
+    th,
+    td {
+      &:first-child {
+        padding-left: 0;
+      }
 
-          > p:last-child {
-            margin-bottom: 0;
-          }
-        }
+      &:not(:last-child) {
+        padding-right: 1.5rem;
       }
     }
 
-    // Prevent breaking of code (e.g., Grunt tasks list)
+    // Prevent breaking of code
     td:first-child > code {
       white-space: nowrap;
     }
   }
 }
 
-.bd-content-title {
-  display: block;
-  pointer-events: auto;
-}
-
-//
-// Docs sections
-//
-
-.bd-content {
-  > h2 {
-    @include font-size($h2-font-size);
-  }
-
-  > h3 {
-    @include font-size($h3-font-size);
-  }
-
-  > h4 {
-    @include font-size($h4-font-size);
-  }
-
-  > h2:not(:first-child) {
-    margin-top: 3rem;
-  }
-
-  > h3 {
-    margin-top: 1.5rem;
-  }
-
-  > ul li,
-  > ol li {
-    margin-bottom: .25rem;
-  }
-
-  @include media-breakpoint-up(lg) {
-    > ul,
-    > ol,
-    > p {
-      max-width: 80%;
-    }
-  }
-}
-
 .bd-title {
-  margin-top: 1rem;
-  margin-bottom: .5rem;
   @include font-size(3rem);
 }
 
 .bd-lead {
   @include font-size(1.5rem);
   font-weight: 300;
-
-  @include media-breakpoint-up(lg) {
-    max-width: 80%;
-  }
 }
 
-.bd-text-purple { color: $bd-purple; }
-.bd-text-purple-bright { color: $bd-purple-bright; }
+.bd-text-purple-bright {
+  color: $bd-purple-bright;
+}
 
 .bd-bg-purple-bright {
   background-color: $bd-purple-bright;