diff options
| author | Chris Rebert <[email protected]> | 2014-02-06 15:12:14 -0800 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2014-02-06 15:12:14 -0800 |
| commit | 651b289e269f8806e4e30854b99410dd7c9b3c38 (patch) | |
| tree | 2f64bace84cb0633fd8154341ddb104ee4cfde85 /dist/css/bootstrap.css | |
| parent | ef25676f6fd85d2b8eea68104cb3c824e80e614c (diff) | |
| parent | 37c21a3ac7f86f5cac904a12af897b3051170d02 (diff) | |
| download | bootstrap-651b289e269f8806e4e30854b99410dd7c9b3c38.tar.xz bootstrap-651b289e269f8806e4e30854b99410dd7c9b3c38.zip | |
Merge pull request #12613 from twbs/sized-btn-group-extend
use Less' extend feature in btn-group-lg etc.
Diffstat (limited to 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index e64956029..329b4fa2e 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2311,19 +2311,22 @@ fieldset[disabled] .btn-link:focus { color: #999; text-decoration: none; } -.btn-lg { +.btn-lg, +.btn-group-lg > .btn { padding: 10px 16px; font-size: 18px; line-height: 1.33; border-radius: 6px; } -.btn-sm { +.btn-sm, +.btn-group-sm > .btn { padding: 5px 10px; font-size: 12px; line-height: 1.5; border-radius: 3px; } -.btn-xs { +.btn-xs, +.btn-group-xs > .btn { padding: 1px 5px; font-size: 12px; line-height: 1.5; @@ -3196,24 +3199,6 @@ input[type="button"].btn-block { .btn-group.open .dropdown-toggle { outline: 0; } -.btn-group-xs > .btn { - padding: 1px 5px; - font-size: 12px; - line-height: 1.5; - border-radius: 3px; -} -.btn-group-sm > .btn { - padding: 5px 10px; - font-size: 12px; - line-height: 1.5; - border-radius: 3px; -} -.btn-group-lg > .btn { - padding: 10px 16px; - font-size: 18px; - line-height: 1.33; - border-radius: 6px; -} .btn-group > .btn + .dropdown-toggle { padding-right: 8px; padding-left: 8px; |
