1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-31 17:11:48 +02:00

Merge branch 'master' into v4

This commit is contained in:
Mark Otto
2015-06-18 23:56:43 -07:00
80 changed files with 2784 additions and 1569 deletions

View File

@@ -14,6 +14,7 @@
color: $badge-color;
line-height: $line-height-base;
text-align: center;
vertical-align: middle;
white-space: nowrap;
background-color: $badge-bg;
@include border-radius($badge-border-radius);