Merge pull request twbs#346 from alepee/master

Add a white-space: nowrap; for .label elements.
chrise86 · Oct 4, 2011 · 2edf16c · 2edf16c
2 parents b41175f + a61a624
commit 2edf16c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/bootstrap.css b/bootstrap.css
@@ -2309,6 +2309,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
   border-radius: 3px;
+  white-space: nowrap;
 }
 .label.important {
   background-color: #c43c35;

diff --git a/bootstrap.min.css b/bootstrap.min.css
diff --git a/lib/patterns.less b/lib/patterns.less
@@ -969,6 +969,7 @@ input[type=submit].btn {
   font-weight: bold;
   color: @white;
   text-transform: uppercase;
+  white-space: nowrap;
   .border-radius(3px);
   &.important { background-color: #c43c35; }
   &.warning   { background-color: @orange; }