diff options
| author | Mark Otto <[email protected]> | 2016-04-23 14:24:08 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-04-23 14:24:08 -0700 |
| commit | 9f2ab98026cd1df4c74cdad1aa03d2931f979f91 (patch) | |
| tree | 10b02fa770aa10535d82df91bbd7d4bafe258cfa /scss | |
| parent | 29ff8e8b1449887b0e07bd9e19befb0ce1e1cb81 (diff) | |
| parent | 1a6d0cc446259cf86d73bf7437f2ca3b095f6781 (diff) | |
| download | bootstrap-9f2ab98026cd1df4c74cdad1aa03d2931f979f91.tar.xz bootstrap-9f2ab98026cd1df4c74cdad1aa03d2931f979f91.zip | |
Merge branch 'v4-dev' into v4-forms-cleanup
Diffstat (limited to 'scss')
| -rw-r--r-- | scss/_custom-forms.scss | 10 | ||||
| -rw-r--r-- | scss/_forms.scss | 10 | ||||
| -rw-r--r-- | scss/_navbar.scss | 2 | ||||
| -rw-r--r-- | scss/mixins/_screen-reader.scss | 2 |
4 files changed, 22 insertions, 2 deletions
diff --git a/scss/_custom-forms.scss b/scss/_custom-forms.scss index 371945ce7..8222a65b0 100644 --- a/scss/_custom-forms.scss +++ b/scss/_custom-forms.scss @@ -159,6 +159,16 @@ border-color: $custom-select-focus-border-color; outline: none; @include box-shadow($custom-select-focus-box-shadow); + + &::-ms-value { + // For visual consistency with other platforms/browsers, + // supress the default white text on blue background highlight given to + // the selected option text when the (still closed) <select> receives focus + // in IE and (under certain conditions) Edge. + // See https://github.com/twbs/bootstrap/issues/19398. + color: $input-color; + background-color: $input-bg; + } } // Hides the default caret in IE11 diff --git a/scss/_forms.scss b/scss/_forms.scss index c3a4be270..dc2ad9b4a 100644 --- a/scss/_forms.scss +++ b/scss/_forms.scss @@ -60,6 +60,16 @@ select.form-control { &:not([size]):not([multiple]) { height: $input-height; } + + &:focus::-ms-value { + // Suppress the nested default white text on blue background highlight given to + // the selected option text when the (still closed) <select> receives focus + // in IE and (under certain conditions) Edge, as it looks bad and cannot be made to + // match the appearance of the native widget. + // See https://github.com/twbs/bootstrap/issues/19398. + color: $input-color; + background-color: $input-bg; + } } // Make file inputs better match text inputs by forcing them to new lines. diff --git a/scss/_navbar.scss b/scss/_navbar.scss index 85a369777..6c4e9efa5 100644 --- a/scss/_navbar.scss +++ b/scss/_navbar.scss @@ -86,7 +86,7 @@ .navbar-divider { float: left; - width: 1px; + width: $border-width; padding-top: .425rem; padding-bottom: .425rem; margin-right: $navbar-padding-x; diff --git a/scss/mixins/_screen-reader.scss b/scss/mixins/_screen-reader.scss index e52b282a9..6ae65516a 100644 --- a/scss/mixins/_screen-reader.scss +++ b/scss/mixins/_screen-reader.scss @@ -1,6 +1,6 @@ // Only display content to screen readers // -// See: http://a11yproject.com/posts/how-to-hide-content/ +// See: http://a11yproject.com/posts/how-to-hide-content @mixin sr-only { position: absolute; |