From 46d1bf8eefa5ca00357d7dd8f901ffb5c48c7be2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 9 Nov 2014 15:03:33 -0800 Subject: Fixes #14234 again - 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 --- less/forms.less | 42 +++++++++++++++--------------------------- 1 file changed, 15 insertions(+), 27 deletions(-) (limited to 'less/forms.less') diff --git a/less/forms.less b/less/forms.less index 38e4ce6d6..c864e8465 100644 --- a/less/forms.less +++ b/less/forms.less @@ -173,36 +173,24 @@ input[type="search"] { // given height of the input. Since this fucks up everything else, we have to // appropriately reset it for Internet Explorer and the size variations. -input[type="date"], -input[type="time"], -input[type="datetime-local"], -input[type="month"] { - line-height: @input-height-base; - // IE8+ misaligns the text within date inputs, so we reset - line-height: @line-height-base ~"\0"; - - &.input-sm { +@media screen and (-webkit-min-device-pixel-ratio:0) { + input[type="date"], + input[type="time"], + input[type="datetime-local"], + input[type="month"] { + line-height: @input-height-base; + } + input[type="date"].input-sm, + input[type="time"].input-sm, + input[type="datetime-local"].input-sm, + input[type="month"].input-sm { 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: @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; } } -- cgit v1.2.3