diff --git a/bootstrap.css b/bootstrap.css index aa13815fde..0014fcdcc2 100644 --- a/bootstrap.css +++ b/bootstrap.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: Thu Jan 5 15:48:31 PST 2012 + * Date: Thu Jan 5 21:43:09 PST 2012 */ html, body { margin: 0; @@ -261,7 +261,6 @@ a:hover { clear: both; } [class*="span"] { - display: inline; float: left; margin-left: 20px; } @@ -555,10 +554,11 @@ input, textarea, select, .uneditable-input { - display: inline-block; + display: block; width: 210px; height: 18px; padding: 4px; + margin-bottom: 9px; font-size: 13px; line-height: 18px; color: #555555; @@ -670,7 +670,6 @@ input.span1, textarea.span1, select.span1, .uneditable-input.span1 { - display: inline-block; float: none; width: 50px; margin-left: 0; @@ -679,7 +678,6 @@ input.span2, textarea.span2, select.span2, .uneditable-input.span2 { - display: inline-block; float: none; width: 130px; margin-left: 0; @@ -688,7 +686,6 @@ input.span3, textarea.span3, select.span3, .uneditable-input.span3 { - display: inline-block; float: none; width: 210px; margin-left: 0; @@ -697,7 +694,6 @@ input.span4, textarea.span4, select.span4, .uneditable-input.span4 { - display: inline-block; float: none; width: 290px; margin-left: 0; @@ -706,7 +702,6 @@ input.span5, textarea.span5, select.span5, .uneditable-input.span5 { - display: inline-block; float: none; width: 370px; margin-left: 0; @@ -715,7 +710,6 @@ input.span6, textarea.span6, select.span6, .uneditable-input.span6 { - display: inline-block; float: none; width: 450px; margin-left: 0; @@ -724,7 +718,6 @@ input.span7, textarea.span7, select.span7, .uneditable-input.span7 { - display: inline-block; float: none; width: 530px; margin-left: 0; @@ -733,7 +726,6 @@ input.span8, textarea.span8, select.span8, .uneditable-input.span8 { - display: inline-block; float: none; width: 610px; margin-left: 0; @@ -742,7 +734,6 @@ input.span9, textarea.span9, select.span9, .uneditable-input.span9 { - display: inline-block; float: none; width: 690px; margin-left: 0; @@ -751,7 +742,6 @@ input.span10, textarea.span10, select.span10, .uneditable-input.span10 { - display: inline-block; float: none; width: 770px; margin-left: 0; @@ -760,7 +750,6 @@ input.span11, textarea.span11, select.span11, .uneditable-input.span11 { - display: inline-block; float: none; width: 850px; margin-left: 0; @@ -769,7 +758,6 @@ input.span12, textarea.span12, select.span12, .uneditable-input.span12 { - display: inline-block; float: none; width: 930px; margin-left: 0; @@ -778,7 +766,6 @@ input.span13, textarea.span13, select.span13, .uneditable-input.span13 { - display: inline-block; float: none; width: 1010px; margin-left: 0; @@ -787,7 +774,6 @@ input.span14, textarea.span14, select.span14, .uneditable-input.span14 { - display: inline-block; float: none; width: 1090px; margin-left: 0; @@ -796,7 +782,6 @@ input.span15, textarea.span15, select.span15, .uneditable-input.span15 { - display: inline-block; float: none; width: 1170px; margin-left: 0; @@ -805,7 +790,6 @@ input.span16, textarea.span16, select.span16, .uneditable-input.span16 { - display: inline-block; float: none; width: 1250px; margin-left: 0; @@ -890,13 +874,13 @@ textarea[readonly] { box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); cursor: not-allowed; } -:-moz-placeholder { +input:-moz-placeholder { color: #999999; } -::-webkit-input-placeholder { +input::-webkit-input-placeholder { color: #999999; } -.help-text { +.help-block { margin-top: 5px; margin-bottom: 0; color: #999999; @@ -911,11 +895,8 @@ textarea[readonly] { display: inline; padding-left: 5px; } -.help-block { - display: block; - max-width: 600px; -} .input-prepend, .input-append { + margin-bottom: 5px; zoom: 1; } .input-prepend:before, @@ -977,10 +958,27 @@ textarea[readonly] { border-radius: 0 3px 3px 0; } .search-form .search-query { + padding-left: 14px; + padding-right: 14px; -webkit-border-radius: 14px; -moz-border-radius: 14px; border-radius: 14px; } +.search-form input, +.inline-form input, +.horizontal-form input, +.search-form textarea, +.inline-form textarea, +.horizontal-form textarea, +.search-form select, +.inline-form select, +.horizontal-form select, +.search-form .uneditable-input, +.inline-form .uneditable-input, +.horizontal-form .uneditable-input { + display: inline-block; + margin-bottom: 0; +} .control-group { margin-bottom: 18px; } @@ -2554,7 +2552,7 @@ i { } .btn { display: inline-block; - padding: 5px 14px 6px; + padding: 5px 10px 6px; font-size: 13px; line-height: normal; color: #333; diff --git a/bootstrap.min.css b/bootstrap.min.css index 8d7c8bd4cf..86aa51cda9 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -37,7 +37,7 @@ a{font-weight:inherit;line-height:inherit;color:#0088cc;text-decoration:none;}a: .show{display:block;} .row{margin-left:-20px;zoom:1;}.row:before,.row:after{display:table;*display:inline;content:"";zoom:1;} .row:after{clear:both;} -[class*="span"]{display:inline;float:left;margin-left:20px;} +[class*="span"]{float:left;margin-left:20px;} .span1{width:60px;} .span2{width:140px;} .span3{width:220px;} @@ -95,7 +95,7 @@ form{margin-bottom:18px;} legend{display:block;width:100%;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#333333;border-bottom:1px solid #eee;} label,input,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:normal;font-weight:13px;line-height:18px;} label{display:block;margin-bottom:5px;color:#333333;} -input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:18px;padding:4px;font-size:13px;line-height:18px;color:#555555;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} +input,textarea,select,.uneditable-input{display:block;width:210px;height:18px;padding:4px;margin-bottom:9px;font-size:13px;line-height:18px;color:#555555;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} input[type=image],input[type=checkbox],input[type=radio]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;border:none;cursor:pointer;} input[type=file]{padding:initial;line-height:initial;border:initial;background-color:#ffffff;background-color:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} input[type=button],input[type=reset],input[type=submit]{width:auto;height:auto;} @@ -116,22 +116,22 @@ input[type=file]:focus,input[type=checkbox]:focus,select:focus{-webkit-box-shado .input-large{width:210px;} .input-xlarge{width:270px;} .input-xxlarge{width:530px;} -input.span1,textarea.span1,select.span1,.uneditable-input.span1{display:inline-block;float:none;width:50px;margin-left:0;} -input.span2,textarea.span2,select.span2,.uneditable-input.span2{display:inline-block;float:none;width:130px;margin-left:0;} -input.span3,textarea.span3,select.span3,.uneditable-input.span3{display:inline-block;float:none;width:210px;margin-left:0;} -input.span4,textarea.span4,select.span4,.uneditable-input.span4{display:inline-block;float:none;width:290px;margin-left:0;} -input.span5,textarea.span5,select.span5,.uneditable-input.span5{display:inline-block;float:none;width:370px;margin-left:0;} -input.span6,textarea.span6,select.span6,.uneditable-input.span6{display:inline-block;float:none;width:450px;margin-left:0;} -input.span7,textarea.span7,select.span7,.uneditable-input.span7{display:inline-block;float:none;width:530px;margin-left:0;} -input.span8,textarea.span8,select.span8,.uneditable-input.span8{display:inline-block;float:none;width:610px;margin-left:0;} -input.span9,textarea.span9,select.span9,.uneditable-input.span9{display:inline-block;float:none;width:690px;margin-left:0;} -input.span10,textarea.span10,select.span10,.uneditable-input.span10{display:inline-block;float:none;width:770px;margin-left:0;} -input.span11,textarea.span11,select.span11,.uneditable-input.span11{display:inline-block;float:none;width:850px;margin-left:0;} -input.span12,textarea.span12,select.span12,.uneditable-input.span12{display:inline-block;float:none;width:930px;margin-left:0;} -input.span13,textarea.span13,select.span13,.uneditable-input.span13{display:inline-block;float:none;width:1010px;margin-left:0;} -input.span14,textarea.span14,select.span14,.uneditable-input.span14{display:inline-block;float:none;width:1090px;margin-left:0;} -input.span15,textarea.span15,select.span15,.uneditable-input.span15{display:inline-block;float:none;width:1170px;margin-left:0;} -input.span16,textarea.span16,select.span16,.uneditable-input.span16{display:inline-block;float:none;width:1250px;margin-left:0;} +input.span1,textarea.span1,select.span1,.uneditable-input.span1{float:none;width:50px;margin-left:0;} +input.span2,textarea.span2,select.span2,.uneditable-input.span2{float:none;width:130px;margin-left:0;} +input.span3,textarea.span3,select.span3,.uneditable-input.span3{float:none;width:210px;margin-left:0;} +input.span4,textarea.span4,select.span4,.uneditable-input.span4{float:none;width:290px;margin-left:0;} +input.span5,textarea.span5,select.span5,.uneditable-input.span5{float:none;width:370px;margin-left:0;} +input.span6,textarea.span6,select.span6,.uneditable-input.span6{float:none;width:450px;margin-left:0;} +input.span7,textarea.span7,select.span7,.uneditable-input.span7{float:none;width:530px;margin-left:0;} +input.span8,textarea.span8,select.span8,.uneditable-input.span8{float:none;width:610px;margin-left:0;} +input.span9,textarea.span9,select.span9,.uneditable-input.span9{float:none;width:690px;margin-left:0;} +input.span10,textarea.span10,select.span10,.uneditable-input.span10{float:none;width:770px;margin-left:0;} +input.span11,textarea.span11,select.span11,.uneditable-input.span11{float:none;width:850px;margin-left:0;} +input.span12,textarea.span12,select.span12,.uneditable-input.span12{float:none;width:930px;margin-left:0;} +input.span13,textarea.span13,select.span13,.uneditable-input.span13{float:none;width:1010px;margin-left:0;} +input.span14,textarea.span14,select.span14,.uneditable-input.span14{float:none;width:1090px;margin-left:0;} +input.span15,textarea.span15,select.span15,.uneditable-input.span15{float:none;width:1170px;margin-left:0;} +input.span16,textarea.span16,select.span16,.uneditable-input.span16{float:none;width:1250px;margin-left:0;} input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{background-color:#f5f5f5;border-color:#ddd;cursor:not-allowed;} .control-group.error>label,.control-group.error .help-block,.control-group.error .help-inline{color:#b94a48;} .control-group.error input,.control-group.error textarea{color:#b94a48;border-color:#ee5f5b;}.control-group.error input:focus,.control-group.error textarea:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7;} @@ -144,12 +144,11 @@ input[disabled],select[disabled],textarea[disabled],input[readonly],select[reado .control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#468847;background-color:#bcddbc;border-color:#468847;} .form-actions{padding:17px 20px 18px;margin-top:18px;margin-bottom:18px;background-color:#f5f5f5;border-top:1px solid #ddd;} .uneditable-input{display:block;background-color:#ffffff;border-color:#eee;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);cursor:not-allowed;} -:-moz-placeholder{color:#999999;} -::-webkit-input-placeholder{color:#999999;} -.help-text{margin-top:5px;margin-bottom:0;color:#999999;} +input:-moz-placeholder{color:#999999;} +input::-webkit-input-placeholder{color:#999999;} +.help-block{margin-top:5px;margin-bottom:0;color:#999999;} .help-inline{*position:relative;*top:-5px;display:inline;padding-left:5px;} -.help-block{display:block;max-width:600px;} -.input-prepend,.input-append{zoom:1;}.input-prepend:before,.input-append:before,.input-prepend:after,.input-append:after{display:table;*display:inline;content:"";zoom:1;} +.input-prepend,.input-append{margin-bottom:5px;zoom:1;}.input-prepend:before,.input-append:before,.input-prepend:after,.input-append:after{display:table;*display:inline;content:"";zoom:1;} .input-prepend:after,.input-append:after{clear:both;} .input-prepend input,.input-append input{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;} .input-prepend .add-on,.input-append .add-on{float:left;display:block;width:auto;min-width:16px;height:18px;margin-right:-1px;padding:4px 4px 4px 5px;font-weight:normal;line-height:18px;color:#999999;text-align:center;text-shadow:0 1px 0 #ffffff;background-color:#f5f5f5;border:1px solid #ccc;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} @@ -157,7 +156,8 @@ input[disabled],select[disabled],textarea[disabled],input[readonly],select[reado .input-prepend .add-on{*margin-top:1px;} .input-append input{float:left;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} .input-append .add-on{margin-right:0;margin-left:-1px;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;} -.search-form .search-query{-webkit-border-radius:14px;-moz-border-radius:14px;border-radius:14px;} +.search-form .search-query{padding-left:14px;padding-right:14px;-webkit-border-radius:14px;-moz-border-radius:14px;border-radius:14px;} +.search-form input,.inline-form input,.horizontal-form input,.search-form textarea,.inline-form textarea,.horizontal-form textarea,.search-form select,.inline-form select,.horizontal-form select,.search-form .uneditable-input,.inline-form .uneditable-input,.horizontal-form .uneditable-input{display:inline-block;margin-bottom:0;} .control-group{margin-bottom:18px;} .control-group>label{font-weight:bold;} .horizontal-form .control-group>label{float:left;width:130px;padding-top:5px;text-align:right;} @@ -394,7 +394,7 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou .btn.danger,.alert-message.danger,.btn.error,.alert-message.error{background-color:#c43c35;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);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);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-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);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);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-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);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);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);} -.btn{display:inline-block;padding:5px 14px 6px;font-size:13px;line-height:normal;color:#333;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#e6e6e6;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border:1px solid #ccc;border-bottom-color:#bbb;-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);cursor:pointer;-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;-ms-transition:0.1s linear all;-o-transition:0.1s linear all;transition:0.1s linear all;}.btn:hover{color:#333333;text-decoration:none;background-position:0 -15px;} +.btn{display:inline-block;padding:5px 10px 6px;font-size:13px;line-height:normal;color:#333;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#e6e6e6;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border:1px solid #ccc;border-bottom-color:#bbb;-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);cursor:pointer;-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;-ms-transition:0.1s linear all;-o-transition:0.1s linear all;transition:0.1s linear all;}.btn:hover{color:#333333;text-decoration:none;background-position:0 -15px;} .btn:focus{outline:1px dotted #666;} .btn.primary{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0064cd;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(top, #049cdb, #0064cd);background-image:-ms-linear-gradient(top, #049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(top, #049cdb, #0064cd);background-image:-o-linear-gradient(top, #049cdb, #0064cd);background-image:linear-gradient(top, #049cdb, #0064cd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);border-color:#0064cd #0064cd #003f81;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} .btn.active,.btn:active{-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.25),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.25),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.25),0 1px 2px rgba(0, 0, 0, 0.05);} diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 5eafb962b7..41c7ae4b64 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -36,11 +36,13 @@ body > .navbar-fixed .brand:hover { /* Space out sub-sections more -------------------------------------------------- */ .page-header { - margin: 36px 0 18px; + margin: 45px 0 18px; border-bottom: 1px solid #eee; } .page-header h1 { - margin-bottom: 9px; + margin-bottom: 17px; + font-size: 36px; + line-height: 1; } @@ -327,10 +329,6 @@ pre.prettyprint { overflow: hidden; } -.well form { - margin-bottom: 0; -} - .browser-support { max-width: 100%; } @@ -356,6 +354,40 @@ h2 + table { position: relative; } +/* Remove bottom margin on example forms in wells */ +form.well { + margin-bottom: 0; +} + +/* Tighten up spacing */ +.well hr { + margin: 18px 0; +} + +/* Form docs for horizontal forms */ +.form-docs { + padding-left: 10px; +} +.form-docs h3, +.form-docs p, +.form-docs li { + color: #777; +} +.form-docs hr { + margin: 18px 0; +} + +/* Fake the :focus state to demo it */ +.focused { + border-color: rgba(82,168,236,.8); + -webkit-box-shadow: inset 0 1px 3px rgba(0,0,0,.1), 0 0 8px rgba(82,168,236,.6); + -moz-box-shadow: inset 0 1px 3px rgba(0,0,0,.1), 0 0 8px rgba(82,168,236,.6); + box-shadow: inset 0 1px 3px rgba(0,0,0,.1), 0 0 8px rgba(82,168,236,.6); + outline: 0; +} + + + /* Icons ------------------------- */ .the-icons { diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index 63791bd37d..5fe8b53ef4 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -9,10 +9,10 @@ $(function(){ // ============================================== // Set a timeout... - setTimeout(function(){ - // Hide the address bar! - window.scrollTo(0, 1); - }, 0); + // setTimeout(function(){ + // // Hide the address bar! + // window.scrollTo(0, 1); + // }, 0); // Docs topbar nav diff --git a/docs/base-css.html b/docs/base-css.html index 10be4c3d48..225f10ae2d 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -593,6 +593,9 @@ <table> ... </table> + +
+

2. Striped table

Get a little fancy with your tables by adding zebra-striping—just add the .striped-table class.

@@ -630,6 +633,9 @@ <table class="striped-table"> ... </table> + +
+

3. Bordered table

Add borders around the entire table and between each row, plus a bit of rounded corners for aesthetic purposes.

Note Bordered tables do not work well with rowspan due to somewhat hacky CSS applied to the tables. Sorry about that!

@@ -671,6 +677,9 @@ <table class="bordered-table"> ... </table> + +
+

4. Condensed table

Make your tables more compact by adding the .condensed-table class to cut table cell padding in half (from 10px to 5px).

@@ -707,6 +716,9 @@ <table class="condensed-table"> ... </table> + +
+

5. Striped table w/ TableSorter.js

Taking the previous example, we improve the usefulness of our tables by providing sorting functionality via jQuery and the Tablesorter plugin. Click any column’s header to change the sort.

@@ -760,54 +772,32 @@ - - - -
-
-

Flexible markup and styles

-

The best part about forms in Bootstrap is that all your inputs and controls look great no matter how you build them in your markup. No superfluous HTML is required, but we provide the patterns for those who require it.

+
+
+

Flexible HTML and CSS

+

The best part about forms in Bootstrap is that all your inputs and controls look great no matter how you build them in your markup. No superfluous HTML is required, but we provide the patterns for those who require it.

+

More complicated layouts come with succinct and scalable classes for easy styling and event binding, so you're covered at every step.

+
+
+

Four layouts included

+

Bootstrap comes with support for four types of form layouts:

+
    +
  • Vertical (default)
  • +
  • Search
  • +
  • Inline
  • +
  • Horizontal
  • +
+

Different types of form layouts require some changes to markup, but the controls themselves remain and behave the same.

+
+
+

Control states and more

+

Bootstrap's forms include styles for all the base form controls like input, textarea, and select you'd expect. But it also comes with a number of custom components like appended and prepended inputs and support for lists of checkboxes.

+

States like error, warning, and success are included for each type of form control. Also included are styles for disabled controls.

+
-
-
-
-

Four types of forms

+

Bootstrap provides simple markup and styles for four styles of common web forms.

@@ -823,7 +813,7 @@ Form states - + @@ -841,78 +831,60 @@ Form states
Stacked, left-aligned labels over controls
HoriztonalHorizontal .horizontal-form Float left, right-aligned labels on same line as controls
+

Example forms using just form controls, no extra markup

-

Why four types

-

With Bootstrap 2, we completely recoded our forms to allow for simple base styles and improved namespacing on labels and controls. To address the many uses of forms, we've included some base styles to help get you started.

+

Basic form

+

With v2.0, we have lighter and smarter defaults for form styles. No extra markup, just form controls.

+
+ + + + +
-

Vertical or horizontal

-

Our default form styles are now vertical, not horizontal. This makes it easier to customize bare-bones forms, as well as forms in tricker situations like sign-up, modals, etc. They share the same exact markup; just swap the class.

+

Search form

+

Reflecting default WebKit styles, just add .search-form for extra rounded search fields.

+
+ + +
+
+
+

Inline form

+

Inputs are block level to start. For .inline-form and .horizontal-form, we use inline-block.

+
+ + + +
+ +
+ +

Horizontal forms

-
-

Search form

-
-
-
-
- - -
-
-
-
-
-
-

Inline form

-
-
-
-
-

Some directional text

-

And maybe some kind of optional supporting text right here.

- - - - -
-
-
-
-
-
-

Horizontal form

-
-
+
- Example form section + Controls Bootstrap supports
-

Help text here. Be sure to fill this out like so, or else!

+

In addition to freeform text, any HTML5 text-based input appears like so.

- +
-
- @ - -
-

Here's some help text

-
-
-
- -
-
- - .00 -
-

Here's more help text

+
@@ -939,23 +911,69 @@ Form states
- Example form section +
+ +
+ +
+
+
+ + +
+ +
+
+
+

What's included

+

Shown on the left are all the default form controls we support. Here's the bulleted list:

+
    +
  • text inputs (text, password, email, etc)
  • +
  • checkbox
  • +
  • radio
  • +
  • select
  • +
  • multiple select
  • +
  • file input
  • +
  • textarea
  • +
+
+

New defaults with v2.0

+

Up to v1.4, Bootstrap's default form styles used the horizontal layout. With Bootstrap 2, we removed that constraint to have smarter, more scalable defaults for any form.

+
+
+
+ +
+ +
+
+
+ Form control states
- +
- +
- +
- + +
+
+
+ +
+
@@ -979,6 +997,54 @@ Form states Woohoo!
+
+ + +
+ +
+
+
+

Redesigned browser states

+

Bootstrap features styles for browser-supported focused and disabled states. We remove the default Webkit outline and apply a box-shadow in it's place for :focus.

+
+

Form validation

+

It also includes validation styles for errors, warnings, and success. To use, add the a class to the surrounding .control-group.

+
+<fieldset class="control-group error">
+  ...
+</fieldset>
+
+
+
+ + +
+ +
+
+
+ Extending form controls +
+ +
+
+ @ + +
+

Here's some help text

+
+
+
+ +
+
+ + .00 +
+

Here's more help text

+
+
@@ -994,10 +1060,6 @@ Form states Option three can—yes, you guessed it—also be checked and included in form results -

Note: Labels surround all the options for much larger click areas and a more usable form.

@@ -1010,49 +1072,7 @@ Form states -

Note: Labels surround all the options for much larger click areas and a more usable form.

-
- -
- - -
- -
- -
-
-

Vertical form

-
-
-
- Example form -
- -
- -

Be sure to fill this out like so, or else!

-
-
-
- -
- -
-
-
- -
- - -
@@ -1062,11 +1082,24 @@ Form states
+
+
+

Prepend & append inputs

+

Input groups—with appended or prepended text—provide an easy way to give more context for your inputs. Great examples include the @ sign for Twitter usernames or $ for finances.

+
+

Checkboxes and radios

+

Up to v1.4, Bootstrap required extra markup around checkboxes and radios to stack them. Now, it's a simple matter of repeating the <label class="checkbox"> that wraps the <input type="checkbox">.

+
+
+ -

Buttons

+
+ @@ -1084,7 +1117,7 @@ Form states - + @@ -1094,12 +1127,12 @@ Form states - + - +
Primary .primaryMakes button blue for more visual weight to indicate the primary action in a set of buttonsProvides extra visual weight and identifies the primary action in a set of buttons
Info
Success .successUsed to indicate a successful or positive action will be takenIndicates a successful or positive action
Danger .dangerUsed to indicate a dangerous or potentially negative action will be takenIndicates a dangerous or potentially negative action
@@ -1296,6 +1329,9 @@ Form states +
+

Light red background color is only used to show the dimensions of the icons in the docs.

+

@@ -1328,7 +1364,38 @@ Form states

Examples

-

Button

+
+
+

Use them in buttons, or in button groups for a toolbar style presentation.

+

+ Refresh + Settings +

+
+
+ + + +
+
+ + + + +
+
+
+
+

Or, use them in navigation.

+ +
+
diff --git a/lib/buttons.less b/lib/buttons.less index bc2df0fb63..3fab6e0390 100644 --- a/lib/buttons.less +++ b/lib/buttons.less @@ -35,7 +35,7 @@ .btn { // Button Base display: inline-block; - padding: 5px 14px 6px; + padding: 5px 10px 6px; font-size: @baseFontSize; line-height: normal; color: #333; diff --git a/lib/forms.less b/lib/forms.less index 32acbdaba9..ddd735cc41 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -42,10 +42,11 @@ input, textarea, select, .uneditable-input { - display: inline-block; + display: block; width: 210px; height: @baseLineHeight; padding: 4px; + margin-bottom: 9px; font-size: @baseFontSize; line-height: @baseLineHeight; color: @gray; @@ -177,7 +178,6 @@ select:focus { // Grid style input sizes // This is a duplication of the main grid .columns() mixin, but subtracts 10px to account for input padding and border .formColumns(@columnSpan: 1) { - display: inline-block; float: none; width: ((@gridColumnWidth) * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)) - 10; margin-left: 0; @@ -224,6 +224,7 @@ textarea[readonly] { + // FORM FIELD FEEDBACK STATES // -------------------------- @@ -289,10 +290,10 @@ textarea[readonly] { } // Placeholder text gets special styles; can't be bundled together though for some reason -:-moz-placeholder { +input:-moz-placeholder { color: @grayLight; } -::-webkit-input-placeholder { +input::-webkit-input-placeholder { color: @grayLight; } @@ -301,7 +302,7 @@ textarea[readonly] { // HELP TEXT // --------- -.help-text { +.help-block { margin-top: 5px; margin-bottom: 0; color: @grayLight; @@ -314,12 +315,6 @@ textarea[readonly] { padding-left: 5px; } -// Big blocks of help text -.help-block { - display: block; - max-width: 600px; -} - // INPUT GROUPS @@ -328,6 +323,7 @@ textarea[readonly] { // Allow us to put symbols and text within the input field for a cleaner look .input-prepend, .input-append { + margin-bottom: 5px; .clearfix(); // Clear the float to prevent wrapping input { .border-radius(0 3px 3px 0); @@ -377,6 +373,8 @@ textarea[readonly] { // ----------- .search-form .search-query { + padding-left: 14px; + padding-right: 14px; .border-radius(14px); } @@ -388,6 +386,18 @@ textarea[readonly] { // Common properties // ----------------- +.search-form, +.inline-form, +.horizontal-form { + input, + textarea, + select, + .uneditable-input { + display: inline-block; + margin-bottom: 0; + } +} + // Margin to space out fieldsets .control-group { margin-bottom: @baseLineHeight; diff --git a/lib/mixins.less b/lib/mixins.less index 32d3a83acc..49eabb8751 100644 --- a/lib/mixins.less +++ b/lib/mixins.less @@ -98,7 +98,6 @@ // Necessary grid styles for every column to make them appear next to each other horizontally .gridColumn() { - display: inline; float: left; margin-left: @gridGutterWidth; }