mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-17 19:21:23 +03:00
Code Activity

Merge branch '2.2.2-wip' into exploratory

Browse Source 
Conflicts:
	docs/assets/css/bootstrap.css
	docs/scaffolding.html
	docs/templates/pages/scaffolding.mustache
This commit is contained in:
Mark Otto
2012-11-03 13:44:01 -07:00
parent 1477e081d4 5d6cf2ee19
commit a249d1c8ee
16 changed files with 164 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
less/labels-badges.less
+8
View File
@@ -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,