From 1be0b57d34c4712ba747ccb0e917acef2117dc13 Mon Sep 17 00:00:00 2001 From: Rob Fletcher Date: Mon, 17 Mar 2014 14:36:58 +0000 Subject: Fix vertical alignment of temporal inputs on iOS Fixes #13098 Closes #13099 --- dist/css/bootstrap.css | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'dist/css/bootstrap.css') 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 { -- cgit v1.2.3 From 21084192b642f7a7340a58c88025771ea281f48d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 24 Mar 2014 19:08:05 -0700 Subject: Fixes #13079: Scope .open class in button variant mixin to immediate children --- dist/css/bootstrap.css | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index c4870da5b..cc058b732 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2721,14 +2721,14 @@ fieldset[disabled] .btn { .btn-default:focus, .btn-default:active, .btn-default.active, -.open .dropdown-toggle.btn-default { +.open > .dropdown-toggle.btn-default { color: #333; background-color: #e6e6e6; border-color: #adadad; } .btn-default:active, .btn-default.active, -.open .dropdown-toggle.btn-default { +.open > .dropdown-toggle.btn-default { background-image: none; } .btn-default.disabled, @@ -2762,14 +2762,14 @@ fieldset[disabled] .btn-default.active { .btn-primary:focus, .btn-primary:active, .btn-primary.active, -.open .dropdown-toggle.btn-primary { +.open > .dropdown-toggle.btn-primary { color: #fff; background-color: #3071a9; border-color: #285e8e; } .btn-primary:active, .btn-primary.active, -.open .dropdown-toggle.btn-primary { +.open > .dropdown-toggle.btn-primary { background-image: none; } .btn-primary.disabled, @@ -2803,14 +2803,14 @@ fieldset[disabled] .btn-primary.active { .btn-success:focus, .btn-success:active, .btn-success.active, -.open .dropdown-toggle.btn-success { +.open > .dropdown-toggle.btn-success { color: #fff; background-color: #449d44; border-color: #398439; } .btn-success:active, .btn-success.active, -.open .dropdown-toggle.btn-success { +.open > .dropdown-toggle.btn-success { background-image: none; } .btn-success.disabled, @@ -2844,14 +2844,14 @@ fieldset[disabled] .btn-success.active { .btn-info:focus, .btn-info:active, .btn-info.active, -.open .dropdown-toggle.btn-info { +.open > .dropdown-toggle.btn-info { color: #fff; background-color: #31b0d5; border-color: #269abc; } .btn-info:active, .btn-info.active, -.open .dropdown-toggle.btn-info { +.open > .dropdown-toggle.btn-info { background-image: none; } .btn-info.disabled, @@ -2885,14 +2885,14 @@ fieldset[disabled] .btn-info.active { .btn-warning:focus, .btn-warning:active, .btn-warning.active, -.open .dropdown-toggle.btn-warning { +.open > .dropdown-toggle.btn-warning { color: #fff; background-color: #ec971f; border-color: #d58512; } .btn-warning:active, .btn-warning.active, -.open .dropdown-toggle.btn-warning { +.open > .dropdown-toggle.btn-warning { background-image: none; } .btn-warning.disabled, @@ -2926,14 +2926,14 @@ fieldset[disabled] .btn-warning.active { .btn-danger:focus, .btn-danger:active, .btn-danger.active, -.open .dropdown-toggle.btn-danger { +.open > .dropdown-toggle.btn-danger { color: #fff; background-color: #c9302c; border-color: #ac2925; } .btn-danger:active, .btn-danger.active, -.open .dropdown-toggle.btn-danger { +.open > .dropdown-toggle.btn-danger { background-image: none; } .btn-danger.disabled, -- cgit v1.2.3 From 6f6bce5944bd0e6ab36ab6b39339f381d8a80b2a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 24 Mar 2014 19:26:41 -0700 Subject: Fixes #13141: Add a max-width: 100%; to label elements so IE8 wraps text --- dist/css/bootstrap.css | 1 + 1 file changed, 1 insertion(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index cc058b732..ed8087b2f 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2285,6 +2285,7 @@ legend { } label { display: inline-block; + max-width: 100%; margin-bottom: 5px; font-weight: bold; } -- cgit v1.2.3