From fe8cb55cc16fb0995428b7055c6f31c6a50f6ed5 Mon Sep 17 00:00:00 2001 From: yury Date: Sat, 3 Sep 2011 20:10:42 +0400 Subject: [PATCH 1/6] use @VERSION var in build script --- Makefile | 7 ++++--- lib/bootstrap.less | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 82603c41f629..b9bd7aeb435a 100644 --- a/Makefile +++ b/Makefile @@ -1,13 +1,14 @@ +VERSION=1.2.0 DATE=$(shell DATE) -BOOTSTRAP = ./bootstrap-1.2.0.css -BOOTSTRAP_MIN = ./bootstrap-1.2.0.min.css +BOOTSTRAP = ./bootstrap-${VERSION}.css +BOOTSTRAP_MIN = ./bootstrap-${VERSION}.min.css BOOTSTRAP_LESS = ./lib/bootstrap.less LESS_COMPESSOR ?= `which lessc` WATCHR ?= `which watchr` build: @@if test ! -z ${LESS_COMPESSOR}; then \ - sed 's/@DATE/'"${DATE}"'/' ${BOOTSTRAP_LESS} >${BOOTSTRAP_LESS}.tmp; \ + sed -e 's/@VERSION/'"v${VERSION}"'/' -e 's/@DATE/'"${DATE}"'/' <${BOOTSTRAP_LESS} >${BOOTSTRAP_LESS}.tmp; \ lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP}; \ lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP_MIN} --compress; \ rm -f ${BOOTSTRAP_LESS}.tmp; \ diff --git a/lib/bootstrap.less b/lib/bootstrap.less index c31bd725da33..a46a6a760539 100644 --- a/lib/bootstrap.less +++ b/lib/bootstrap.less @@ -1,5 +1,5 @@ /*! - * Bootstrap v1.2.0 + * Bootstrap @VERSION * * Copyright 2011 Twitter, Inc * Licensed under the Apache License v2.0 From a40690a17c1a72fe2364518a62962d6bb5616373 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 9 Sep 2011 20:48:45 -0700 Subject: [PATCH 2/6] fix the grid before 1.3.0 drops soon --- bootstrap-1.2.0.css | 4 ++-- bootstrap-1.2.0.min.css | 2 +- lib/scaffolding.less | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bootstrap-1.2.0.css b/bootstrap-1.2.0.css index b7fe65e78356..b0ecc5743915 100644 --- a/bootstrap-1.2.0.css +++ b/bootstrap-1.2.0.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: Fri Sep 2 15:07:03 PDT 2011 + * Date: Fri Sep 9 20:48:32 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). @@ -279,7 +279,7 @@ textarea { .row:after { clear: both; } -.row [class^="span"] { +.row [class*="span"] { display: inline; float: left; margin-left: 20px; diff --git a/bootstrap-1.2.0.min.css b/bootstrap-1.2.0.min.css index 95b54405bbab..f423a5a95d2a 100644 --- a/bootstrap-1.2.0.min.css +++ b/bootstrap-1.2.0.min.css @@ -30,7 +30,7 @@ textarea{overflow:auto;vertical-align:top;} .btn.info,.alert-message.info{background-color:#339bb9;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9));background-image:-moz-linear-gradient(top, #5bc0de, #339bb9);background-image:-ms-linear-gradient(top, #5bc0de, #339bb9);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #5bc0de), color-stop(100%, #339bb9));background-image:-webkit-linear-gradient(top, #5bc0de, #339bb9);background-image:-o-linear-gradient(top, #5bc0de, #339bb9);background-image:linear-gradient(top, #5bc0de, #339bb9);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#339bb9 #339bb9 #22697d;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} .row{zoom:1;margin-bottom:18px;margin-left:-20px;}.row:before,.row:after{display:table;content:"";} .row:after{clear:both;} -.row [class^="span"]{display:inline;float:left;margin-left:20px;} +.row [class*="span"]{display:inline;float:left;margin-left:20px;} .row .span1{width:40px;} .row .span2{width:100px;} .row .span3{width:160px;} diff --git a/lib/scaffolding.less b/lib/scaffolding.less index 615e6be78d2c..c07686ab3bee 100644 --- a/lib/scaffolding.less +++ b/lib/scaffolding.less @@ -13,7 +13,7 @@ // Find all .span# classes within .row and give them the necessary properties for grid columns (supported by all browsers back to IE7) // Credit to @dhg for the idea - [class^="span"] { + [class*="span"] { display: inline; float: left; margin-left: @gridGutterWidth; From 86bb0733a25e55b0ad940465bf0c90253b9e58d5 Mon Sep 17 00:00:00 2001 From: Sam Soffes Date: Sun, 11 Sep 2011 21:56:54 -0700 Subject: [PATCH 3/6] Add pretty code coloring to readme --- README.md | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index eaa6ca98334a..04b60c384175 100644 --- a/README.md +++ b/README.md @@ -13,12 +13,16 @@ You can use Twitter Bootstrap in one of two ways: just drop the compiled CSS int Here's what the LESS version looks like: - - +``` html + + +``` Or if you prefer, the standard css way: - +``` html + +``` For more info, refer to the docs! @@ -102,4 +106,4 @@ Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and -limitations under the License. \ No newline at end of file +limitations under the License. From b729ade54f511867be0173e402a95c0799317ca3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 12 Sep 2011 09:25:57 -0700 Subject: [PATCH 4/6] quick fix for .clearfix with unqualified selector in forms.less --- bootstrap-1.2.0.css | 9 ++------- bootstrap-1.2.0.min.css | 12 ++++++------ lib/forms.less | 2 +- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/bootstrap-1.2.0.css b/bootstrap-1.2.0.css index b0ecc5743915..f828b2f3cc0f 100644 --- a/bootstrap-1.2.0.css +++ b/bootstrap-1.2.0.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: Fri Sep 9 20:48:32 PDT 2011 + * Date: Mon Sep 12 09:25:40 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). @@ -188,7 +188,6 @@ textarea { width: 940px; margin: 0 auto; zoom: 1; - margin-bottom: 18px; } .container:before, .container:after { display: table; @@ -269,7 +268,6 @@ textarea { * ------------------------------------------------------------------------------------------- */ .row { zoom: 1; - margin-bottom: 18px; margin-left: -20px; } .row:before, .row:after { @@ -398,7 +396,6 @@ body { .container-fluid { padding: 0 20px; zoom: 1; - margin-bottom: 18px; } .container-fluid:before, .container-fluid:after { display: table; @@ -628,7 +625,7 @@ fieldset legend { color: #404040; } -.clearfix { +form .clearfix { margin-bottom: 18px; } label, @@ -1414,7 +1411,6 @@ a.menu:after, .dropdown-toggle:after { padding: 0; list-style: none; zoom: 1; - margin-bottom: 18px; } .tabs:before, .pills:before, @@ -1836,7 +1832,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -moz-box-shadow: inset 0 1px 0 #ffffff; box-shadow: inset 0 1px 0 #ffffff; zoom: 1; - margin-bottom: 18px; margin-bottom: 0; } .modal-footer:before, .modal-footer:after { diff --git a/bootstrap-1.2.0.min.css b/bootstrap-1.2.0.min.css index f423a5a95d2a..cbecfe32e775 100644 --- a/bootstrap-1.2.0.min.css +++ b/bootstrap-1.2.0.min.css @@ -22,13 +22,13 @@ textarea{overflow:auto;vertical-align:top;} .clearfix{zoom:1;}.clearfix:before,.clearfix:after{display:table;content:"";} .clearfix:after{clear:both;} .center-block{display:block;margin:0 auto;} -.container{width:940px;margin:0 auto;zoom:1;margin-bottom:18px;}.container:before,.container:after{display:table;content:"";} +.container{width:940px;margin:0 auto;zoom:1;}.container:before,.container:after{display:table;content:"";} .container:after{clear:both;} .btn.danger,.alert-message.danger,.btn.danger:hover,.alert-message.danger:hover,.btn.error,.alert-message.error,.btn.error:hover,.alert-message.error:hover,.btn.success,.alert-message.success,.btn.success:hover,.alert-message.success:hover,.btn.info,.alert-message.info,.btn.info:hover,.alert-message.info:hover{color:#ffffff;} .btn.danger,.alert-message.danger,.btn.error,.alert-message.error{background-color:#c43c35;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35));background-image:-moz-linear-gradient(top, #ee5f5b, #c43c35);background-image:-ms-linear-gradient(top, #ee5f5b, #c43c35);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ee5f5b), color-stop(100%, #c43c35));background-image:-webkit-linear-gradient(top, #ee5f5b, #c43c35);background-image:-o-linear-gradient(top, #ee5f5b, #c43c35);background-image:linear-gradient(top, #ee5f5b, #c43c35);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#c43c35 #c43c35 #882a25;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} .btn.success,.alert-message.success{background-color:#57a957;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957));background-image:-moz-linear-gradient(top, #62c462, #57a957);background-image:-ms-linear-gradient(top, #62c462, #57a957);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957));background-image:-webkit-linear-gradient(top, #62c462, #57a957);background-image:-o-linear-gradient(top, #62c462, #57a957);background-image:linear-gradient(top, #62c462, #57a957);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#57a957 #57a957 #3d773d;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} .btn.info,.alert-message.info{background-color:#339bb9;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9));background-image:-moz-linear-gradient(top, #5bc0de, #339bb9);background-image:-ms-linear-gradient(top, #5bc0de, #339bb9);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #5bc0de), color-stop(100%, #339bb9));background-image:-webkit-linear-gradient(top, #5bc0de, #339bb9);background-image:-o-linear-gradient(top, #5bc0de, #339bb9);background-image:linear-gradient(top, #5bc0de, #339bb9);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#339bb9 #339bb9 #22697d;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} -.row{zoom:1;margin-bottom:18px;margin-left:-20px;}.row:before,.row:after{display:table;content:"";} +.row{zoom:1;margin-left:-20px;}.row:before,.row:after{display:table;content:"";} .row:after{clear:both;} .row [class*="span"]{display:inline;float:left;margin-left:20px;} .row .span1{width:40px;} @@ -66,7 +66,7 @@ textarea{overflow:auto;vertical-align:top;} html,body{background-color:#fff;} body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;color:#808080;} .container{width:940px;margin:0 auto;} -.container-fluid{padding:0 20px;zoom:1;margin-bottom:18px;}.container-fluid:before,.container-fluid:after{display:table;content:"";} +.container-fluid{padding:0 20px;zoom:1;}.container-fluid:before,.container-fluid:after{display:table;content:"";} .container-fluid:after{clear:both;} .container-fluid>.sidebar{float:left;width:220px;} .container-fluid>.content{min-width:700px;max-width:1180px;margin-left:240px;} @@ -101,7 +101,7 @@ code{background-color:#fee9cc;color:rgba(0, 0, 0, 0.75);padding:1px 3px;} pre{background-color:#f5f5f5;display:block;padding:17px;margin:0 0 18px;line-height:18px;font-size:12px;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;white-space:pre;white-space:pre-wrap;word-wrap:break-word;} form{margin-bottom:18px;} fieldset{margin-bottom:18px;padding-top:18px;}fieldset legend{display:block;margin-left:150px;font-size:20px;line-height:1;*margin:0 0 5px 145px;*line-height:1.5;color:#404040;} -.clearfix{margin-bottom:18px;} +form .clearfix{margin-bottom:18px;} label,input,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:normal;} label{padding-top:6px;font-size:13px;line-height:18px;float:left;width:130px;text-align:right;color:#404040;} div.input{margin-left:150px;} @@ -200,7 +200,7 @@ a.menu:after,.dropdown-toggle:after{width:0;height:0;display:inline-block;conten .topbar .dropdown-menu a,.dropdown-menu a{display:block;padding:4px 15px;clear:both;font-weight:normal;line-height:18px;color:#808080;text-shadow:0 1px 0 #fff;}.topbar .dropdown-menu a:hover,.dropdown-menu a:hover{background-color:#dddddd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#eeeeee), to(#dddddd));background-image:-moz-linear-gradient(top, #eeeeee, #dddddd);background-image:-ms-linear-gradient(top, #eeeeee, #dddddd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, #dddddd));background-image:-webkit-linear-gradient(top, #eeeeee, #dddddd);background-image:-o-linear-gradient(top, #eeeeee, #dddddd);background-image:linear-gradient(top, #eeeeee, #dddddd);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#dddddd', GradientType=0);color:#404040;text-decoration:none;-webkit-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);} .open .menu,.dropdown.open .menu,.open .dropdown-toggle,.dropdown.open .dropdown-toggle{color:#fff;background:#ccc;background:rgba(0, 0, 0, 0.3);} .open .menu-dropdown,.dropdown.open .menu-dropdown,.open .dropdown-menu,.dropdown.open .dropdown-menu{display:block;} -.tabs,.pills{margin:0 0 20px;padding:0;list-style:none;zoom:1;margin-bottom:18px;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;content:"";} +.tabs,.pills{margin:0 0 20px;padding:0;list-style:none;zoom:1;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;content:"";} .tabs:after,.pills:after{clear:both;} .tabs>li,.pills>li{float:left;}.tabs>li>a,.pills>li>a{display:block;} .tabs{width:100%;border-bottom:1px solid #ddd;}.tabs>li{position:relative;top:1px;}.tabs>li>a{margin-right:2px;padding:0 15px;line-height:35px;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.tabs>li>a:hover{background-color:#eee;border-bottom:1px solid #ddd;text-decoration:none;} @@ -245,7 +245,7 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .modal{position:fixed;top:50%;left:50%;z-index:2000;width:560px;margin:-280px 0 0 -250px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;} .modal-header{border-bottom:1px solid #eee;padding:5px 20px;}.modal-header .close{position:absolute;right:10px;top:10px;color:#999;line-height:10px;font-size:18px;} .modal-body{padding:20px;} -.modal-footer{background-color:#f5f5f5;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;margin-bottom:18px;margin-bottom:0;}.modal-footer:before,.modal-footer:after{display:table;content:"";} +.modal-footer{background-color:#f5f5f5;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;margin-bottom:0;}.modal-footer:before,.modal-footer:after{display:table;content:"";} .modal-footer:after{clear:both;} .modal-footer .btn{float:right;margin-left:10px;} .twipsy{display:block;position:absolute;visibility:visible;padding:5px;font-size:11px;z-index:1000;filter:alpha(opacity=80);-khtml-opacity:0.8;-moz-opacity:0.8;opacity:0.8;}.twipsy.above .twipsy-arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;} diff --git a/lib/forms.less b/lib/forms.less index a16844ab1e81..ed07cf0a36db 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -26,7 +26,7 @@ fieldset { } // Parent element that clears floats and wraps labels and fields together -.clearfix { +form .clearfix { margin-bottom: @baseline; } From a218475ffcd15f38894d0dc5db1aada66dede4da Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 12 Sep 2011 14:33:00 -0700 Subject: [PATCH 5/6] Edited README.md via GitHub --- README.md | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 04b60c384175..af27f9dd55b5 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ And constructed with the following guidelines: For more information on SemVer, please visit http://semver.org/. -Bug Tracker +Bug tracker ----------- Have a bug? Please create an issue here on GitHub! @@ -53,7 +53,13 @@ Have a bug? Please create an issue here on GitHub! https://github.com/twitter/bootstrap/issues -Mailing List +Twitter account +--------------- + +Keep up to date on announcements and more by following Bootstrap on Twitter, @TwBootstrap. + + +Mailing list ------------ Have a question? Ask on our mailing list! @@ -77,7 +83,7 @@ This is a convenience method for watching your less files and automatically buil Watchr is required for this command to run. -AUTHORS +Authors ------- **Mark Otto** @@ -91,7 +97,7 @@ AUTHORS + http://github.com/fat -Copyright and License +Copyright and license --------------------- Copyright 2011 Twitter, Inc. From 427a001c476569684027567e5a7cec89058185ad Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 12 Sep 2011 14:33:39 -0700 Subject: [PATCH 6/6] Link Twitter account in readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index af27f9dd55b5..734e31745461 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ https://github.com/twitter/bootstrap/issues Twitter account --------------- -Keep up to date on announcements and more by following Bootstrap on Twitter, @TwBootstrap. +Keep up to date on announcements and more by following Bootstrap on Twitter, @TwBootstrap. Mailing list