From: Rob Fletcher Date: Mon, 17 Mar 2014 14:36:58 +0000 (+0000) Subject: Fix vertical alignment of temporal inputs on iOS X-Git-Tag: v3.2.0~337 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1be0b57d34c4712ba747ccb0e917acef2117dc13;p=thirdparty%2Fbootstrap.git Fix vertical alignment of temporal inputs on iOS Fixes #13098 Closes #13099 --- diff --git a/dist/css/bootstrap-rtl.css b/dist/css/bootstrap-rtl.css index 264f06737d..c8f1568520 100644 --- a/dist/css/bootstrap-rtl.css +++ b/dist/css/bootstrap-rtl.css @@ -3078,16 +3078,25 @@ input[type="search"] { -webkit-appearance: none; } -input[type="date"] { +input[type="date"], +input[type="time"], +input[type="datetime-local"], +input[type="month"] { 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="datetime-local"].input-sm, +input[type="month"].input-sm { line-height: 30px; } -input[type="date"].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: 46px; } diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 4a7a28fb00..c4870da5bf 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2371,14 +2371,23 @@ textarea.form-control { input[type="search"] { -webkit-appearance: none; } -input[type="date"] { +input[type="date"], +input[type="time"], +input[type="datetime-local"], +input[type="month"] { 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="datetime-local"].input-sm, +input[type="month"].input-sm { line-height: 30px; } -input[type="date"].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: 46px; } .form-group { diff --git a/less/forms.less b/less/forms.less index 8578e8ce6e..f8de2e403e 100644 --- a/less/forms.less +++ b/less/forms.less @@ -170,7 +170,10 @@ 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="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";