diff options
| author | Mark Otto <[email protected]> | 2013-12-03 22:58:25 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-03 22:58:25 -0800 |
| commit | a42e9163cbf6dcdd72a004a4a7c2b787478e18b0 (patch) | |
| tree | 6ba50185884ca0a425d7185ac63949102d96002e /dist/css/bootstrap.css | |
| parent | 303f8a33c354b5c8f6132574de55114b8f39a1f1 (diff) | |
| parent | ed0d556847a7a1168a05a6a71f8f1af23139327b (diff) | |
| download | bootstrap-a42e9163cbf6dcdd72a004a4a7c2b787478e18b0.tar.xz bootstrap-a42e9163cbf6dcdd72a004a4a7c2b787478e18b0.zip | |
Merge branch 'master' into responsive-visibility-table
Conflicts:
dist/css/bootstrap.min.css
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 bf363169e..340cb81e2 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; |