diff --git a/Makefile b/Makefile index 82603c41f6..602086e82a 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ DATE=$(shell DATE) -BOOTSTRAP = ./bootstrap-1.2.0.css -BOOTSTRAP_MIN = ./bootstrap-1.2.0.min.css +BOOTSTRAP = ./bootstrap-1.3.0.css +BOOTSTRAP_MIN = ./bootstrap-1.3.0.min.css BOOTSTRAP_LESS = ./lib/bootstrap.less LESS_COMPESSOR ?= `which lessc` WATCHR ?= `which watchr` diff --git a/README.md b/README.md index eaa6ca9833..d9a7cb20ad 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Here's what the LESS version looks like: Or if you prefer, the standard css way: - + For more info, refer to the docs! diff --git a/bootstrap-1.2.0.css b/bootstrap-1.3.0.css similarity index 97% rename from bootstrap-1.2.0.css rename to bootstrap-1.3.0.css index 6856537f8c..0dfa456f9a 100644 --- a/bootstrap-1.2.0.css +++ b/bootstrap-1.3.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: Tue Sep 6 21:46:15 PDT 2011 + * Date: Thu Sep 8 10:45:51 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). @@ -185,20 +185,6 @@ textarea { margin-left: auto; margin-right: auto; } -.fixed-container { - width: 940px; - margin-left: auto; - margin-right: auto; - zoom: 1; - margin-bottom: 18px; -} -.fixed-container:before, .fixed-container:after { - display: table; - content: ""; -} -.fixed-container:after { - clear: both; -} .btn.danger, .alert-message.danger, .btn.danger:hover, @@ -293,7 +279,6 @@ TODO: * ------------------------------------------------------------------------------------------- */ .row { zoom: 1; - margin-bottom: 18px; margin-left: -20px; } .row:before, .row:after { @@ -303,7 +288,7 @@ TODO: .row:after { clear: both; } -.row [class^="span"] { +.row [class*="span"] { display: inline; float: left; margin-left: 20px; @@ -444,7 +429,6 @@ body { margin-left: auto; margin-right: auto; zoom: 1; - margin-bottom: 18px; } .container:before, .container:after { display: table; @@ -457,7 +441,6 @@ body { padding-left: 20px; padding-right: 20px; zoom: 1; - margin-bottom: 18px; } .container-fluid:before, .container-fluid:after { display: table; @@ -699,7 +682,7 @@ fieldset legend { color: #404040; } -.clearfix { +form .clearfix { margin-bottom: 18px; } label, @@ -1070,21 +1053,24 @@ table { width: 100%; margin-bottom: 18px; padding: 0; - border-collapse: separate; + border-collapse: collapse; font-size: 13px; } table th, table td { padding: 10px 10px 9px; - line-height: 13.5px; + line-height: 18px; text-align: left; - vertical-align: middle; - border-bottom: 1px solid #ddd; + border: 1px solid #ddd; } table th { padding-top: 9px; font-weight: bold; + vertical-align: middle; border-bottom-width: 2px; } +table td { + vertical-align: top; +} .zebra-striped tbody tr:nth-child(odd) td { background-color: #f9f9f9; } @@ -1227,6 +1213,9 @@ table .headerSortUp.purple, table .headerSortDown.purple { -moz-opacity: 1; opacity: 1; } +.topbar form.pull-right { + float: right; +} .topbar input { background-color: #444; background-color: rgba(255, 255, 255, 0.3); @@ -1506,7 +1495,6 @@ a.menu:after, .dropdown-toggle:after { padding: 0; list-style: none; zoom: 1; - margin-bottom: 18px; } .tabs:before, .pills:before, @@ -1591,6 +1579,38 @@ a.menu:after, .dropdown-toggle:after { color: #fff; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25); } +.breadcrumb { + margin: 0 0 18px; + padding: 7px 14px; + background-color: #f5f5f5; + background-repeat: repeat-x; + background-image: -khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5)); + background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5); + background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #f5f5f5)); + background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5); + background-image: -o-linear-gradient(top, #ffffff, #f5f5f5); + background-image: linear-gradient(top, #ffffff, #f5f5f5); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0); + border: 1px solid #ddd; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + -webkit-box-shadow: inset 0 1px 0 #ffffff; + -moz-box-shadow: inset 0 1px 0 #ffffff; + box-shadow: inset 0 1px 0 #ffffff; +} +.breadcrumb li { + display: inline; + text-shadow: 0 1px 0 #fff; +} +.breadcrumb .divider { + padding: 0 5px; + color: #bfbfbf; +} +.breadcrumb .active a { + color: #404040; +} .hero-unit { background-color: #f5f5f5; margin-bottom: 30px; @@ -1948,7 +1968,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.3.0.min.css similarity index 94% rename from bootstrap-1.2.0.min.css rename to bootstrap-1.3.0.min.css index f715372369..428ccdc6e2 100644 --- a/bootstrap-1.2.0.min.css +++ b/bootstrap-1.3.0.min.css @@ -22,15 +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-left:auto;margin-right:auto;} -.fixed-container{width:940px;margin-left:auto;margin-right:auto;zoom:1;margin-bottom:18px;}.fixed-container:before,.fixed-container:after{display:table;content:"";} -.fixed-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 [class*="span"]{display:inline;float:left;margin-left:20px;} .row .span1{width:40px;} .row .span2{width:100px;} .row .span3{width:160px;} @@ -73,9 +71,9 @@ textarea{overflow:auto;vertical-align:top;} .row .offset-two-thirds{margin-left:660px;} 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-left:auto;margin-right:auto;zoom:1;margin-bottom:18px;}.container:before,.container:after{display:table;content:"";} +.container{width:940px;margin-left:auto;margin-right:auto;zoom:1;}.container:before,.container:after{display:table;content:"";} .container:after{clear:both;} -.container-fluid{padding-left:20px;padding-right:20px;zoom:1;margin-bottom:18px;}.container-fluid:before,.container-fluid:after{display:table;content:"";} +.container-fluid{padding-left:20px;padding-right: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;} @@ -114,7 +112,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:19.5px;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;} @@ -167,8 +165,9 @@ input[disabled],select[disabled],textarea[disabled],input[readonly],select[reado .form-stacked .inputs-list{margin-bottom:0;}.form-stacked .inputs-list li{padding-top:0;}.form-stacked .inputs-list li label{font-weight:normal;padding-top:0;} .form-stacked div.error{padding-top:10px;padding-bottom:10px;padding-left:10px;margin-top:0;margin-left:-10px;} .form-stacked .actions{margin-left:-20px;padding-left:20px;} -table{width:100%;margin-bottom:18px;padding:0;border-collapse:separate;font-size:13px;}table th,table td{padding:10px 10px 9px;line-height:13.5px;text-align:left;vertical-align:middle;border-bottom:1px solid #ddd;} -table th{padding-top:9px;font-weight:bold;border-bottom-width:2px;} +table{width:100%;margin-bottom:18px;padding:0;border-collapse:collapse;font-size:13px;}table th,table td{padding:10px 10px 9px;line-height:18px;text-align:left;border:1px solid #ddd;} +table th{padding-top:9px;font-weight:bold;vertical-align:middle;border-bottom-width:2px;} +table td{vertical-align:top;} .zebra-striped tbody tr:nth-child(odd) td{background-color:#f9f9f9;} .zebra-striped tbody tr:hover td{background-color:#f5f5f5;} .zebra-striped .header{cursor:pointer;}.zebra-striped .header:after{content:"";float:right;margin-top:7px;border-width:0 4px 4px;border-style:solid;border-color:#000 transparent;visibility:hidden;} @@ -193,6 +192,7 @@ table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0 .topbar h3{position:relative;}.topbar h3 a{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;color:#ffffff;font-size:20px;font-weight:200;line-height:1;} .topbar p{margin:0;line-height:40px;}.topbar p a:hover{background-color:transparent;} .topbar form{float:left;margin:5px 0 0 0;position:relative;filter:alpha(opacity=100);-khtml-opacity:1;-moz-opacity:1;opacity:1;} +.topbar form.pull-right{float:right;} .topbar input{background-color:#444;background-color:rgba(255, 255, 255, 0.3);font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:normal;font-weight:13px;line-height:1;padding:4px 9px;color:#fff;color:rgba(255, 255, 255, 0.75);border:1px solid #111;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.topbar input:-moz-placeholder{color:#e6e6e6;} .topbar input::-webkit-input-placeholder{color:#e6e6e6;} .topbar input:hover{background-color:#bfbfbf;background-color:rgba(255, 255, 255, 0.5);color:#fff;} @@ -215,7 +215,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{float:left;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;} @@ -226,6 +226,9 @@ a.menu:after,.dropdown-toggle:after{width:0;height:0;display:inline-block;conten .tabs li.open a.menu:after,.tabs .dropdown.open .dropdown-toggle:after{border-top-color:#555;} .pills a{margin:5px 3px 5px 0;padding:0 15px;text-shadow:0 1px 1px #fff;line-height:30px;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}.pills a:hover{background:#0050a3;color:#fff;text-decoration:none;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);} .pills .active a{background:#0069d6;color:#fff;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);} +.breadcrumb{margin:0 0 18px;padding:7px 14px;background-color:#f5f5f5;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5));background-image:-moz-linear-gradient(top, #ffffff, #f5f5f5);background-image:-ms-linear-gradient(top, #ffffff, #f5f5f5);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #f5f5f5));background-image:-webkit-linear-gradient(top, #ffffff, #f5f5f5);background-image:-o-linear-gradient(top, #ffffff, #f5f5f5);background-image:linear-gradient(top, #ffffff, #f5f5f5);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}.breadcrumb li{display:inline;text-shadow:0 1px 0 #fff;} +.breadcrumb .divider{padding:0 5px;color:#bfbfbf;} +.breadcrumb .active a{color:#404040;} .hero-unit{background-color:#f5f5f5;margin-bottom:30px;padding:60px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;} .hero-unit p{font-size:18px;font-weight:200;line-height:27px;} footer{margin-top:17px;padding-top:17px;border-top:1px solid #eee;} @@ -264,7 +267,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:-250px 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/docs/assets/css/docs.css b/docs/assets/css/docs.css index 2c1ebd7318..dd62bcb9e2 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -66,7 +66,7 @@ section > .row { line-height: 27px; } -div.quickstart { +.quickstart { background-color: #f5f5f5; background-repeat: repeat-x; background-image: -khtml-gradient(linear, left top, left bottom, from(#f9f9f9), to(#f5f5f5)); @@ -81,13 +81,16 @@ div.quickstart { border-top: 1px solid #fff; border-bottom: 1px solid #eee; } -div.quickstart div.row { +.quickstart .container { + margin-bottom: 0; +} +.quickstart .row { margin: 0 -20px; -webkit-box-shadow: 1px 0 0 #f9f9f9; -moz-box-shadow: 1px 0 0 #f9f9f9; box-shadow: 1px 0 0 #f9f9f9; } -div.quickstart div.columns { +.quickstart [class*="span"] { width: 285px; height: 117px; margin-left: 0; @@ -97,21 +100,21 @@ div.quickstart div.columns { -moz-box-shadow: inset 1px 0 0 #f9f9f9; box-shadow: inset 1px 0 0 #f9f9f9; } -div.quickstart div.columns:last-child { +.quickstart [class*="span"]:last-child { border-right: 1px solid #eee; width: 286px; } -div.quickstart h6, -div.quickstart p { +.quickstart h6, +.quickstart p { line-height: 18px; text-align: center; margin-bottom: 9px; color: #333; } -div.quickstart h6 { +.quickstart h6 { color: #999; } -div.quickstart form textarea { +.quickstart textarea { display: block; width: 275px; height: auto; @@ -137,7 +140,7 @@ div.quickstart form textarea { margin-top: 10px; margin-bottom: 10px; } -.show-grid .column, .show-grid .columns { +.show-grid [class*="span"] { background-color: #eee; text-align: center; -webkit-border-radius: 3px; @@ -146,7 +149,7 @@ div.quickstart form textarea { height: 30px; line-height: 30px; } -.show-grid:hover .column, .show-grid:hover .columns { +.show-grid:hover [class*="span"] { background: rgba(0, 0, 0, 0.25); } /* Render mini layout previews diff --git a/docs/assets/img/example-diagram-01.png b/docs/assets/img/example-diagram-01.png index 16ac0c44ee..0cece3b3ea 100644 Binary files a/docs/assets/img/example-diagram-01.png and b/docs/assets/img/example-diagram-01.png differ diff --git a/docs/assets/img/example-diagram-02.png b/docs/assets/img/example-diagram-02.png index 90c30e6a13..557edd3112 100644 Binary files a/docs/assets/img/example-diagram-02.png and b/docs/assets/img/example-diagram-02.png differ diff --git a/docs/assets/img/example-diagram-03.png b/docs/assets/img/example-diagram-03.png index 00401e0b16..acf819d408 100644 Binary files a/docs/assets/img/example-diagram-03.png and b/docs/assets/img/example-diagram-03.png differ diff --git a/docs/index.html b/docs/index.html index 3a5773a967..7acafd6c9a 100644 --- a/docs/index.html +++ b/docs/index.html @@ -12,7 +12,7 @@ - + @@ -75,14 +75,14 @@
-
+
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? No problem, just clone the repo and add these lines:

@@ -90,7 +90,7 @@ <script src="/path/to/less.js"></script>
-
+
Fork on GitHub

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

Bootstrap on GitHub »

@@ -153,7 +153,7 @@ Fluid layout with static sidebar
- Simple hanging container for apps + Simple hanging container for apps
@@ -173,19 +173,19 @@

Grid system Rock the standard 940px or roll your own

-
+

Default grid

The default grid system provided as part of Bootstrap is a 940px wide 16-column grid. It’s a flavor of the popular 960 grid system, but without the additional margin/padding on the left and right sides.

-
+

Example grid markup

As shown here, a basic layout can be created with two "columns," each spanning a number of the 16 foundational columns we defined as part of our grid system. See the examples below for more variations.

 <div class="row">
-  <div class="span6 columns">
+  <div class="span6">
     ...
   </div>
-  <div class="span10 columns">
+  <div class="span10">
     ...
   </div>
 </div>
@@ -211,28 +211,28 @@
     
1
-
2
-
2
-
2
-
2
-
2
-
2
-
2
-
2
+
2
+
2
+
2
+
2
+
2
+
2
+
2
+
2
-
3
-
3
-
3
-
3
-
3
+
3
+
3
+
3
+
3
+
3
1
-
4
-
4
-
4
-
4
+
4
+
4
+
4
+
4
1/3
@@ -244,24 +244,24 @@
2/3
-
4
-
6
-
6
+
4
+
6
+
6
-
8
-
8
+
8
+
8
-
5
-
11
+
5
+
11
-
16
+
16

Offsetting columns

-
4
+
4
8 offset 4
@@ -290,7 +290,7 @@
-
+

Fixed layout

The default and simple 940px-wide, centered layout for just about any website or page provided by a single <div.container>.

@@ -304,7 +304,7 @@ </body>
-
+

Fluid layout

An alternative, flexible fluid page structure with min- and max-widths and a left-hand sidebar. Great for apps and docs.

@@ -338,13 +338,13 @@
-
+

Headings & copy

A standard typographic hierarchy for structuring your webpages.

The entire typographic grid is based on two Less variables in our preboot.less file: @basefont and @baseline. The first is the base font-size used throughout and the second is the base line-height.

We use those variables, and some math, to create the margins, paddings, and line-heights of all our type and more.

-
+

h1. Heading 1

h2. Heading 2

h3. Heading 3

@@ -352,7 +352,7 @@
h5. Heading 5
h6. Heading 6
-
+

Example paragraph

Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula ut id elit.

Example heading Has sub-heading…

@@ -361,7 +361,7 @@
-
+

Misc. elements

Using emphasis, addresses, & abbreviations

@@ -371,7 +371,7 @@ <abbr>

-
+

When to use

Emphasis tags (<strong> and <em>) should be used to indicate additional importance or emphasis of a word or phrase relative to its surrounding copy. Use <strong> for importance and <em> for stress emphasis.

Emphasis in a paragraph

@@ -405,7 +405,7 @@
-
+

Blockquotes

<blockquote> @@ -413,7 +413,7 @@ <small>

-
+

How to quote

To include a blockquote, wrap <blockquote> around <p> and <small> tags. Use the <small> element to cite your source and you'll get an em dash &mdash; before it.

@@ -425,7 +425,7 @@

Lists

-
+

Unordered <ul>

  • Lorem ipsum dolor sit amet
    • @@ -445,7 +445,7 @@
  • Eget porttitor lorem
-
+

Unstyled <ul.unstyled>

  • Lorem ipsum dolor sit amet
    • @@ -465,7 +465,7 @@
  • Eget porttitor lorem
-
+

Ordered <ol>

  1. Lorem ipsum dolor sit amet
    2. @@ -478,7 +478,7 @@
  2. Eget porttitor lorem
-
+

Description dl

Description lists
@@ -503,7 +503,7 @@
-
+

Building tables

<table> @@ -519,7 +519,7 @@

Always wrap your column headers in a <thead> such that hierarchy is <thead> > <tr> > <th>.

Similar to the column headers, all your table’s body content should be wrapped in a <tbody> so your hierarchy is <tbody> > <tr> > <td>.

-
+

Example: Default table styles

All tables will be automatically styled with only the essential borders to ensure readability and maintain structure. No need to add extra classes or attributes.

@@ -648,11 +648,11 @@

Forms

-
+

Default styles

All forms are given default styles to present them in a readable and scalable way. Styles are provided for text inputs, select lists, textareas, radio buttons and checkboxes, and buttons.

-
+
Example form legend @@ -836,11 +836,11 @@
-
+

Stacked forms

Add .form-stacked to your form’s HTML and you’ll have labels on top of their fields instead of to their left. This works great if your forms are short or you have two columns of inputs for heavier forms.

-
+
Example form legend @@ -903,12 +903,12 @@
-
+

Buttons

As a convention, buttons are used for actions while links are used for objects. For instance, "Download" could be a button and "recent activity" could be a link.

All buttons default to a light gray style, but a number of functional classes can be applied for different color styles. These classes include a blue .primary class, a light-blue .info class, a green .success class, and a red .danger class. Plus, rolling your own styles is easy peasy.

-
+

Example buttons

Button styles can be applied to anything with the .btn applied. Typically you’ll want to apply these to only <a>, <button>, and select <input> elements. Here’s how it looks:

@@ -958,17 +958,17 @@
  • Link
  • Link
  • Link
    • -
  • +
  • Dropdown
    • - +
      @@ -988,17 +988,17 @@
    -
    +

    What is it

    Our topbar is a fixed bar that houses a website’s logo or name, primary navigation, and search form.

    -
    +

    Customizable

    All elements within, and the entire topbar as well, are optional. You can choose to include a logo/name, nav, search, and a secondary nav—or any combination of that.

    -
    +

    Dropdowns included

    -

    As part of the main navigation, we’ve included the ability for you to add dropdowns to your nav. Check out the secondary nav above (right aligned) to see how it’s done.

    +

    As part of the main navigation, we’ve included the ability for you to add dropdowns to your nav. Check out the secondary nav above (right aligned) to see how it’s done. Dropdowns li tags also support .active for showing current page selection.

    Note: When using the topbar on any page, be sure to account for the overlap it causes by adding padding-top: 40px; to your body.

    @@ -1006,12 +1006,12 @@
    -
    +

    Tabs and pills

    Create simple secondary navigation with a <ul>. Swap between tabs or pills by adding the appropriate class.

    Great for sub-sections of content like our account settings pages and user timelines for toggling between pages of like content. Available in tabbed or pill styles.

    -
    +
    + +
    +
    +

    Breadcrumbs

    +

    Breadcrumb navigation is used as a way to show users where they are within an app or a site, but not for primary navigation.

    +
    +
    +
      +
    • Home
      • +
    +
      +
    • Home /
      • +
    • Middle page
      • +
    + + +
    +
    +
    -
    +

    Pagination

    Ultra simplistic and minimally styled pagination inspired by Rdio. The large block is hard to miss, easily scalable, and provides large click areas.

    -
    +
    -
    +

    Basic alerts

    div.alert-message

    One-line messages for highlighting the failure, possible failure, or success of an action. Particularly useful for forms.

    -
    +
    ×

    Holy guacamole! Best check yo self, you’re not looking too good.

    @@ -1158,12 +1186,12 @@
    -
    +

    Block messages

    div.alert-message.block-message

    For messages that require a bit of explanation, we have paragraph style alerts. These are perfect for bubbling up longer error messages, warning a user of a pending action, or just presenting information for more emphasis on the page.

    -
    +
    ×

    Holy guacamole! This is a warning! Best check yo self, you’re not looking too good. Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.

    @@ -1209,11 +1237,11 @@

    Popovers Components for displaying content in modals, tooltips, and popovers

    -
    +

    Modals

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

    -
    +
    @@ -1235,11 +1263,11 @@
    -
    +

    Tool Tips

    Twipsies are super useful for aiding a confused user and pointing them in the right direction.

    -
    +

    @@ -1268,11 +1296,11 @@ Lorem ipsum dolar sit amet illo error ipsum verita

    -
    +

    Popovers

    Use popovers to provide subtextual information to a page without affecting layout.

    -
    +
    @@ -1300,27 +1328,44 @@ Lorem ipsum dolar sit amet illo error ipsum verita

    Using Javascript with Bootstrap An index of plugins to get you started

    -
    +

    Integrating javascript with the Bootstrap library is super easy. Below we go over the basics and provide you with some awesome plugins to get you started!

    -
    +

    Getting started

    We've set out to make your interactive work with Bootstrap even more simple, offering several lightweight plugins for things like modals, tooltips, and other dynamic components. These plugins have been coded up to work with either jQuery or Ender, but we encourage you to extend and modify them to fit your development needs!

    Do I need javascript?

    -

    The short answer is no... of course not! However, for those who need it, we've provided the plugins below to help you understand how to integrate bootstrap with javascript and to give you a quick lightweight option for dropping something in and getting the basic functionality right away! For more information on these plugins and to see demos of them in action, please refer to our plugin documentation page. -

    -
    bootstrap-modal.js
    -
    Our Modal plugin is a super slim take on the traditional modal js plugin! We took special care to include only the bare functionality that we require at twitter.
    -
    bootstrap-alerts.js
    -
    The alert plugin is a super tiny class for adding close functionality to alerts.
    -
    bootstrap-dropdown.js
    -
    This plugin is for adding dropdown to the bootstrap nav.
    -
    bootstrap-twipsy.js
    -
    Based on the excellent jQuery.tipsy plugin written by Jason Frame; twipsy is an updated version, which doesn't rely on images, uses css3 for animations, and data-attributes for title storage!
    -
    bootstrap-popover.js
    -
    The popover plugin provides a simple interface for adding popovers to your application. It extends the boostrap-twipsy.js plugin, so be sure to grab that file as well when including popovers in your project!
    -
    -

    +

    The short answer is no... of course not! However, for those who need it, we've provided the plugins below to help you understand how to integrate bootstrap with javascript and to give you a quick lightweight option for dropping something in and getting the basic functionality right away! For more information on these plugins and to see demos of them in action, please refer to our plugin documentation page.

    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    FileDescription
    bootstrap-modal.jsOur Modal plugin is a super slim take on the traditional modal js plugin! We took special care to include only the bare functionality that we require at twitter.
    bootstrap-alerts.jsThe alert plugin is a super tiny class for adding close functionality to alerts.
    bootstrap-dropdown.jsThis plugin is for adding dropdown to the bootstrap nav.
    bootstrap-twipsy.jsBased on the excellent jQuery.tipsy plugin written by Jason Frame; twipsy is an updated version, which doesn't rely on images, uses css3 for animations, and data-attributes for title storage!
    bootstrap-popover.jsThe popover plugin provides a simple interface for adding popovers to your application. It extends the boostrap-twipsy.js plugin, so be sure to grab that file as well when including popovers in your project!
    @@ -1332,11 +1377,11 @@ Lorem ipsum dolar sit amet illo error ipsum verita

    Using Bootstrap with Less Supercharge your CSS with variables, mixins, and functions

    -
    +

    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

    Use this option to make full use of Bootstrap’s Less variables, mixins, and nesting in CSS via javascript in your browser.

    diff --git a/docs/javascript.html b/docs/javascript.html
index 5ece999ec7..d39340d02b 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -22,7 +22,7 @@
     
 
     
-    
+    
     
     
 
diff --git a/examples/container-app.html b/examples/container-app.html
new file mode 100644
index 0000000000..20ab137899
--- /dev/null
+++ b/examples/container-app.html
@@ -0,0 +1,119 @@
+
+
+  
+    
+    Bootstrap, from Twitter
+    
+    
+
+    
+    
+
+    
+    
+    
+
+    
+    
+    
+    
+    
+  
+
+  
+
+    
    
+      
    
+        
    
+          
    Project name
    
+          
+          
    
+            
+            
+            
+          
    
+        
    
+      
    
+    
    
+
+    
    
+
+      
    
+        
    
+          
    Page name Supporting text or tagline
    
+        
    
+        
    
+          
    
+            
    Main content
    
+          
    
+          
    
+            
    Secondary content
    
+          
    
+        
    
+      
    
+
+      
    
+        
    © Company 2011
    
+      
    
+
+    
     
+
+  
+
diff --git a/examples/fluid.html b/examples/fluid.html
index 7e9fed0c38..539b801c63 100644
--- a/examples/fluid.html
+++ b/examples/fluid.html
@@ -12,7 +12,7 @@
     
 
     
-    
+