Merge master

2012-12-11 16:19:08 -06:00
parent 4183060c6f e3f7365ec6
commit 906744589d
50 changed files with 1290 additions and 408 deletions
--- a/assets/css/less/bootstrap/labels-badges.less
+++ b/assets/css/less/bootstrap/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,