rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-28 00:54:30 +01:00
Code Issues Actions Packages Releases Activity

make horizontal form labels map to default grid sizing

Browse Source
This commit is contained in:
Mark Otto 2012-01-15 11:33:30 -08:00
parent fe160261e4
commit 9f732e90d4
3 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bootstrap.css vendored
View File

@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Designed and built with all the love in the world @twitter by @mdo and @fat. * 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 { html, body {
margin: 0; margin: 0;
@ -963,20 +963,17 @@ input::-webkit-input-placeholder {
.control-group { .control-group {
margin-bottom: 18px; margin-bottom: 18px;
} }
.control-group > label {
font-weight: bold;
}
.form-horizontal .control-group > label { .form-horizontal .control-group > label {
float: left; float: left;
width: 130px; width: 120px;
padding-top: 5px; padding-top: 5px;
text-align: right; text-align: right;
} }
.form-horizontal .controls { .form-horizontal .controls {
margin-left: 150px; margin-left: 140px;
} }
.form-horizontal .form-actions { .form-horizontal .form-actions {
padding-left: 150px; padding-left: 140px;
} }
table { table {
width: 100%; width: 100%;

7
bootstrap.min.css vendored
View File

@ -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 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;} .form-search label,.form-inline label{display:inline-block;}
.control-group{margin-bottom:18px;} .control-group{margin-bottom:18px;}
.control-group>label{font-weight:bold;} .form-horizontal .control-group>label{float:left;width:120px;padding-top:5px;text-align:right;}
.form-horizontal .control-group>label{float:left;width:130px;padding-top:5px;text-align:right;} .form-horizontal .controls{margin-left:140px;}
.form-horizontal .controls{margin-left:150px;} .form-horizontal .form-actions{padding-left:140px;}
.form-horizontal .form-actions{padding-left:150px;}
table{width:100%;margin-bottom:18px;} table{width:100%;margin-bottom:18px;}
th,td{padding:8px;line-height:18px;text-align:left;border-top:1px solid #ddd;} th,td{padding:8px;line-height:18px;text-align:left;border-top:1px solid #ddd;}
th{font-weight:bold;vertical-align:bottom;} th{font-weight:bold;vertical-align:bottom;}

10
lib/forms.less
View File

@ -461,10 +461,6 @@ input::-webkit-input-placeholder {
.control-group { .control-group {
margin-bottom: @baseLineHeight; margin-bottom: @baseLineHeight;
} }
// Bold the labels so they stand out
.control-group > label {
font-weight: bold;
}
// Horizontal-specific styles // Horizontal-specific styles
// -------------------------- // --------------------------
@ -473,16 +469,16 @@ input::-webkit-input-placeholder {
// Float the labels left // Float the labels left
.control-group > label { .control-group > label {
float: left; float: left;
width: 130px; width: 120px;
padding-top: 5px; padding-top: 5px;
text-align: right; text-align: right;
} }
// Move over all input controls and content // Move over all input controls and content
.controls { .controls {
margin-left: 150px; margin-left: 140px;
} }
// Move over buttons in .form-actions to align with .controls // Move over buttons in .form-actions to align with .controls
.form-actions { .form-actions {
padding-left: 150px; padding-left: 140px;
} }
} }