Commit a89f00ed authored by Mark Otto's avatar Mark Otto
Browse files

Merge pull request #16529 from WonSong/master

Removes border around <select> caret in IE10+
parents de2b660a 22e338e3
Showing with 10 additions and 2 deletions
+10 -2
...@@ -132,6 +132,12 @@ output { ...@@ -132,6 +132,12 @@ output {
// Placeholder // Placeholder
.placeholder(); .placeholder();
// Removes the border and background color around the caret in IE
&::-ms-expand {
border: 0;
background-color: @input-bg;
}
// Disabled and read-only inputs // Disabled and read-only inputs
// //
// HTML5 says that controls under a fieldset > legend:first-child won't be // HTML5 says that controls under a fieldset > legend:first-child won't be
...@@ -139,6 +145,8 @@ output { ...@@ -139,6 +145,8 @@ output {
// don't honor that edge case; we style them as disabled anyway. // don't honor that edge case; we style them as disabled anyway.
&[disabled], &[disabled],
&[readonly], &[readonly],
&[disabled]::-ms-expand,
&[readonly]::-ms-expand,
fieldset[disabled] & { fieldset[disabled] & {
background-color: @input-bg-disabled; background-color: @input-bg-disabled;
opacity: 1; // iOS fix for unreadable disabled content; see https://github.com/twbs/bootstrap/issues/11655 opacity: 1; // iOS fix for unreadable disabled content; see https://github.com/twbs/bootstrap/issues/11655
...@@ -433,10 +441,10 @@ input[type="checkbox"] { ...@@ -433,10 +441,10 @@ input[type="checkbox"] {
.has-feedback label { .has-feedback label {
& ~ .form-control-feedback { & ~ .form-control-feedback {
top: (@line-height-computed + 5); // Height of the `label` and its margin top: (@line-height-computed + 5); // Height of the `label` and its margin
} }
&.sr-only ~ .form-control-feedback { &.sr-only ~ .form-control-feedback {
top: 0; top: 0;
} }
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment