0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
- Rather than override and hack for IE8-10 and then IE11, scope to just Safari.
- Drops the IE hacks for a media query Webkit hack
This commit is contained in:
Mark Otto 2014-11-09 15:03:33 -08:00
parent df28b7e25f
commit 46d1bf8eef
9 changed files with 59 additions and 133 deletions

View File

@ -2400,56 +2400,25 @@ textarea.form-control {
input[type="search"] { input[type="search"] {
-webkit-appearance: none; -webkit-appearance: none;
} }
input[type="date"], @media screen and (-webkit-min-device-pixel-ratio: 0) {
input[type="time"], input[type="date"],
input[type="datetime-local"], input[type="time"],
input[type="month"] { input[type="datetime-local"],
input[type="month"] {
line-height: 34px; line-height: 34px;
line-height: 1.42857143 \0; }
} input[type="date"].input-sm,
input[type="date"].input-sm, input[type="time"].input-sm,
input[type="time"].input-sm, input[type="datetime-local"].input-sm,
input[type="datetime-local"].input-sm, input[type="month"].input-sm {
input[type="month"].input-sm {
line-height: 30px; line-height: 30px;
line-height: 1.5 \0; }
} input[type="date"].input-lg,
input[type="date"].input-lg, input[type="time"].input-lg,
input[type="time"].input-lg, input[type="datetime-local"].input-lg,
input[type="datetime-local"].input-lg, input[type="month"].input-lg {
input[type="month"].input-lg {
line-height: 46px; line-height: 46px;
line-height: 1.33 \0; }
}
_:-ms-fullscreen,
:root input[type="date"],
_:-ms-fullscreen,
:root input[type="time"],
_:-ms-fullscreen,
:root input[type="datetime-local"],
_:-ms-fullscreen,
:root input[type="month"] {
line-height: 1.42857143;
}
_:-ms-fullscreen.input-sm,
:root input[type="date"].input-sm,
_:-ms-fullscreen.input-sm,
:root input[type="time"].input-sm,
_:-ms-fullscreen.input-sm,
:root input[type="datetime-local"].input-sm,
_:-ms-fullscreen.input-sm,
:root input[type="month"].input-sm {
line-height: 1.5;
}
_:-ms-fullscreen.input-lg,
:root input[type="date"].input-lg,
_:-ms-fullscreen.input-lg,
:root input[type="time"].input-lg,
_:-ms-fullscreen.input-lg,
:root input[type="datetime-local"].input-lg,
_:-ms-fullscreen.input-lg,
:root input[type="month"].input-lg {
line-height: 1.33;
} }
.form-group { .form-group {
margin-bottom: 15px; margin-bottom: 15px;

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -2400,56 +2400,25 @@ textarea.form-control {
input[type="search"] { input[type="search"] {
-webkit-appearance: none; -webkit-appearance: none;
} }
input[type="date"], @media screen and (-webkit-min-device-pixel-ratio: 0) {
input[type="time"], input[type="date"],
input[type="datetime-local"], input[type="time"],
input[type="month"] { input[type="datetime-local"],
input[type="month"] {
line-height: 34px; line-height: 34px;
line-height: 1.42857143 \0; }
} input[type="date"].input-sm,
input[type="date"].input-sm, input[type="time"].input-sm,
input[type="time"].input-sm, input[type="datetime-local"].input-sm,
input[type="datetime-local"].input-sm, input[type="month"].input-sm {
input[type="month"].input-sm {
line-height: 30px; line-height: 30px;
line-height: 1.5 \0; }
} input[type="date"].input-lg,
input[type="date"].input-lg, input[type="time"].input-lg,
input[type="time"].input-lg, input[type="datetime-local"].input-lg,
input[type="datetime-local"].input-lg, input[type="month"].input-lg {
input[type="month"].input-lg {
line-height: 46px; line-height: 46px;
line-height: 1.33 \0; }
}
_:-ms-fullscreen,
:root input[type="date"],
_:-ms-fullscreen,
:root input[type="time"],
_:-ms-fullscreen,
:root input[type="datetime-local"],
_:-ms-fullscreen,
:root input[type="month"] {
line-height: 1.42857143;
}
_:-ms-fullscreen.input-sm,
:root input[type="date"].input-sm,
_:-ms-fullscreen.input-sm,
:root input[type="time"].input-sm,
_:-ms-fullscreen.input-sm,
:root input[type="datetime-local"].input-sm,
_:-ms-fullscreen.input-sm,
:root input[type="month"].input-sm {
line-height: 1.5;
}
_:-ms-fullscreen.input-lg,
:root input[type="date"].input-lg,
_:-ms-fullscreen.input-lg,
:root input[type="time"].input-lg,
_:-ms-fullscreen.input-lg,
:root input[type="datetime-local"].input-lg,
_:-ms-fullscreen.input-lg,
:root input[type="month"].input-lg {
line-height: 1.33;
} }
.form-group { .form-group {
margin-bottom: 15px; margin-bottom: 15px;

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -173,36 +173,24 @@ input[type="search"] {
// given height of the input. Since this fucks up everything else, we have to // given height of the input. Since this fucks up everything else, we have to
// appropriately reset it for Internet Explorer and the size variations. // appropriately reset it for Internet Explorer and the size variations.
input[type="date"], @media screen and (-webkit-min-device-pixel-ratio:0) {
input[type="time"], input[type="date"],
input[type="datetime-local"], input[type="time"],
input[type="month"] { input[type="datetime-local"],
input[type="month"] {
line-height: @input-height-base; line-height: @input-height-base;
// IE8+ misaligns the text within date inputs, so we reset }
line-height: @line-height-base ~"\0"; input[type="date"].input-sm,
input[type="time"].input-sm,
&.input-sm { input[type="datetime-local"].input-sm,
input[type="month"].input-sm {
line-height: @input-height-small; line-height: @input-height-small;
line-height: @line-height-small ~"\0";
} }
&.input-lg { input[type="date"].input-lg,
input[type="time"].input-lg,
input[type="datetime-local"].input-lg,
input[type="month"].input-lg {
line-height: @input-height-large; line-height: @input-height-large;
line-height: @line-height-large ~"\0";
}
}
// IE 11 hack to reverse the iOS temporal input hack.
_:-ms-fullscreen, :root input[type="date"],
_:-ms-fullscreen, :root input[type="time"],
_:-ms-fullscreen, :root input[type="datetime-local"],
_:-ms-fullscreen, :root input[type="month"] {
line-height: @line-height-base;
&.input-sm {
line-height: @line-height-small;
}
&.input-lg {
line-height: @line-height-large;
} }
} }