rake update[v4.0.0-alpha.6]

1 files changed, 5 insertions, 12 deletions

diff --git a/assets/stylesheets/bootstrap/_type.scss b/assets/stylesheets/bootstrap/_type.scss
index ff71140..13a64b0 100644
--- a/assets/stylesheets/bootstrap/_type.scss
+++ b/assets/stylesheets/bootstrap/_type.scss
@@ -27,18 +27,22 @@ h6, .h6 { font-size: $font-size-h6; }
 .display-1 {
   font-size: $display1-size;
   font-weight: $display1-weight;
+  line-height: $display-line-height;
 }
 .display-2 {
   font-size: $display2-size;
   font-weight: $display2-weight;
+  line-height: $display-line-height;
 }
 .display-3 {
   font-size: $display3-size;
   font-weight: $display3-weight;
+  line-height: $display-line-height;
 }
 .display-4 {
   font-size: $display4-size;
   font-weight: $display4-weight;
+  line-height: $display-line-height;
 }
 
 
@@ -61,7 +65,7 @@ hr {
 small,
 .small {
   font-size: $small-font-size;
-  font-weight: normal;
+  font-weight: $font-weight-normal;
 }
 
 mark,
@@ -137,14 +141,3 @@ mark,
     content: "\00A0 \2014"; // nbsp, em dash
   }
 }
-
-@if not $enable-flex {
-  // Clean up some horizontal `<dl>`s built with grids
-  // scss-lint:disable QualifyingElement
-  dl.row {
-    > dd + dt {
-      clear: left;
-    }
-  }
-  // scss-lint:enable QualifyingElement
-}