Skip to content

B
bootstrap
Commit c64c8636 authored by Mark Otto's avatar Mark Otto
Browse files
Options

Merge branch 'master' of github.com:twbs/bootstrap

parents af9c7151 5e26ad49
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
dist/css/bootstrap.css
View file @ c64c8636
...@@ -4825,7 +4825,8 @@ a.label:focus { ...@@ -4825,7 +4825,8 @@ a.label:focus {
position: relative; position: relative;
top: -1px; top: -1px;
} }
.btn-xs .badge { .btn-xs .badge,
.btn-group-xs > .btn .badge {
top: 0; top: 0;
padding: 1px 5px; padding: 1px 5px;
} }
......
dist/css/bootstrap.css.map
View file @ c64c8636
This diff was suppressed by a .gitattributes entry.
dist/css/bootstrap.min.css
View file @ c64c8636
This source diff could not be displayed because it is too large. You can view the blob instead.
less/badges.less
View file @ c64c8636
...@@ -29,7 +29,8 @@ ...@@ -29,7 +29,8 @@
top: -1px; top: -1px;
} }
.btn-xs & { .btn-xs &,
.btn-group-xs > .btn & {
top: 0; top: 0;
padding: 1px 5px; padding: 1px 5px;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment