Skip to content

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

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

parents 6bc09dd9 5283e518
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 6 deletions
less/badges.less
View file @ ed98ac75
...@@ -22,6 +22,12 @@ ...@@ -22,6 +22,12 @@
&:empty { &:empty {
display: none; display: none;
} }
// Quick fix for badges in buttons
.btn & {
position: relative;
top: -1px;
}
} }
// Hover state, but only for links // Hover state, but only for links
...@@ -34,12 +40,6 @@ a.badge { ...@@ -34,12 +40,6 @@ a.badge {
} }
} }
// Quick fix for labels/badges in buttons
.btn .badge {
position: relative;
top: -1px;
}
// Account for counters in navs // Account for counters in navs
a.list-group-item.active > .badge, a.list-group-item.active > .badge,
.nav-pills > .active > a > .badge { .nav-pills > .active > a > .badge {
......
less/labels.less
View file @ ed98ac75
...@@ -28,6 +28,12 @@ ...@@ -28,6 +28,12 @@
&:empty { &:empty {
display: none; display: none;
} }
// Quick fix for labels in buttons
.btn & {
position: relative;
top: -1px;
}
} }
// Colors // Colors
......
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