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

3 files changed, 9 insertions, 7 deletions

diff --git a/docs/content/typography.md b/docs/content/typography.md
index 299edc570..2434a7328 100644
--- a/docs/content/typography.md
+++ b/docs/content/typography.md
@@ -179,7 +179,7 @@ For quoting blocks of content from another source within your document. Wrap `<b
 Add a `<footer>` for identifying the source. Wrap the name of the source work in `<cite>`.
 
 {% example html %}
-<blockquote>
+<blockquote class="blockquote">
   <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p>
   <footer>Someone famous in <cite title="Source Title">Source Title</cite></footer>
 </blockquote>
@@ -190,7 +190,7 @@ Add a `<footer>` for identifying the source. Wrap the name of the source work in
 Add `.blockquote-reverse` for a blockquote with right-aligned content.
 
 {% example html %}
-<blockquote class="blockquote-reverse">
+<blockquote class="blockquote blockquote-reverse">
   <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p>
   <footer>Someone famous in <cite title="Source Title">Source Title</cite></footer>
 </blockquote>
diff --git a/docs/index.html b/docs/index.html
index 989e9ad77..516ba5f46 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -28,7 +28,7 @@ title: Bootstrap &middot; The world's most popular mobile-first and responsive f
         <h4>Managed dependencies</h4>
         <p>Include Bootstrap's source Sass and JavaScript files via Bower, Composer, Meteor, or npm. Package managed installs don't include documentation, but do include our Gruntfile and readme.</p>
         <p>
-          <a class="btn btn-primary" href="">View install methods</a>
+          <a class="btn btn-bs btn-outline" href="">View install methods</a>
         </p>
       </div>
       <!-- <div class="col-sm-4">
@@ -51,7 +51,7 @@ title: Bootstrap &middot; The world's most popular mobile-first and responsive f
     <hr class="half-rule">
 
     <p class="lead">More customized builds of Bootstrap's CSS and JS are also available.</p>
-    <a href="{{ site.baseurl }}/getting-started/download" class="btn btn-outline btn-lg">More download options</a>
+    <a href="{{ site.baseurl }}/getting-started/download" class="btn btn-bs btn-outline btn-lg">More download options</a>
   </div>
 </div>
 
@@ -83,7 +83,7 @@ title: Bootstrap &middot; The world's most popular mobile-first and responsive f
     <hr class="half-rule">
 
     <p class="lead">Bootstrap is open source. It's hosted, developed, and maintained on GitHub.</p>
-    <a href="{{ site.repo }}" class="btn btn-outline btn-lg">View the GitHub project</a>
+    <a href="{{ site.repo }}" class="btn btn-bs btn-outline btn-lg">View the GitHub project</a>
   </div>
 </div>
 
@@ -107,6 +107,6 @@ title: Bootstrap &middot; The world's most popular mobile-first and responsive f
     <hr class="half-rule">
 
     <p class="lead">We showcase dozens of inspiring projects built with Bootstrap on the Bootstrap Expo.</p>
-    <a href="{{ site.expo }}" class="btn btn-outline btn-lg">Explore the Expo</a>
+    <a href="{{ site.expo }}" class="btn btn-bs btn-outline btn-lg">Explore the Expo</a>
   </div>
 </div>
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 3a0bd1959..a51001a37 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -14,6 +14,8 @@
 // Grid breakpoints
 // Grid containers
 // Grid columns
+// Fonts
+// Components
 
 
 // Colors
@@ -53,6 +55,7 @@ $enable-hover-media-query:  false !default;
 $spacer:                     1rem !default;
 $spacer-x:                   $spacer !default;
 $spacer-y:                   $spacer !default;
+$border-width:               .0625rem !default;
 
 
 // Body
@@ -152,7 +155,6 @@ $headings-font-weight:       500 !default;
 $headings-line-height:       1.1 !default;
 $headings-color:             inherit !default;
 
-$border-width:               .0625rem !default;
 
 
 // Components