mirror of
https://github.com/twbs/bootstrap.git
synced 2025-01-29 21:52:22 +01:00
Fixes #14234: Reset the hack IE8-10 with another hack just for IE11 for temporal inputs and line-height
This commit is contained in:
parent
9d0872b748
commit
6424acf69a
31
dist/css/bootstrap.css
vendored
31
dist/css/bootstrap.css
vendored
@ -2254,7 +2254,6 @@ table th[class*="col-"] {
|
||||
overflow-y: hidden;
|
||||
-ms-overflow-style: -ms-autohiding-scrollbar;
|
||||
border: 1px solid #ddd;
|
||||
/*-webkit-overflow-scrolling: touch;*/
|
||||
}
|
||||
.table-responsive > .table {
|
||||
margin-bottom: 0;
|
||||
@ -2420,6 +2419,36 @@ input[type="month"].input-lg {
|
||||
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 {
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
|
2
dist/css/bootstrap.css.map
vendored
2
dist/css/bootstrap.css.map
vendored
File diff suppressed because one or more lines are too long
2
dist/css/bootstrap.min.css
vendored
2
dist/css/bootstrap.min.css
vendored
File diff suppressed because one or more lines are too long
31
docs/dist/css/bootstrap.css
vendored
31
docs/dist/css/bootstrap.css
vendored
@ -2254,7 +2254,6 @@ table th[class*="col-"] {
|
||||
overflow-y: hidden;
|
||||
-ms-overflow-style: -ms-autohiding-scrollbar;
|
||||
border: 1px solid #ddd;
|
||||
/*-webkit-overflow-scrolling: touch;*/
|
||||
}
|
||||
.table-responsive > .table {
|
||||
margin-bottom: 0;
|
||||
@ -2420,6 +2419,36 @@ input[type="month"].input-lg {
|
||||
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 {
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
|
2
docs/dist/css/bootstrap.css.map
vendored
2
docs/dist/css/bootstrap.css.map
vendored
File diff suppressed because one or more lines are too long
2
docs/dist/css/bootstrap.min.css
vendored
2
docs/dist/css/bootstrap.min.css
vendored
File diff suppressed because one or more lines are too long
@ -191,6 +191,21 @@ input[type="month"] {
|
||||
}
|
||||
}
|
||||
|
||||
// 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;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Form groups
|
||||
//
|
||||
|
Loading…
x
Reference in New Issue
Block a user