]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Fix custom select font sizes (#27929)
authorMartijn Cuppens <martijn.cuppens@gmail.com>
Sat, 29 Dec 2018 02:44:35 +0000 (03:44 +0100)
committerXhmikosR <xhmikosr@gmail.com>
Sat, 29 Dec 2018 02:44:35 +0000 (04:44 +0200)
scss/_custom-forms.scss
scss/_variables.scss

index 985dddba42db713dbd9c1ccaf85a7a448b4832f0..ecbe3b0f86af52a2818ea2559d3f3203dba8467f 100644 (file)
   width: 100%;
   height: $custom-select-height;
   padding: $custom-select-padding-y ($custom-select-padding-x + $custom-select-indicator-padding) $custom-select-padding-y $custom-select-padding-x;
+  font-size: $custom-select-font-size;
   font-weight: $custom-select-font-weight;
   line-height: $custom-select-line-height;
   color: $custom-select-color;
index 0a30d9663cecdcadc391dd8a73bbfece2950057d..205bb327ae0fa22cd7c5e21dc0c363b8b6add25d 100644 (file)
@@ -565,6 +565,7 @@ $custom-switch-indicator-size:                  calc(#{$custom-control-indicator
 
 $custom-select-padding-y:           $input-btn-padding-y !default;
 $custom-select-padding-x:           $input-btn-padding-x !default;
+$custom-select-font-size:           $input-font-size !default;
 $custom-select-height:              $input-height !default;
 $custom-select-indicator-padding:   1rem !default; // Extra padding to account for the presence of the background-image based indicator
 $custom-select-font-weight:         $input-font-weight !default;
@@ -593,12 +594,12 @@ $custom-select-focus-box-shadow:    0 0 0 $custom-select-focus-width rgba($custo
 
 $custom-select-padding-y-sm:        $input-padding-y-sm !default;
 $custom-select-padding-x-sm:        $input-padding-x-sm !default;
-$custom-select-font-size-sm:        $input-btn-font-size-sm !default;
+$custom-select-font-size-sm:        $input-font-size-sm !default;
 $custom-select-height-sm:           $input-height-sm !default;
 
 $custom-select-padding-y-lg:        $input-padding-y-lg !default;
 $custom-select-padding-x-lg:        $input-padding-x-lg !default;
-$custom-select-font-size-lg:        $input-btn-font-size-lg !default;
+$custom-select-font-size-lg:        $input-font-size-lg !default;
 $custom-select-height-lg:           $input-height-lg !default;
 
 $custom-range-track-width:          100% !default;