diff options
| author | Mark Otto <[email protected]> | 2013-12-03 22:55:11 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-03 22:55:11 -0800 |
| commit | ed0d556847a7a1168a05a6a71f8f1af23139327b (patch) | |
| tree | 63f744980ebd7412b5e38ba3e860ffc6900602cd /dist/css/bootstrap.css | |
| parent | f8e0f166637e8e85cadf1538c809e738b781f436 (diff) | |
| parent | 4a45650026a16d372feb1f150899e883d410a35e (diff) | |
| download | bootstrap-ed0d556847a7a1168a05a6a71f8f1af23139327b.tar.xz bootstrap-ed0d556847a7a1168a05a6a71f8f1af23139327b.zip | |
Merge pull request #11697 from twbs/btn-xs-10979
fix .btn-group-xs portion of #10979
Diffstat (limited to 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 8cb15b71f..2c0a0b270 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2622,8 +2622,7 @@ fieldset[disabled] .btn-link:focus { border-radius: 6px; } -.btn-sm, -.btn-xs { +.btn-sm { padding: 5px 10px; font-size: 12px; line-height: 1.5; @@ -2632,6 +2631,9 @@ fieldset[disabled] .btn-link:focus { .btn-xs { padding: 1px 5px; + font-size: 12px; + line-height: 1.5; + border-radius: 3px; } .btn-block { @@ -3754,7 +3756,6 @@ input[type="button"].btn-block { } .btn-group-xs > .btn { - padding: 5px 10px; padding: 1px 5px; font-size: 12px; line-height: 1.5; |