Merge branch 'master' into dev

mdo · mdo · commit 5cae2220223e · 2011-10-04T00:57:37.000-07:00
diff --git a/bootstrap.css b/bootstrap.css
@@ -2344,6 +2344,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
@@ -989,6 +989,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
`@@ -2344,6 +2344,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {`
`2344`	`2344`	`-webkit-border-radius: 3px;`
`2345`	`2345`	`-moz-border-radius: 3px;`
`2346`	`2346`	`border-radius: 3px;`
	`2347`	`+ white-space: nowrap;`
`2347`	`2348`	`}`
`2348`	`2349`	`.label.important {`
`2349`	`2350`	`background-color: #c43c35;`