Merge branch 'v4' of https://github.com/twbs/derpstrap into v4

dist/css/bootstrap.css

@@ -4934,20 +4934,210 @@ button.close {
   background-color: #373a3c;
 }
 
+.m-a-0 {
+  margin: 0;
+}
+
+.m-t-0 {
+  margin-top: 0;
+}
+
+.m-r-0 {
+  margin-right: 0;
+}
+
+.m-b-0 {
+  margin-bottom: 0;
+}
+
+.m-l-0 {
+  margin-left: 0;
+}
+
+.m-a {
+  margin: 1rem;
+}
+
+.m-t {
+  margin-top: 1rem;
+}
+
+.m-r {
+  margin-right: 1rem;
+}
+
+.m-b {
+  margin-bottom: 1rem;
+}
+
+.m-l {
+  margin-left: 1rem;
+}
+
+.m-x {
+  margin-right: 1rem;
+  margin-left: 1rem;
+}
+
+.m-y {
+  margin-top: 1rem;
+  margin-bottom: 1rem;
+}
+
+.m-t-md {
+  margin-top: 1.5rem;
+}
+
+.m-r-md {
+  margin-right: 1.5rem;
+}
+
+.m-b-md {
+  margin-bottom: 1.5rem;
+}
+
+.m-l-md {
+  margin-left: 1.5rem;
+}
+
+.m-x-md {
+  margin-right: 1.5rem;
+  margin-left: 1.5rem;
+}
+
+.m-y-md {
+  margin-top: 1.5rem;
+  margin-bottom: 1.5rem;
+}
+
+.m-t-lg {
+  margin-top: 3rem;
+}
+
+.m-r-lg {
+  margin-right: 3rem;
+}
+
+.m-b-lg {
+  margin-bottom: 3rem;
+}
+
+.m-l-lg {
+  margin-left: 3rem;
+}
+
+.m-x-lg {
+  margin-right: 3rem;
+  margin-left: 3rem;
+}
+
+.m-y-lg {
+  margin-top: 3rem;
+  margin-bottom: 3rem;
+}
+
+.p-a-0 {
+  padding: 0;
+}
+
+.p-t-0 {
+  padding-top: 0;
+}
+
+.p-r-0 {
+  padding-right: 0;
+}
+
+.p-b-0 {
+  padding-bottom: 0;
+}
+
+.p-l-0 {
+  padding-left: 0;
+}
+
 .p-a {
   padding: 1rem;
 }
 
-.p-h {
+.p-t {
+  padding-top: 1rem;
+}
+
+.p-r {
   padding-right: 1rem;
+}
+
+.p-b {
+  padding-bottom: 1rem;
+}
+
+.p-l {
   padding-left: 1rem;
 }
 
-.p-v {
+.p-x {
+  padding-right: 1rem;
+  padding-left: 1rem;
+}
+
+.p-y {
   padding-top: 1rem;
   padding-bottom: 1rem;
 }
 
+.p-t-md {
+  padding-top: 1.5rem;
+}
+
+.p-r-md {
+  padding-right: 1.5rem;
+}
+
+.p-b-md {
+  padding-bottom: 1.5rem;
+}
+
+.p-l-md {
+  padding-left: 1.5rem;
+}
+
+.p-x-md {
+  padding-right: 1.5rem;
+  padding-left: 1.5rem;
+}
+
+.p-y-md {
+  padding-top: 1.5rem;
+  padding-bottom: 1.5rem;
+}
+
+.p-t-lg {
+  padding-top: 3rem;
+}
+
+.p-r-lg {
+  padding-right: 3rem;
+}
+
+.p-b-lg {
+  padding-bottom: 3rem;
+}
+
+.p-l-lg {
+  padding-left: 3rem;
+}
+
+.p-x-lg {
+  padding-right: 3rem;
+  padding-left: 3rem;
+}
+
+.p-y-lg {
+  padding-top: 3rem;
+  padding-bottom: 3rem;
+}
+
 .pos-f-t {
   position: fixed;
   top: 0;

docs/_includes/footer.html

@@ -4,9 +4,12 @@
   <div class="bs-docs-container">
     {% include social-buttons.html %}
 
-    <p>Designed and built with all the love in the world by <a href="https://twitter.com/mdo" target="_blank">@mdo</a> and <a href="https://twitter.com/fat" target="_blank">@fat</a>.</p>
-    <p>Maintained by the <a href="https://github.com/orgs/twbs/people">core team</a> with the help of <a href="https://github.com/twbs/bootstrap/graphs/contributors">our contributors</a>.</p>
-    <p>Code licensed under <a rel="license" href="https://github.com/twbs/bootstrap/blob/master/LICENSE" target="_blank">MIT</a>, documentation under <a rel="license" href="https://creativecommons.org/licenses/by/3.0/" target="_blank">CC BY 3.0</a>.</p>
+    <p>
+      Designed and built with all the love in the world by <a href="https://twitter.com/mdo" target="_blank">@mdo</a> and <a href="https://twitter.com/fat" target="_blank">@fat</a>.
+      Maintained by the <a href="https://github.com/orgs/twbs/people">core team</a> with the help of <a href="https://github.com/twbs/bootstrap/graphs/contributors">our contributors</a>.
+      Code licensed <a rel="license" href="https://github.com/twbs/bootstrap/blob/master/LICENSE" target="_blank">MIT</a>, docs <a rel="license" href="https://creativecommons.org/licenses/by/3.0/" target="_blank">CC BY 3.0</a>.
+    </p>
+
     <ul class="bs-docs-footer-links text-muted">
       <li>Currently v{{ site.current_version }}</li>
       <li>&middot;</li>

docs/_includes/nav-docs.html

@@ -3,12 +3,16 @@
     Bootstrap
   </a>
 
-  <form class="bs-docs-search hidden-xs-down">
+  <button class="navbar-toggler hidden-sm-up" type="button" data-toggle="collapse" data-target="#docsNavbarContent">
+    &#9776;
+  </button>
+
+  <form class="bs-docs-search hidden-sm-down">
     <input type="text" class="form-control" id="search-input" placeholder="Search...">
     <ul class="dropdown-menu bs-docs-search-results" id="search-results"></ul>
   </form>
 
-  <nav class="bs-docs-links hidden-xs-down">
+  <nav class="bs-docs-links collapse hidden-xs-down" id="docsNavbarContent">
     {% for group in site.data.nav %}
       {% assign link = group.pages | first %}
       {% assign slug = group.title | downcase | replace: ' ', '-' || page.title | downcase | replace: ' ', '-' %}

docs/assets/scss/docs.scss

@@ -136,10 +136,10 @@ body {
 //
 
 .bs-docs-footer {
+  padding-top: 2rem;
   margin-top: 6rem;
   font-size: 85%;
   color: #777;
-  text-align: center;
   border-top: 1px solid #e5e5e5;
 }
 .bs-docs-footer-links {
@@ -159,9 +159,6 @@ body {
   .bs-docs-footer p {
     margin-bottom: 0;
   }
-  .bs-docs .bs-docs-footer {
-    text-align: left;
-  }
 }
 
 
@@ -171,7 +168,7 @@ body {
 
 .bs-docs-social {
   margin-bottom: 1.5rem;
-  text-align: center;
+  margin-left: -.5rem;
 }
 .bs-docs-social-buttons {
   display: inline-block;
@@ -197,13 +194,6 @@ body {
   border: 0;
 }
 
-@media (min-width: 768px) {
-  .bs-docs .bs-docs-social {
-    margin-left: -.5rem;
-    text-align: left;
-  }
-}
-
 
 //
 // Homepage
@@ -647,14 +637,15 @@ body {
   padding: 0;
   margin-bottom: 0;
   // background-color: #322f38;
-}
 
-.bs-docs-sidebar .navbar-toggle {
+  .navbar-toggler {
     position: absolute;
-  top: 5px;
+    top: 1.25rem;
     right: 0;
     z-index: 5;
+  }
 }
+
 .bs-docs-sidebar .navbar-toggle .icon-bar {
   background-color: #fff;
 }
@@ -859,16 +850,13 @@ body {
 }
 
 .bs-docs-title {
-  + p {
-    font-size: 1.5rem;
-    font-weight: 300;
-  }
-
   @include media-breakpoint-up(sm) {
     margin-right: 23rem;
     font-size: 4rem;
 
     + p {
+      font-size: 1.5rem;
+      font-weight: 300;
       margin-right: 23rem;
     }
   }
@@ -1288,12 +1276,13 @@ body {
 
 .highlight {
   padding: 1rem;
-  margin: -1rem -1rem 1rem;
+  margin: 1rem -1rem;
   background-color: #f7f7f9;
 
   @include media-breakpoint-up(sm) {
     padding: 1.5rem;
-    margin: 1rem 0;
+    margin-right: 0;
+    margin-left: 0;
   }
 }
 .highlight pre {

docs/dist/css/bootstrap.css

@@ -4934,20 +4934,210 @@ button.close {
   background-color: #373a3c;
 }
 
+.m-a-0 {
+  margin: 0;
+}
+
+.m-t-0 {
+  margin-top: 0;
+}
+
+.m-r-0 {
+  margin-right: 0;
+}
+
+.m-b-0 {
+  margin-bottom: 0;
+}
+
+.m-l-0 {
+  margin-left: 0;
+}
+
+.m-a {
+  margin: 1rem;
+}
+
+.m-t {
+  margin-top: 1rem;
+}
+
+.m-r {
+  margin-right: 1rem;
+}
+
+.m-b {
+  margin-bottom: 1rem;
+}
+
+.m-l {
+  margin-left: 1rem;
+}
+
+.m-x {
+  margin-right: 1rem;
+  margin-left: 1rem;
+}
+
+.m-y {
+  margin-top: 1rem;
+  margin-bottom: 1rem;
+}
+
+.m-t-md {
+  margin-top: 1.5rem;
+}
+
+.m-r-md {
+  margin-right: 1.5rem;
+}
+
+.m-b-md {
+  margin-bottom: 1.5rem;
+}
+
+.m-l-md {
+  margin-left: 1.5rem;
+}
+
+.m-x-md {
+  margin-right: 1.5rem;
+  margin-left: 1.5rem;
+}
+
+.m-y-md {
+  margin-top: 1.5rem;
+  margin-bottom: 1.5rem;
+}
+
+.m-t-lg {
+  margin-top: 3rem;
+}
+
+.m-r-lg {
+  margin-right: 3rem;
+}
+
+.m-b-lg {
+  margin-bottom: 3rem;
+}
+
+.m-l-lg {
+  margin-left: 3rem;
+}
+
+.m-x-lg {
+  margin-right: 3rem;
+  margin-left: 3rem;
+}
+
+.m-y-lg {
+  margin-top: 3rem;
+  margin-bottom: 3rem;
+}
+
+.p-a-0 {
+  padding: 0;
+}
+
+.p-t-0 {
+  padding-top: 0;
+}
+
+.p-r-0 {
+  padding-right: 0;
+}
+
+.p-b-0 {
+  padding-bottom: 0;
+}
+
+.p-l-0 {
+  padding-left: 0;
+}
+
 .p-a {
   padding: 1rem;
 }
 
-.p-h {
+.p-t {
+  padding-top: 1rem;
+}
+
+.p-r {
   padding-right: 1rem;
+}
+
+.p-b {
+  padding-bottom: 1rem;
+}
+
+.p-l {
   padding-left: 1rem;
 }
 
-.p-v {
+.p-x {
+  padding-right: 1rem;
+  padding-left: 1rem;
+}
+
+.p-y {
   padding-top: 1rem;
   padding-bottom: 1rem;
 }
 
+.p-t-md {
+  padding-top: 1.5rem;
+}
+
+.p-r-md {
+  padding-right: 1.5rem;
+}
+
+.p-b-md {
+  padding-bottom: 1.5rem;
+}
+
+.p-l-md {
+  padding-left: 1.5rem;
+}
+
+.p-x-md {
+  padding-right: 1.5rem;
+  padding-left: 1.5rem;
+}
+
+.p-y-md {
+  padding-top: 1.5rem;
+  padding-bottom: 1.5rem;
+}
+
+.p-t-lg {
+  padding-top: 3rem;
+}
+
+.p-r-lg {
+  padding-right: 3rem;
+}
+
+.p-b-lg {
+  padding-bottom: 3rem;
+}
+
+.p-l-lg {
+  padding-left: 3rem;
+}
+
+.p-x-lg {
+  padding-right: 3rem;
+  padding-left: 3rem;
+}
+
+.p-y-lg {
+  padding-top: 3rem;
+  padding-bottom: 3rem;
+}
+
 .pos-f-t {
   position: fixed;
   top: 0;

scss/_utilities.scss

@@ -44,7 +44,7 @@
 .m-b-0 { margin-bottom: 0; }
 .m-l-0 { margin-left:   0; }
 
-.m-a { margin:        $spacer-base; }
+.m-a { margin:        $spacer; }
 .m-t { margin-top:    $spacer-y; }
 .m-r { margin-right:  $spacer-x }
 .m-b { margin-bottom: $spacer-y; }
@@ -92,7 +92,7 @@
 .p-b-0 { padding-bottom: 0; }
 .p-l-0 { padding-left:   0; }
 
-.p-a { padding:        $spacer-base; }
+.p-a { padding:        $spacer; }
 .p-t { padding-top:    $spacer-y; }
 .p-r { padding-right:  $spacer-x }
 .p-b { padding-bottom: $spacer-y; }

scss/_variables.scss

@@ -43,6 +43,9 @@ $enable-gradients:           false !default;
 $enable-transitions:         true !default;
 
 $spacer:                     1rem !default;
+$spacer-x:                   $spacer !default;
+$spacer-y:                   $spacer !default;
+
 $border-width:               .075rem !default;
 
 $use-hover-media-query:      false !default;