diff options
| author | Mark Otto <[email protected]> | 2014-08-02 21:16:32 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-08-02 21:16:32 -0700 |
| commit | 6424acf69ae40a916db04b5c3235f1780f11b4be (patch) | |
| tree | f7dcb8f3d4a78f4e960e7bf29eb68a1f45a613e1 /dist/css/bootstrap.css | |
| parent | 9d0872b74821a72f91e8604d69e6f94054ff0490 (diff) | |
| download | bootstrap-6424acf69ae40a916db04b5c3235f1780f11b4be.tar.xz bootstrap-6424acf69ae40a916db04b5c3235f1780f11b4be.zip | |
Fixes #14234: Reset the hack IE8-10 with another hack just for IE11 for temporal inputs and line-height
Diffstat (limited to 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 31 |
1 files changed, 30 insertions, 1 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 9d58294a0..ecf99df6a 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -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; } |
