diff options
| author | Rob Fletcher <[email protected]> | 2014-03-17 14:36:58 +0000 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2014-03-20 01:13:21 -0700 |
| commit | 1be0b57d34c4712ba747ccb0e917acef2117dc13 (patch) | |
| tree | 7452b7e92011053dad54a9a7c7c57fdee728ad57 | |
| parent | f2952aeccf4e5653bd7fc2ba3f7ca183e570ab3e (diff) | |
| download | bootstrap-1be0b57d34c4712ba747ccb0e917acef2117dc13.tar.xz bootstrap-1be0b57d34c4712ba747ccb0e917acef2117dc13.zip | |
Fix vertical alignment of temporal inputs on iOS
Fixes #13098
Closes #13099
| -rw-r--r-- | dist/css/bootstrap-rtl.css | 15 | ||||
| -rw-r--r-- | dist/css/bootstrap.css | 15 | ||||
| -rw-r--r-- | less/forms.less | 5 |
3 files changed, 28 insertions, 7 deletions
diff --git a/dist/css/bootstrap-rtl.css b/dist/css/bootstrap-rtl.css index 264f06737..c8f156852 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 4a7a28fb0..c4870da5b 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 8578e8ce6..f8de2e403 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"; |