diff --git a/bootstrap.css b/bootstrap.css index c61c20987f..a11fed8952 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: Sun Jan 15 11:29:00 PST 2012 + * Date: Sun Jan 15 11:32:55 PST 2012 */ html, body { margin: 0; @@ -963,20 +963,17 @@ input::-webkit-input-placeholder { .control-group { margin-bottom: 18px; } -.control-group > label { - font-weight: bold; -} .form-horizontal .control-group > label { float: left; - width: 130px; + width: 120px; padding-top: 5px; text-align: right; } .form-horizontal .controls { - margin-left: 150px; + margin-left: 140px; } .form-horizontal .form-actions { - padding-left: 150px; + padding-left: 140px; } table { width: 100%; diff --git a/bootstrap.min.css b/bootstrap.min.css index ceec492dbd..524ac7f098 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -172,10 +172,9 @@ input::-webkit-input-placeholder{color:#999999;} .form-search input,.form-inline input,.form-horizontal input,.form-search textarea,.form-inline textarea,.form-horizontal textarea,.form-search select,.form-inline select,.form-horizontal select,.form-search .uneditable-input,.form-inline .uneditable-input,.form-horizontal .uneditable-input{display:inline-block;margin-bottom:0;} .form-search label,.form-inline label{display:inline-block;} .control-group{margin-bottom:18px;} -.control-group>label{font-weight:bold;} -.form-horizontal .control-group>label{float:left;width:130px;padding-top:5px;text-align:right;} -.form-horizontal .controls{margin-left:150px;} -.form-horizontal .form-actions{padding-left:150px;} +.form-horizontal .control-group>label{float:left;width:120px;padding-top:5px;text-align:right;} +.form-horizontal .controls{margin-left:140px;} +.form-horizontal .form-actions{padding-left:140px;} table{width:100%;margin-bottom:18px;} th,td{padding:8px;line-height:18px;text-align:left;border-top:1px solid #ddd;} th{font-weight:bold;vertical-align:bottom;} diff --git a/lib/forms.less b/lib/forms.less index 04e684c99c..ef4804afc3 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -461,10 +461,6 @@ input::-webkit-input-placeholder { .control-group { margin-bottom: @baseLineHeight; } -// Bold the labels so they stand out -.control-group > label { - font-weight: bold; -} // Horizontal-specific styles // -------------------------- @@ -473,16 +469,16 @@ input::-webkit-input-placeholder { // Float the labels left .control-group > label { float: left; - width: 130px; + width: 120px; padding-top: 5px; text-align: right; } // Move over all input controls and content .controls { - margin-left: 150px; + margin-left: 140px; } // Move over buttons in .form-actions to align with .controls .form-actions { - padding-left: 150px; + padding-left: 140px; } }