diff options
Diffstat (limited to 'scss')
| -rw-r--r-- | scss/_reboot.scss | 16 | ||||
| -rw-r--r-- | scss/forms/_floating-labels.scss | 22 | ||||
| -rw-r--r-- | scss/forms/_form-range.scss | 45 | ||||
| -rw-r--r-- | scss/forms/_form-select.scss | 10 |
4 files changed, 2 insertions, 91 deletions
diff --git a/scss/_reboot.scss b/scss/_reboot.scss index 35d5bbd99..2d70e533a 100644 --- a/scss/_reboot.scss +++ b/scss/_reboot.scss @@ -295,8 +295,6 @@ samp { // 1. Remove browser default top margin // 2. Reset browser default of `1em` to use `rem`s // 3. Don't allow content to break outside -// 4. Disable auto-hiding scrollbar in legacy Edge to avoid overlap, -// making it impossible to interact with the content pre { display: block; @@ -305,7 +303,6 @@ pre { overflow: auto; // 3 @include font-size($code-font-size); color: $pre-color; - -ms-overflow-style: scrollbar; // 4 // Account for some code outputs that place code tags in pre tags code { @@ -434,13 +431,6 @@ textarea { line-height: inherit; } -// Show the overflow in Edge - -button, -input { - overflow: visible; -} - // Remove the inheritance of text transform in Firefox button, @@ -516,8 +506,7 @@ fieldset { // 1. By using `float: left`, the legend will behave like a block element. // This way the border of a fieldset wraps around the legend if present. -// 2. Correct the text wrapping in Edge. -// 3. Fix wrapping bug. +// 2. Fix wrapping bug. // See https://github.com/twbs/bootstrap/issues/29712 legend { @@ -528,10 +517,9 @@ legend { @include font-size($legend-font-size); font-weight: $legend-font-weight; line-height: inherit; - white-space: normal; // 2 + * { - clear: left; // 3 + clear: left; // 2 } } diff --git a/scss/forms/_floating-labels.scss b/scss/forms/_floating-labels.scss index b35f1c3bd..42e56f27b 100644 --- a/scss/forms/_floating-labels.scss +++ b/scss/forms/_floating-labels.scss @@ -61,25 +61,3 @@ } // stylelint-enable no-duplicate-selectors } - - -// -// Fallback for classic Edge -// - -@supports (-ms-ime-align: auto) { - .form-floating { - display: flex; - flex-direction: column-reverse; - } - .form-floating > label { - position: static; - padding: 0; - margin-bottom: calc(#{$form-floating-padding-y} / 2); // stylelint-disable-line function-disallowed-list - border: 0; - @include transition(none); - } - .form-floating > .form-control::-ms-input-placeholder { - color: $input-placeholder-color; - } -} diff --git a/scss/forms/_form-range.scss b/scss/forms/_form-range.scss index 6cf90138d..b603a7bc3 100644 --- a/scss/forms/_form-range.scss +++ b/scss/forms/_form-range.scss @@ -18,7 +18,6 @@ // No box-shadow() mixin for focus accessibility. &::-webkit-slider-thumb { box-shadow: $form-range-thumb-focus-box-shadow; } &::-moz-range-thumb { box-shadow: $form-range-thumb-focus-box-shadow; } - &::-ms-thumb { box-shadow: $form-range-thumb-focus-box-shadow; } } &::-moz-focus-outer { @@ -78,46 +77,6 @@ @include box-shadow($form-range-track-box-shadow); } - &::-ms-thumb { - width: $form-range-thumb-width; - height: $form-range-thumb-height; - margin-top: 0; // Edge specific - margin-right: $form-range-thumb-focus-box-shadow-width; // Workaround that overflowed box-shadow is hidden. - margin-left: $form-range-thumb-focus-box-shadow-width; // Workaround that overflowed box-shadow is hidden. - @include gradient-bg($form-range-thumb-bg); - border: $form-range-thumb-border; - @include border-radius($form-range-thumb-border-radius); - @include box-shadow($form-range-thumb-box-shadow); - @include transition($form-range-thumb-transition); - appearance: none; - - &:active { - @include gradient-bg($form-range-thumb-active-bg); - } - } - - &::-ms-track { - width: $form-range-track-width; - height: $form-range-track-height; - color: transparent; - cursor: $form-range-track-cursor; - background-color: transparent; - border-color: transparent; - border-width: $form-range-thumb-height / 2; - @include box-shadow($form-range-track-box-shadow); - } - - &::-ms-fill-lower { - background-color: $form-range-track-bg; - @include border-radius($form-range-track-border-radius); - } - - &::-ms-fill-upper { - margin-right: 15px; // arbitrary? - background-color: $form-range-track-bg; - @include border-radius($form-range-track-border-radius); - } - &:disabled { pointer-events: none; @@ -128,9 +87,5 @@ &::-moz-range-thumb { background-color: $form-range-thumb-disabled-bg; } - - &::-ms-thumb { - background-color: $form-range-thumb-disabled-bg; - } } } diff --git a/scss/forms/_form-select.scss b/scss/forms/_form-select.scss index 6ebe33e10..1866da964 100644 --- a/scss/forms/_form-select.scss +++ b/scss/forms/_form-select.scss @@ -32,16 +32,6 @@ // Avoid using mixin so we can pass custom focus shadow properly box-shadow: $form-select-focus-box-shadow; } - - &::-ms-value { - // For visual consistency with other platforms/browsers, - // suppress the default white text on blue background highlight given to - // the selected option text when the (still closed) <select> receives focus - // in Edge. - // See https://github.com/twbs/bootstrap/issues/19398. - color: $input-color; - background-color: $input-bg; - } } &[multiple], |