1 files changed, 23 insertions, 47 deletions

diff --git a/assets/scss/bootstrap/_type.scss b/assets/scss/bootstrap/_type.scss
index ccfa948..f8ed090 100755
--- a/assets/scss/bootstrap/_type.scss
+++ b/assets/scss/bootstrap/_type.scss
@@ -4,18 +4,8 @@
 // Headings
 //
 
-h1,
-h2,
-h3,
-h4,
-h5,
-h6,
-.h1,
-.h2,
-.h3,
-.h4,
-.h5,
-.h6 {
+h1, h2, h3, h4, h5, h6,
+.h1, .h2, .h3, .h4, .h5, .h6 {
   margin-bottom: $headings-margin-bottom;
   font-family: $headings-font-family;
   font-weight: $headings-font-weight;
@@ -23,58 +13,41 @@ h6,
   color: $headings-color;
 }
 
-h1,
-.h1 {
-  font-size: $h1-font-size;
-}
-h2,
-.h2 {
-  font-size: $h2-font-size;
-}
-h3,
-.h3 {
-  font-size: $h3-font-size;
-}
-h4,
-.h4 {
-  font-size: $h4-font-size;
-}
-h5,
-.h5 {
-  font-size: $h5-font-size;
-}
-h6,
-.h6 {
-  font-size: $h6-font-size;
-}
+h1, .h1 { @include font-size($h1-font-size); }
+h2, .h2 { @include font-size($h2-font-size); }
+h3, .h3 { @include font-size($h3-font-size); }
+h4, .h4 { @include font-size($h4-font-size); }
+h5, .h5 { @include font-size($h5-font-size); }
+h6, .h6 { @include font-size($h6-font-size); }
 
 .lead {
-  font-size: $lead-font-size;
+  @include font-size($lead-font-size);
   font-weight: $lead-font-weight;
 }
 
 // Type display classes
 .display-1 {
-  font-size: $display1-size;
+  @include font-size($display1-size);
   font-weight: $display1-weight;
   line-height: $display-line-height;
 }
 .display-2 {
-  font-size: $display2-size;
+  @include font-size($display2-size);
   font-weight: $display2-weight;
   line-height: $display-line-height;
 }
 .display-3 {
-  font-size: $display3-size;
+  @include font-size($display3-size);
   font-weight: $display3-weight;
   line-height: $display-line-height;
 }
 .display-4 {
-  font-size: $display4-size;
+  @include font-size($display4-size);
   font-weight: $display4-weight;
   line-height: $display-line-height;
 }
 
+
 //
 // Horizontal rules
 //
@@ -86,14 +59,15 @@ hr {
   border-top: $hr-border-width solid $hr-border-color;
 }
 
+
 //
 // Emphasis
 //
 
 small,
 .small {
-  font-size: $small-font-size;
-  font-weight: 400;
+  @include font-size($small-font-size);
+  font-weight: $font-weight-normal;
 }
 
 mark,
@@ -102,6 +76,7 @@ mark,
   background-color: $mark-bg;
 }
 
+
 //
 // Lists
 //
@@ -122,28 +97,29 @@ mark,
   }
 }
 
+
 //
 // Misc
 //
 
 // Builds on `abbr`
 .initialism {
-  font-size: 90%;
+  @include font-size(90%);
   text-transform: uppercase;
 }
 
 // Blockquotes
 .blockquote {
   margin-bottom: $spacer;
-  font-size: $blockquote-font-size;
+  @include font-size($blockquote-font-size);
 }
 
 .blockquote-footer {
   display: block;
-  font-size: 80%; // back to default font-size
+  @include font-size($blockquote-small-font-size);
   color: $blockquote-small-color;
 
   &::before {
-    content: '\2014 \00A0'; // em dash, nbsp
+    content: "\2014\00A0"; // em dash, nbsp
   }
 }