Merge branch 'master' into master-mc-sr-only

twbs · May 3, 2019 · 8fd87c4 · 8fd87c4
2 parents 6351db6 + 91230db
commit 8fd87c4
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 2 deletions.
diff --git a/scss/_dropdown.scss b/scss/_dropdown.scss
@@ -20,7 +20,6 @@
   left: 0;
   z-index: $zindex-dropdown;
   display: none; // none by default, but block on "open" of the menu
-  float: left;
   min-width: $dropdown-min-width;
   padding: $dropdown-padding-y 0;
   margin: $dropdown-spacer 0 0; // override default ul

diff --git a/scss/_navbar.scss b/scss/_navbar.scss
@@ -72,7 +72,6 @@
 
   .dropdown-menu {
     position: static;
-    float: none;
   }
 }
 

diff --git a/scss/_reboot.scss b/scss/_reboot.scss
@@ -88,6 +88,7 @@ hr:not([size]) {
   margin-top: 0;
   margin-bottom: $headings-margin-bottom;
   font-family: $headings-font-family;
+  font-style: $headings-font-style;
   font-weight: $headings-font-weight;
   line-height: $headings-line-height;
   color: $headings-color;

diff --git a/scss/_variables.scss b/scss/_variables.scss
@@ -297,6 +297,7 @@ $h6-font-size:                $font-size-base !default;
 
 $headings-margin-bottom:      $spacer / 2 !default;
 $headings-font-family:        null !default;
+$headings-font-style:         null !default;
 $headings-font-weight:        500 !default;
 $headings-line-height:        1.2 !default;
 $headings-color:              null !default;
-Original file line number
+Diff line change
@@ Expand Up / @@ -72,7 +72,6 @@ @@
       .dropdown-menu {
         position: static;
-        float: none;
       }
     }
@@ Expand Down @@