diff options
| author | Mark Otto <[email protected]> | 2014-08-03 16:18:41 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-08-03 16:18:41 -0700 |
| commit | ae9c1609329ff4e033635105aba7ec4aa9899ffb (patch) | |
| tree | f3fefbf1191b8cafda4b3f439d98ff7eb9970787 /less/forms.less | |
| parent | de77d04899f596359a57bafc09ebe8c453e85d2c (diff) | |
| parent | 6424acf69ae40a916db04b5c3235f1780f11b4be (diff) | |
| download | bootstrap-ae9c1609329ff4e033635105aba7ec4aa9899ffb.tar.xz bootstrap-ae9c1609329ff4e033635105aba7ec4aa9899ffb.zip | |
Merge branch 'master' into derp
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
Diffstat (limited to 'less/forms.less')
| -rw-r--r-- | less/forms.less | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/less/forms.less b/less/forms.less index 1d8fd0c2d..999cb506e 100644 --- a/less/forms.less +++ b/less/forms.less @@ -194,6 +194,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 // |