aboutsummaryrefslogtreecommitdiff
path: root/less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-01-19 18:53:41 -0800
committerMark Otto <[email protected]>2013-01-19 18:53:41 -0800
commitd30f47efb2580b0f435128940b48d5e5d30ca529 (patch)
treee49324a9d4e5f95acfe2010161f78946b85e8a22 /less
parentc21c3f101b334fb176b5fc4efd437b7da724e1fc (diff)
downloadbootstrap-d30f47efb2580b0f435128940b48d5e5d30ca529.tar.xz
bootstrap-d30f47efb2580b0f435128940b48d5e5d30ca529.zip
Tighten up badges docs; less bottom margin on h3
Diffstat (limited to 'less')
-rw-r--r--less/counters.less23
-rw-r--r--less/type.less4
2 files changed, 18 insertions, 9 deletions
diff --git a/less/counters.less b/less/counters.less
index 6f9cc00fc..fc45fa2a6 100644
--- a/less/counters.less
+++ b/less/counters.less
@@ -6,18 +6,17 @@
// Base classes
.counter {
display: inline-block;
- padding: 2px 7px;
- font-size: @font-size-base * .846;
+ min-width: 10px;
+ padding: 3px 7px;
+ font-size: 12px;
font-weight: bold;
- line-height: 14px; // ensure proper line-height if floated
color: #fff;
- vertical-align: baseline;
+ line-height: 1;
+ vertical-align: middle;
white-space: nowrap;
- text-shadow: 0 -1px 0 rgba(0,0,0,.25);
+ text-align: center;
background-color: @grayLight;
border-radius: 10px;
- min-width: 10px;
- text-align: center;
// Empty labels/badges collapse
&:empty {
@@ -46,3 +45,13 @@ a.counter {
top: 0;
}
}
+
+// Account for counters in navs
+.nav-list > .active > a > .counter,
+.nav-pills > .active > a > .counter {
+ color: @link-color;
+ background-color: #fff;
+}
+.nav-pills > li > a > .counter {
+ margin-left: 3px;
+}
diff --git a/less/type.less b/less/type.less
index 563cee42e..29062be48 100644
--- a/less/type.less
+++ b/less/type.less
@@ -65,12 +65,12 @@ h1, h2, h3, h4, h5, h6 {
}
h1,
-h2,
-h3 {
+h2 {
margin-top: @line-height-base;
margin-bottom: @line-height-base / 2;
line-height: @line-height-base * 2;
}
+h3,
h4,
h5,
h6 {