diff options
| author | Mark Otto <[email protected]> | 2015-03-28 20:52:14 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-03-28 20:52:14 -0700 |
| commit | f025840eae65afb4c8721192c9f22d5b9f7b2530 (patch) | |
| tree | 60e9d74413a908774cd334e8b6543ea675134bed /dist/css/bootstrap.css | |
| parent | 6a6ac5db3386389344802a995b77f197dfc9c003 (diff) | |
| parent | 57c8e3cd51abcb4230d37863b40bcca564d033f4 (diff) | |
| download | bootstrap-f025840eae65afb4c8721192c9f22d5b9f7b2530.tar.xz bootstrap-f025840eae65afb4c8721192c9f22d5b9f7b2530.zip | |
Merge pull request #16159 from twbs/input_sizing
Fixes #15074
Diffstat (limited to 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 77479b251..5f09bfda2 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2728,12 +2728,12 @@ select[multiple].input-sm { line-height: 1.5; border-radius: 3px; } -select.form-group-sm .form-control { +.form-group-sm select.form-control { height: 30px; line-height: 30px; } -textarea.form-group-sm .form-control, -select[multiple].form-group-sm .form-control { +.form-group-sm textarea.form-control, +.form-group-sm select[multiple].form-control { height: auto; } .form-group-sm .form-control-static { @@ -2765,12 +2765,12 @@ select[multiple].input-lg { line-height: 1.3333333; border-radius: 6px; } -select.form-group-lg .form-control { +.form-group-lg select.form-control { height: 46px; line-height: 46px; } -textarea.form-group-lg .form-control, -select[multiple].form-group-lg .form-control { +.form-group-lg textarea.form-control, +.form-group-lg select[multiple].form-control { height: auto; } .form-group-lg .form-control-static { |