diff options
| author | Mark Otto <[email protected]> | 2013-11-30 16:37:49 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-11-30 16:37:49 -0800 |
| commit | ed98ac75600b08f391df2fc0bffe009c8892e556 (patch) | |
| tree | 78a1d34fadf8eda0a034a3df10ab5c97e1938add | |
| parent | 6bc09dd94949e05827c541795e4133b0cdbf7cae (diff) | |
| parent | 5283e518cccc87a5f3ac0f91748dfb1a9a3a23ae (diff) | |
| download | bootstrap-ed98ac75600b08f391df2fc0bffe009c8892e556.tar.xz bootstrap-ed98ac75600b08f391df2fc0bffe009c8892e556.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
| -rw-r--r-- | less/badges.less | 12 | ||||
| -rw-r--r-- | less/labels.less | 6 |
2 files changed, 12 insertions, 6 deletions
diff --git a/less/badges.less b/less/badges.less index 0b69753ef..166b2be5e 100644 --- a/less/badges.less +++ b/less/badges.less @@ -22,6 +22,12 @@ &:empty { display: none; } + + // Quick fix for badges in buttons + .btn & { + position: relative; + top: -1px; + } } // Hover state, but only for links @@ -34,12 +40,6 @@ a.badge { } } -// Quick fix for labels/badges in buttons -.btn .badge { - position: relative; - top: -1px; -} - // Account for counters in navs a.list-group-item.active > .badge, .nav-pills > .active > a > .badge { diff --git a/less/labels.less b/less/labels.less index cad5ce516..5db1ed12c 100644 --- a/less/labels.less +++ b/less/labels.less @@ -28,6 +28,12 @@ &:empty { display: none; } + + // Quick fix for labels in buttons + .btn & { + position: relative; + top: -1px; + } } // Colors |