aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2011-12-10 15:21:27 -0800
committerJacob Thornton <[email protected]>2011-12-10 15:21:27 -0800
commit2dd0db8aa3bfd286d9c416a93d0040f16567fcc8 (patch)
treeae651417615e77d609964c5cbd7539797986ed34
parenta0270dc7d2d1b7c9b4fd10ff8900d067b9521b08 (diff)
parent40604548ce91ffd2ccfcca782f4db5fc79d70417 (diff)
downloadbootstrap-2dd0db8aa3bfd286d9c416a93d0040f16567fcc8.tar.xz
bootstrap-2dd0db8aa3bfd286d9c416a93d0040f16567fcc8.zip
Merge pull request #773 from cgunther/label-in-dropdown-menu
Fix: remove text-shadow from labels
-rw-r--r--bootstrap.css3
-rw-r--r--bootstrap.min.css2
-rw-r--r--lib/patterns.less1
3 files changed, 4 insertions, 2 deletions
diff --git a/bootstrap.css b/bootstrap.css
index e5aa16608..1d6119ca5 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: Sun Nov 20 21:42:29 PST 2011
+ * Date: Wed Dec 7 20:14:59 EST 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).
@@ -2415,6 +2415,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
+ text-shadow: none;
}
.label.important {
background-color: #c43c35;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 39b2661d1..2e2996d80 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -345,7 +345,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;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;}.label.important{background-color:#c43c35;}
+.label{padding:1px 3px 2px;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;text-shadow:none;}.label.important{background-color:#c43c35;}
.label.warning{background-color:#f89406;}
.label.success{background-color:#46a546;}
.label.notice{background-color:#62cffc;}
diff --git a/lib/patterns.less b/lib/patterns.less
index 5b72081b2..b16748c69 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -1025,6 +1025,7 @@ input[type=submit].btn {
white-space: nowrap;
background-color: @grayLight;
.border-radius(3px);
+ text-shadow: none;
&.important { background-color: #c43c35; }
&.warning { background-color: @orange; }
&.success { background-color: @green; }