diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index d47090383..579553057 100644 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.0.css @@ -1,9 +1,9 @@ /* - * Master Stylesheet - * This file is only for importing all required stylesheets for LESS to include and then compile. + * Bootstrap v1.0.0 * * Copyright 2011 Twitter, Inc - * Open-sourced under Apache License v2.0: http://www.apache.org/licenses/LICENSE-2.0 + * Licensed under the Apache License v2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built @twitter by @mdo and @fat, like bosses. */ diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 92f9d9560..a17d0d122 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -17,20 +17,20 @@ section { #masthead, #footer { background-color: #049cd9; background-repeat: no-repeat; - background-image: -webkit-gradient(linear, left top, left bottom, from(#0056b0), to(#049cd9)); - background-image: -webkit-linear-gradient(#0056b0, #049cd9); - background-image: -moz-linear-gradient(#0056b0, #049cd9); - background-image: -o-linear-gradient(top, #0056b0, #049cd9); - background-image: -khtml-gradient(linear, left top, left bottom, from(#0056b0), to(#049cd9)); - filter: progid:DXImageTransform.Microsoft.Gradient(StartColorStr='#0056b0', EndColorStr='#049cd9', GradientType=0); - -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#0056b0', EndColorStr='#049cd9', GradientType=0))"; + background-image: -webkit-gradient(linear, left top, left bottom, from(#004D9F), to(#049cd9)); + background-image: -webkit-linear-gradient(#004D9F, #049cd9); + background-image: -moz-linear-gradient(#004D9F, #049cd9); + background-image: -o-linear-gradient(top, #004D9F, #049cd9); + background-image: -khtml-gradient(linear, left top, left bottom, from(#004D9F), to(#049cd9)); + filter: progid:DXImageTransform.Microsoft.Gradient(StartColorStr='#004D9F', EndColorStr='#049cd9', GradientType=0); + -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#004D9F', EndColorStr='#049cd9', GradientType=0))"; } #masthead div.inner, #footer div.inner { background: transparent url(../img/grid-18px.png) top center; padding: 45px 0; - -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); + -webkit-box-shadow: inset 0 10px 30px rgba(0, 0, 0, 0.3); + -moz-box-shadow: inset 0 10px 30px rgba(0, 0, 0, 0.3); + box-shadow: inset 0 10px 30px rgba(0, 0, 0, 0.3); } #masthead h1, #footer h1, @@ -131,6 +131,9 @@ div.quickstart form textarea { margin-bottom: 0; color: rgba(255,255,255,.8) } +#footer p.right { + float: right; +} /* Special grid styles -------------------------------------------------- */ .show-grid { diff --git a/docs/index.html b/docs/index.html index 465e53ef2..862bd597f 100644 --- a/docs/index.html +++ b/docs/index.html @@ -1111,7 +1111,8 @@
-

Preboot is a super awesome pack of mixins and variables to be used in conjunction with LESS, a CSS preprocessor for faster and easier web development, that we used to build Bootstrap.

+

Bootstrap was built with Preboot, an open-source pack of mixins and variables to be used in conjunction with LESS, a CSS preprocessor for faster and easier web development.

+

Check out how we used Preboot in Bootstrap and how you can make use of it should you choose to run LESS on your next project.

How to use it

@@ -1200,22 +1201,22 @@ background-image: -webkit-gradient(linear, left top, right top, color-stop(0%, @startColor), color-stop(100%, @endColor)); // Safari 4+, Chrome 2+ background-image: -webkit-linear-gradient(left, @startColor, @endColor); // Safari 5.1+, Chrome 10+ background-image: -o-linear-gradient(left, @startColor, @endColor); // Opera 11.10 - filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",@startColor,@endColor)); /* IE6 & IE7 */ - -ms-filter: %("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",@startColor,@endColor); /* IE8+ */ + -ms-filter: %("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",@startColor,@endColor); // IE8+ + filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",@startColor,@endColor)); // IE6 & IE7 background-image: linear-gradient(left, @startColor, @endColor); // Le standard } .vertical (@startColor: #555, @endColor: #333) { background-color: @endColor; background-repeat: repeat-x; - background-image: -khtml-gradient(linear, left top, left bottom, from(@startColor), to(@endColor)); /* Konqueror */ - background-image: -moz-linear-gradient(@startColor, @endColor); /* FF 3.6+ */ - background-image: -ms-linear-gradient(@startColor, @endColor); /* IE10 */ - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, @startColor), color-stop(100%, @endColor)); /* Safari 4+, Chrome 2+ */ - background-image: -webkit-linear-gradient(@startColor, @endColor); /* Safari 5.1+, Chrome 10+ */ - background-image: -o-linear-gradient(@startColor, @endColor); /* Opera 11.10 */ - filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor)); /* IE6 & IE7 */ - -ms-filter: %("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor); /* IE8+ */ - background-image: linear-gradient(@startColor, @endColor); /* the standard */ + background-image: -khtml-gradient(linear, left top, left bottom, from(@startColor), to(@endColor)); // Konqueror + background-image: -moz-linear-gradient(@startColor, @endColor); // FF 3.6+ + background-image: -ms-linear-gradient(@startColor, @endColor); // IE10 + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, @startColor), color-stop(100%, @endColor)); // Safari 4+, Chrome 2+ + background-image: -webkit-linear-gradient(@startColor, @endColor); // Safari 5.1+, Chrome 10+ + background-image: -o-linear-gradient(@startColor, @endColor); // Opera 11.10 + -ms-filter: %("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor); // IE8+ + filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor)); // IE6 & IE7 + background-image: linear-gradient(@startColor, @endColor); // The standard } .directional (@startColor: #555, @endColor: #333, @deg: 45deg) { ... @@ -1227,7 +1228,7 @@

Operations and grid system

-

Get fancy and perform some match to generate flexible and powerful mixins like the one below.

+

Get fancy and perform some math to generate flexible and powerful mixins like the one below.

 // Griditude
 @gridColumns:       16;
@@ -1263,6 +1264,7 @@