diff options
| author | Mark Otto <[email protected]> | 2015-01-21 19:20:59 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-01-21 19:20:59 -0800 |
| commit | c64c8636376af76acd01f132203af162fafb39bc (patch) | |
| tree | d42036ec848b3d8337859981b32a5c987ea2477c /dist/css/bootstrap.css | |
| parent | af9c7151b3d1c1d30287e5bf528c2059de3d385e (diff) | |
| parent | 5e26ad4921fe684623d0dabe5f2117ff9b07261a (diff) | |
| download | bootstrap-c64c8636376af76acd01f132203af162fafb39bc.tar.xz bootstrap-c64c8636376af76acd01f132203af162fafb39bc.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
Diffstat (limited to 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 5b2a5798b..ccfd81615 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -4825,7 +4825,8 @@ a.label:focus { position: relative; top: -1px; } -.btn-xs .badge { +.btn-xs .badge, +.btn-group-xs > .btn .badge { top: 0; padding: 1px 5px; } |