Merge pull request twbs#346 from alepee/master

mdo · mdo · commit 2edf16c034f6 · 2011-10-03T21:32:26.000-07:00
Add a white-space: nowrap; for .label elements.
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; }

Original file line number	Diff line number	Diff line change
`@@ -2309,6 +2309,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {`
`2309`	`2309`	`-webkit-border-radius: 3px;`
`2310`	`2310`	`-moz-border-radius: 3px;`
`2311`	`2311`	`border-radius: 3px;`
	`2312`	`+ white-space: nowrap;`
`2312`	`2313`	`}`
`2313`	`2314`	`.label.important {`
`2314`	`2315`	`background-color: #c43c35;`