Merge branch '2.0.2-wip-nowrapfix' of https://github.com/andriijas/bootstrap into andriijas-2.0.2-wip-nowrapfix

Conflicts:
	docs/assets/bootstrap.zip
This commit is contained in:
Mark Otto
2012-02-21 09:05:04 -08:00
4 changed files with 10 additions and 1 deletions

View File

@@ -6,6 +6,7 @@
padding: 2px 10px 3px;
font-size: @baseFontSize * .925;
font-weight: bold;
white-space: nowrap;
color: @white;
background-color: @grayLight;
.border-radius(10px);

View File

@@ -6,6 +6,7 @@
padding: 2px 4px 3px;
font-size: @baseFontSize * .85;
font-weight: bold;
white-space: nowrap;
color: @white;
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
background-color: @grayLight;