diff options
| author | Jacob Thornton <[email protected]> | 2011-10-04 21:26:29 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2011-10-04 21:26:29 -0700 |
| commit | 100954eeda40a5003ed14b41a031b77575afb8cb (patch) | |
| tree | 75870530183a58d390983fac347864cd79bf8a6b | |
| parent | 607795e37a9cefd26ade772ceb8cb792602c6d8c (diff) | |
| download | bootstrap-100954eeda40a5003ed14b41a031b77575afb8cb.tar.xz bootstrap-100954eeda40a5003ed14b41a031b77575afb8cb.zip | |
remake
| -rw-r--r-- | bootstrap.css | 4 | ||||
| -rw-r--r-- | bootstrap.min.css | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bootstrap.css b/bootstrap.css index 1442e9e10..fc0edcdd9 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: Tue Oct 4 15:28:53 PDT 2011 + * Date: Tue Oct 4 21:26:21 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). @@ -2306,10 +2306,10 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { font-weight: bold; color: #ffffff; text-transform: uppercase; + white-space: nowrap; -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 index 8ab8cc366..b549f44e2 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -319,7 +319,7 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .popover .title{background-color:#f5f5f5;padding:9px 15px;line-height:1;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;border-bottom:1px solid #eee;} .popover .content{background-color:#ffffff;padding:14px;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.popover .content p,.popover .content ul,.popover .content ol{margin-bottom:0;} .fade{-webkit-transition:opacity 0.15s linear;-moz-transition:opacity 0.15s linear;-ms-transition:opacity 0.15s linear;-o-transition:opacity 0.15s linear;transition:opacity 0.15s linear;opacity:0;}.fade.in{opacity:1;} -.label{padding:1px 3px 2px;background-color:#bfbfbf;font-size:9.75px;font-weight:bold;color:#ffffff;text-transform:uppercase;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;white-space:nowrap;}.label.important{background-color:#c43c35;} +.label{padding:1px 3px 2px;background-color:#bfbfbf;font-size:9.75px;font-weight:bold;color:#ffffff;text-transform:uppercase;white-space:nowrap;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}.label.important{background-color:#c43c35;} .label.warning{background-color:#f89406;} .label.success{background-color:#46a546;} .label.notice{background-color:#62cffc;} |