]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Sync dropdown font size with btn font size
authorMartijn Cuppens <martijn.cuppens@intracto.com>
Mon, 7 Jan 2019 15:11:26 +0000 (16:11 +0100)
committerMark Otto <otto@github.com>
Mon, 14 Jan 2019 00:27:40 +0000 (16:27 -0800)
scss/_dropdown.scss
scss/_variables.scss

index 0d8303bbcee625d2a5f69c46f6251eca549c6d7c..acc68aa5993574d3568b39957afede3935a74bef 100644 (file)
@@ -24,7 +24,7 @@
   min-width: $dropdown-min-width;
   padding: $dropdown-padding-y 0;
   margin: $dropdown-spacer 0 0; // override default ul
-  font-size: $font-size-base; // Redeclare because nesting can cause inheritance issues
+  font-size: $dropdown-font-size;
   color: $body-color;
   text-align: left; // Ensures proper alignment if parent has it changed (e.g., modal footer)
   list-style: none;
index a6ad6a0535e1cf4de6b717be88f568d6cd3749bb..63f33a537453d755866fdd4f813b0d1ad1078eb8 100644 (file)
@@ -755,6 +755,7 @@ $navbar-dark-brand-hover-color:           $navbar-dark-active-color !default;
 $dropdown-min-width:                10rem !default;
 $dropdown-padding-y:                .5rem !default;
 $dropdown-spacer:                   .125rem !default;
+$dropdown-font-size:                $btn-font-size !default;
 $dropdown-bg:                       $white !default;
 $dropdown-border-color:             rgba($black, .15) !default;
 $dropdown-border-radius:            $border-radius !default;