diff options
| author | Mark Otto <[email protected]> | 2017-04-22 11:56:27 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2017-04-22 11:56:27 -0700 |
| commit | ca44f5b03a9707dda74e1aa3f92a1b54de3ec6d5 (patch) | |
| tree | 571b3ba99ed9a37eca3fc35afbbf25039afea92e | |
| parent | dc3af6711d4a47e852ca7e82086f10b265a9025d (diff) | |
| download | bootstrap-ca44f5b03a9707dda74e1aa3f92a1b54de3ec6d5.tar.xz bootstrap-ca44f5b03a9707dda74e1aa3f92a1b54de3ec6d5.zip | |
Redo the small custom select vars
— Sizing shorthand comes last
— Add height var and put it to use
| -rw-r--r-- | scss/_custom-forms.scss | 8 | ||||
| -rw-r--r-- | scss/_variables.scss | 3 |
2 files changed, 4 insertions, 7 deletions
diff --git a/scss/_custom-forms.scss b/scss/_custom-forms.scss index fb1e59c57..1d3ce2f18 100644 --- a/scss/_custom-forms.scss +++ b/scss/_custom-forms.scss @@ -176,14 +176,10 @@ } .custom-select-sm { + height: $custom-select-height-sm; padding-top: $custom-select-padding-y; padding-bottom: $custom-select-padding-y; - font-size: $custom-select-sm-font-size; - - // &:not([multiple]) { - // height: 26px; - // min-height: 26px; - // } + font-size: $custom-select-font-size-sm; } diff --git a/scss/_variables.scss b/scss/_variables.scss index d59d8fb21..3ab37f9f5 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -492,7 +492,8 @@ $custom-select-border-radius: $border-radius !default; $custom-select-focus-border-color: lighten($brand-primary, 25%) !default; $custom-select-focus-box-shadow: inset 0 1px 2px rgba($black, .075), 0 0 5px rgba($custom-select-focus-border-color, .5) !default; -$custom-select-sm-font-size: 75% !default; +$custom-select-font-size-sm: 75% !default; +$custom-select-height-sm: $input-height-sm !default; $custom-file-height: 2.5rem !default; $custom-file-width: 14rem !default; |