aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-11-03 13:18:23 -0700
committerMark Otto <[email protected]>2012-11-03 13:18:23 -0700
commitead5dbeba5cd7acfa560bfb353f5e7c4f4a19256 (patch)
treeba2ef9a550b0bdc43f58ec151a66b99f9e812c57
parentfc42ac6a56a5ce4ad58ff3d817a369cd57345d1b (diff)
downloadbootstrap-ead5dbeba5cd7acfa560bfb353f5e7c4f4a19256.tar.xz
bootstrap-ead5dbeba5cd7acfa560bfb353f5e7c4f4a19256.zip
Fixes #5775: Collapse labels/badges
* When :empty, display: none; * Add documentation for change in behavior
-rw-r--r--docs/assets/css/bootstrap.css5
-rw-r--r--docs/components.html3
-rw-r--r--docs/templates/pages/components.mustache3
-rw-r--r--less/labels-badges.less8
4 files changed, 19 insertions, 0 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 142df455a..83c9bec75 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -5427,6 +5427,11 @@ a.thumbnail:hover {
border-radius: 9px;
}
+.label:empty,
+.badge:empty {
+ display: none;
+}
+
a.label:hover,
a.badge:hover {
color: #ffffff;
diff --git a/docs/components.html b/docs/components.html
index 1874470f4..a99a96b9b 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -1859,6 +1859,9 @@
</tbody>
</table>
+ <h3>Easily collapsible</h3>
+ <p>For easy implementation, labels and badges will simply collapse (via CSS's <code>:empty</code> selector) when no content exists within.</p>
+
</section>
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 3c024451c..0a655d6de 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -1788,6 +1788,9 @@
</tbody>
</table>
+ <h3>{{_i}}Easily collapsible{{/i}}</h3>
+ <p>{{_i}}For easy implementation, labels and badges will simply collapse (via CSS's <code>:empty</code> selector) when no content exists within.{{/i}}</p>
+
</section>
diff --git a/less/labels-badges.less b/less/labels-badges.less
index d118a0190..9c3a40bfb 100644
--- a/less/labels-badges.less
+++ b/less/labels-badges.less
@@ -27,6 +27,14 @@
.border-radius(9px);
}
+// Empty labels/badges collapse
+.label,
+.badge {
+ &:empty {
+ display: none;
+ }
+}
+
// Hover state, but only for links
a {
&.label:hover,