Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/scss
diff options
context:
space:
mode:
authorMartijn Cuppens <martijn.cuppens@gmail.com>2018-12-29 05:44:35 +0300
committerXhmikosR <xhmikosr@gmail.com>2018-12-29 05:44:35 +0300
commit952374654ce7a7751dbf1a430f4c3f79e3d4fe48 (patch)
treefca3366ba1eed725675180b4c8663523db11aeab /scss
parent8eef162c44bcf72e8169aa458f3ad8179c11ca9c (diff)
Fix custom select font sizes (#27929)
Diffstat (limited to 'scss')
-rw-r--r--scss/_custom-forms.scss1
-rw-r--r--scss/_variables.scss5
2 files changed, 4 insertions, 2 deletions
diff --git a/scss/_custom-forms.scss b/scss/_custom-forms.scss
index 985dddba42..ecbe3b0f86 100644
--- a/scss/_custom-forms.scss
+++ b/scss/_custom-forms.scss
@@ -216,6 +216,7 @@
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;
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 0a30d9663c..205bb327ae 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -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;