diff options
| author | Mark Otto <[email protected]> | 2011-10-04 00:58:12 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-10-04 00:58:12 -0700 |
| commit | 088a9efa4c8cc2a352c786c7db4bf7f13a700f86 (patch) | |
| tree | 7f123bf95633679d61fc69a6ba5a61cd2ce30184 /bootstrap.css | |
| parent | 5cae2220223e2dec689b452398ce4cc27e62fd26 (diff) | |
| download | bootstrap-088a9efa4c8cc2a352c786c7db4bf7f13a700f86.tar.xz bootstrap-088a9efa4c8cc2a352c786c7db4bf7f13a700f86.zip | |
merging master which has the label fix
Diffstat (limited to 'bootstrap.css')
| -rw-r--r-- | bootstrap.css | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bootstrap.css b/bootstrap.css index 001debb8e..22139c29c 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Mon Oct 3 23:49:59 PDT 2011 + * Date: Tue Oct 4 00:58:05 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -2336,15 +2336,15 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { } .label { padding: 1px 3px 2px; - background-color: #bfbfbf; font-size: 9.75px; font-weight: bold; color: #ffffff; text-transform: uppercase; + white-space: nowrap; + background-color: #bfbfbf; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; - white-space: nowrap; } .label.important { background-color: #c43c35; |