diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index abd31f47a5..e3aa8d9753 100644 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.0.css @@ -1,12 +1,12 @@ -/*!========================================================= - * Bookstrap v0.0.1 - * +/* + * Master Stylesheet + * This file is only for importing all required stylesheets for LESS to include and then compile. + * * Copyright 2011 Twitter, Inc - * Open-sourced under Apache License v2.0 - * http://www.apache.org/licenses/LICENSE-2.0 + * Open-sourced under Apache License v2.0: http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built @twitter by @mdo and @fat, like bosses. - * ========================================================== */ + */ /* 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 @@ -421,7 +421,7 @@ h3, h4, h5, h6 { - font-weight: 500; + font-weight: bold; color: #404040; } h1 small, @@ -1552,3 +1552,34 @@ div.modal .modal-footer .btn { float: right; margin-left: 10px; } +div.quickstart { + background-color: #f5f5f5; + background-repeat: repeat-x; + background-image: -khtml-gradient(linear, left top, left bottom, from(#f9f9f9), to(#f5f5f5)); + /* Konqueror */ + + background-image: -moz-linear-gradient(#f9f9f9, #f5f5f5); + /* FF 3.6+ */ + + background-image: -ms-linear-gradient(#f9f9f9, #f5f5f5); + /* IE10 */ + + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f9f9f9), color-stop(100%, #f5f5f5)); + /* Safari 4+, Chrome 2+ */ + + background-image: -webkit-linear-gradient(#f9f9f9, #f5f5f5); + /* Safari 5.1+, Chrome 10+ */ + + background-image: -o-linear-gradient(#f9f9f9, #f5f5f5); + /* Opera 11.10 */ + + -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#f5f5f5', GradientType=0)"; + /* IE8+ */ + + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#f5f5f5', GradientType=0); + /* IE6 & IE7 */ + + background-image: linear-gradient(#f9f9f9, #f5f5f5); + /* the standard */ + +} diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css index 9e1533fe66..e1516f500b 100644 --- a/bootstrap-1.0.0.min.css +++ b/bootstrap-1.0.0.min.css @@ -39,7 +39,7 @@ a{color:#0069d6;text-decoration:none;line-height:inherit;}a:hover{color:#0050a3; .btn:active{-webkit-box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);} button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;border:0;} p{font-size:13px;font-weight:normal;line-height:18px;margin-bottom:18px;}p small{font-size:12px;color:#bfbfbf;} -h1,h2,h3,h4,h5,h6{font-weight:500;color:#404040;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{color:#bfbfbf;} +h1,h2,h3,h4,h5,h6{font-weight:bold;color:#404040;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{color:#bfbfbf;} h1{margin-bottom:18px;font-size:30px;line-height:36px;}h1 small{font-size:18px;} h2{font-size:24px;line-height:36px;}h2 small{font-size:14px;} h3,h4,h5,h6{line-height:36px;} @@ -184,3 +184,4 @@ div.modal{position:fixed;top:50%;left:50%;z-index:2000;width:560px;margin:-280px div.modal .modal-body{padding:20px;} div.modal .modal-footer{background-color:#eee;padding:14px 20px 15px;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;zoom:1;}div.modal .modal-footer:after{display:block;visibility:hidden;height:0;clear:both;content:".";} div.modal .modal-footer .btn{float:right;margin-left:10px;} +div.quickstart{background-color:#f5f5f5;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#f9f9f9), to(#f5f5f5));background-image:-moz-linear-gradient(#f9f9f9, #f5f5f5);background-image:-ms-linear-gradient(#f9f9f9, #f5f5f5);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #f9f9f9), color-stop(100%, #f5f5f5));background-image:-webkit-linear-gradient(#f9f9f9, #f5f5f5);background-image:-o-linear-gradient(#f9f9f9, #f5f5f5);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#f5f5f5', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#f5f5f5', GradientType=0);background-image:linear-gradient(#f9f9f9, #f5f5f5);} diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 67dcd4d0c7..a28b5601bd 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -27,7 +27,7 @@ section { } #masthead div.inner, #footer div.inner { background: transparent url(../img/grid-18px.png) top center; - padding: 54px 0; + padding: 45px 0 54px; -webkit-box-shadow: inset 0 10px 30px rgba(0, 0, 0, 0.25); -moz-box-shadow: inset 0 10px 30px rgba(0, 0, 0, 0.25); box-shadow: inset 0 10px 30px rgba(0, 0, 0, 0.25); @@ -45,7 +45,6 @@ section { } #masthead { margin-top: 40px; - margin-bottom: -40px; } #masthead h1 { font-size: 54px; @@ -94,17 +93,26 @@ section { } div.quickstart { + background-color: rgba(0,0,0,.03); + margin-bottom: -36px; + border-top: 1px solid #fff; + border-bottom: 1px solid #eee; +} +div.quickstart div.row { + margin: 0 -20px; /* background-color: rgba(0,0,0,.1); */ - margin-top: 36px; } div.quickstart div.columns { /* background-color: rgba(0,0,0,.1); */ - width: 280px; + width: 285px; height: 100px; - padding: 9px 10px; + margin-left: 0; + padding: 17px 20px 26px; + border-left: 1px solid #eee; } div.quickstart div.columns:last-child { - border-right: none; + border-right: 1px solid #eee; + width: 286px; /* padding-right: 20px; */ } div.quickstart h6, @@ -112,16 +120,27 @@ div.quickstart p { line-height: 18px; text-align: center; margin-bottom: 9px; + color: #333; } div.quickstart h6 { - color: #fff; + color: #999; } div.quickstart form textarea { + display: block; + width: 275px; + height: 21px; + margin: 0 0 9px; line-height: 21px; + white-space: nowrap; + overflow: hidden; + border-color: #ddd; + -webkit-box-shadow: inset 0 1px 3px rgba(0,0,0,.1); + -moz-box-shadow: inset 0 1px 3px rgba(0,0,0,.1); + box-shadow: inset 0 1px 3px rgba(0,0,0,.1); +/* border: 0; display: block; width: 270px; - height: 21px; margin: 0 0 9px; padding: 3px 5px; background-color: rgba(0,0,0,.3); @@ -129,11 +148,13 @@ div.quickstart form textarea { -moz-box-shadow: inset 0 1px 3px rgba(0,0,0,.2), 0 1px 0 rgba(255,255,255,.15); box-shadow: inset 0 1px 3px rgba(0,0,0,.2), 0 1px 0 rgba(255,255,255,.15); color: #fff; - color: rgba(255,255,255,.5); + color: rgba(255,255,255,.65); text-overflow: ellipsis; overflow: hidden; white-space: nowrap; +*/ } +/* div.quickstart form textarea:focus { background-color: #fff; color: #333; @@ -141,6 +162,7 @@ div.quickstart form textarea:focus { -moz-box-shadow: 0 0 5px rgba(255,255,255,.25); box-shadow: 0 0 5px rgba(255,255,255,.25); } +*/ /* div.quick-start { diff --git a/docs/index.html b/docs/index.html index 29798169e9..63cf6c2c7d 100644 --- a/docs/index.html +++ b/docs/index.html @@ -59,34 +59,37 @@ --> - -
-
-
Hotlink the CSS
-

For the quickest and easiest start, just copy this snippet into your webpage.

-
- -
-
-
-
Use it with LESS
-

A fan of using LESS.js? No problem, just clone the repo and add these lines:

-
- -
-
-
-
Fork on GitHub
-

Download, fork, pull, and more with the official Bootstrap repo on Github.

-

Bootstrap on GitHub »

-
-
- +
+
+
+
+
Hotlink the CSS
+

For the quickest and easiest start, just copy this snippet into your webpage.

+
+ +
+
+
+
Use it with LESS
+

A fan of using LESS.js? No problem, just clone the repo and add these lines:

+
+ +
+
+
+
Fork on GitHub
+

Download, fork, pull, and more with the official Bootstrap repo on Github.

+

Bootstrap on GitHub »

+
+
+
+
+
diff --git a/lib/bootstrap.less b/lib/bootstrap.less index 7aef916e09..ddfb046a96 100644 --- a/lib/bootstrap.less +++ b/lib/bootstrap.less @@ -1,12 +1,13 @@ -/*!========================================================= - * Bookstrap v0.0.1 - * +/* + * Master Stylesheet + * This file is only for importing all required stylesheets for LESS to include and then compile. + * * Copyright 2011 Twitter, Inc - * Open-sourced under Apache License v2.0 - * http://www.apache.org/licenses/LICENSE-2.0 + * Open-sourced under Apache License v2.0: http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built @twitter by @mdo and @fat, like bosses. - * ========================================================== */ + */ + // CSS Reset @import "reset.less"; @@ -19,4 +20,9 @@ @import "type.less"; @import "forms.less"; @import "tables.less"; -@import "patterns.less"; \ No newline at end of file +@import "patterns.less"; + + +div.quickstart { + #gradient > .vertical(#f9f9f9,#f5f5f5); +} \ No newline at end of file