diff options
| author | Mark Otto <[email protected]> | 2014-06-19 15:24:24 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-06-19 15:24:24 -0700 |
| commit | a4fa8d07c8679628d50d66b239874078735897f1 (patch) | |
| tree | d8c782a1679e692506a5982da4d8083d49b4d351 /dist/css/bootstrap.css | |
| parent | 9488bd58f90c8435c20dd4e596244d10f8b698fa (diff) | |
| parent | 00cc166671a4ecfe3284662db14c8bf151de5bb5 (diff) | |
| download | bootstrap-a4fa8d07c8679628d50d66b239874078735897f1.tar.xz bootstrap-a4fa8d07c8679628d50d66b239874078735897f1.zip | |
grunt dist
Diffstat (limited to 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 087c2a97c..70431c368 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2480,7 +2480,8 @@ fieldset[disabled] .radio label, fieldset[disabled] .checkbox label { cursor: not-allowed; } -.input-sm { +.input-sm, +.form-horizontal .form-group-sm .form-control { height: 30px; padding: 5px 10px; font-size: 12px; @@ -2495,7 +2496,8 @@ textarea.input-sm, select[multiple].input-sm { height: auto; } -.input-lg { +.input-lg, +.form-horizontal .form-group-lg .form-control { height: 46px; padding: 10px 16px; font-size: 18px; @@ -2705,6 +2707,16 @@ select[multiple].input-lg { top: 0; right: 15px; } +@media (min-width: 768px) { + .form-horizontal .form-group-lg .control-label { + padding-top: 14.3px; + } +} +@media (min-width: 768px) { + .form-horizontal .form-group-sm .control-label { + padding-top: 6px; + } +} .btn { display: inline-block; padding: 6px 12px; |