diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index 8e70ac8e3f..b2b8282a7e 100644 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.0.css @@ -334,11 +334,11 @@ a:hover { } .btn { display: inline-block; - background-color: #dcdcdc; + background-color: #e6e6e6; background-repeat: no-repeat; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), color-stop(0.25, #f5f5f5), to(#dcdcdc)); - background-image: -webkit-linear-gradient(#f5f5f5, color-stop(0.25, #f5f5f5), #dcdcdc); - background-image: -moz-linear-gradient(#f5f5f5, color-stop(#f5f5f5, 0.25), #dcdcdc); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff), to(#e6e6e6)); + background-image: -webkit-linear-gradient(#ffffff, color-stop(0.25, #ffffff), #e6e6e6); + background-image: -moz-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6); padding: 4px 14px; text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); color: #333333; @@ -349,9 +349,9 @@ a:hover { -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.1); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.1); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.1); + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); } .btn:hover { background-position: 0 -15px; diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css index e6a0f10a73..586330c815 100644 --- a/bootstrap-1.0.0.min.css +++ b/bootstrap-1.0.0.min.css @@ -31,7 +31,7 @@ div.container-fluid{padding:20px;zoom:1;}div.container-fluid:after{display:block div.container-fluid div.sidebar{float:left;width:220px;} div.container-fluid div.content{min-width:700px;max-width:1180px;margin-left:240px;} a{color:#0069d6;text-decoration:none;line-height:inherit;}a:hover{color:#0050a3;text-decoration:underline;} -.btn{display:inline-block;background-color:#dcdcdc;background-repeat:no-repeat;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), color-stop(0.25, #f5f5f5), to(#dcdcdc));background-image:-webkit-linear-gradient(#f5f5f5, color-stop(0.25, #f5f5f5), #dcdcdc);background-image:-moz-linear-gradient(#f5f5f5, color-stop(#f5f5f5, 0.25), #dcdcdc);padding:4px 14px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333333;font-size:13px;line-height:18px;border:1px solid rgba(0, 0, 0, 0.1);border-bottom-color:rgba(0, 0, 0, 0.25);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.1);}.btn:hover{background-position:0 -15px;color:#333333;text-decoration:none;} +.btn{display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, color-stop(0.25, #ffffff), #e6e6e6);background-image:-moz-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);padding:4px 14px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333333;font-size:13px;line-height:18px;border:1px solid rgba(0, 0, 0, 0.1);border-bottom-color:rgba(0, 0, 0, 0.25);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);}.btn:hover{background-position:0 -15px;color:#333333;text-decoration:none;} .btn.primary{background-color:#0069d6;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#08b5fb), to(#0069d6));background-image:-moz-linear-gradient(#08b5fb, #0069d6);background-image:-ms-linear-gradient(#08b5fb, #0069d6);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #08b5fb), color-stop(100%, #0069d6));background-image:-webkit-linear-gradient(#08b5fb, #0069d6);background-image:-o-linear-gradient(#08b5fb, #0069d6);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#08b5fb', endColorstr='#0069d6', GradientType=0);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#08b5fb', endColorstr='#0069d6', GradientType=0)";background-image:linear-gradient(#08b5fb, #0069d6);color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}.btn.primary:hover{color:#fff;} .btn.large{font-size:16px;line-height:30px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} .btn.small{padding-right:9px;padding-left:9px;font-size:11px;} diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 6f96d166e4..76473c9522 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -90,6 +90,11 @@ section { } #footer p { margin-bottom: 0; + color: rgba(255,255,255,.8) +} +#footer p a { + color: #fff; + font-weight: bold; } /* Special grid styles -------------------------------------------------- */ diff --git a/docs/index.html b/docs/index.html index d82d56b822..2ff2ac0aea 100644 --- a/docs/index.html +++ b/docs/index.html @@ -1187,14 +1187,14 @@

Modals—dialogs or lightboxes—are great for contextual actions in situations where it's important that the background context be maintained.

-
+

Add new Tweet

×
-

One fine body..

+

One fine body...

Primary @@ -1212,10 +1212,13 @@ - \ No newline at end of file + diff --git a/lib/bootstrap.less b/lib/bootstrap.less index 2e021db0b1..15154fcac6 100644 --- a/lib/bootstrap.less +++ b/lib/bootstrap.less @@ -4,7 +4,6 @@ */ - // CSS Reset @import "reset.less"; diff --git a/lib/preboot.less b/lib/preboot.less index 4d6f9c22da..f98fe9b3c6 100644 --- a/lib/preboot.less +++ b/lib/preboot.less @@ -180,7 +180,7 @@ } // Buttons -.button(@color: #f5f5f5, @padding: 4px 14px, @textColor: #333, @textShadow: 0 1px 1px rgba(255,255,255,.75), @fontSize: 13px, @borderColor: rgba(0,0,0,.1), @borderRadius: 4px) { +.button(@color: #fff, @padding: 4px 14px, @textColor: #333, @textShadow: 0 1px 1px rgba(255,255,255,.75), @fontSize: 13px, @borderColor: rgba(0,0,0,.1), @borderRadius: 4px) { display: inline-block; #gradient > .vertical-three-colors(@color, @color, 0.25, darken(@color, 10%)); padding: @padding; @@ -191,7 +191,7 @@ border: 1px solid @borderColor; border-bottom-color: fadein(@borderColor, 15%); .border-radius(@borderRadius); - @shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.1); + @shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); .box-shadow(@shadow); &:hover { background-position: 0 -15px;