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

fixes #4771: widen .form-horizontal labels and .dl-horizontal terms given larger font-size of 2.1.0

Browse Source
This commit is contained in:
Mark Otto 2012-08-28 10:12:04 -07:00
parent 545edf5459
commit e27b1355b5
5 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docs/assets/css/bootstrap.css vendored
View File

@ -743,7 +743,7 @@ dd {
.dl-horizontal dt { .dl-horizontal dt {
float: left; float: left;
width: 120px; width: 160px;
overflow: hidden; overflow: hidden;
clear: left; clear: left;
text-align: right; text-align: right;
@ -752,7 +752,7 @@ dd {
} }
.dl-horizontal dd { .dl-horizontal dd {
margin-left: 130px; margin-left: 180px;
} }
hr { hr {
@ -1775,7 +1775,7 @@ legend + .control-group {
.form-horizontal .control-label { .form-horizontal .control-label {
float: left; float: left;
width: 140px; width: 160px;
padding-top: 5px; padding-top: 5px;
text-align: right; text-align: right;
} }
@ -1783,12 +1783,12 @@ legend + .control-group {
.form-horizontal .controls { .form-horizontal .controls {
*display: inline-block; *display: inline-block;
*padding-left: 20px; *padding-left: 20px;
margin-left: 160px; margin-left: 180px;
*margin-left: 0; *margin-left: 0;
} }
.form-horizontal .controls:first-child { .form-horizontal .controls:first-child {
*padding-left: 160px; *padding-left: 180px;
} }
.form-horizontal .help-block { .form-horizontal .help-block {
@ -1802,7 +1802,7 @@ legend + .control-group {
} }
.form-horizontal .form-actions { .form-horizontal .form-actions {
padding-left: 160px; padding-left: 180px;
} }
table { table {

2
docs/assets/js/bootstrap.min.js vendored
View File

File diff suppressed because one or more lines are too long

8
less/forms.less
View File

@ -615,7 +615,7 @@ legend + .control-group {
// Float the labels left // Float the labels left
.control-label { .control-label {
float: left; float: left;
width: 140px; width: @horizontalComponentOffset - 20;
padding-top: 5px; padding-top: 5px;
text-align: right; text-align: right;
} }
@ -625,10 +625,10 @@ legend + .control-group {
// don't inherit the margin of the parent, in this case .controls // don't inherit the margin of the parent, in this case .controls
*display: inline-block; *display: inline-block;
*padding-left: 20px; *padding-left: 20px;
margin-left: 160px; margin-left: @horizontalComponentOffset;
*margin-left: 0; *margin-left: 0;
&:first-child { &:first-child {
*padding-left: 160px; *padding-left: @horizontalComponentOffset;
} }
} }
// Remove bottom margin on block level help text since that's accounted for on .control-group // Remove bottom margin on block level help text since that's accounted for on .control-group
@ -645,6 +645,6 @@ legend + .control-group {
} }
// 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: 160px; padding-left: @horizontalComponentOffset;
} }
} }

4
less/type.less
View File

@ -119,13 +119,13 @@ dd {
.clearfix(); // Ensure dl clears floats if empty dd elements present .clearfix(); // Ensure dl clears floats if empty dd elements present
dt { dt {
float: left; float: left;
width: 120px; width: @horizontalComponentOffset - 20;
clear: left; clear: left;
text-align: right; text-align: right;
.text-overflow(); .text-overflow();
} }
dd { dd {
margin-left: 130px; margin-left: @horizontalComponentOffset;
} }
} }

5
less/variables.less
View File

@ -144,6 +144,11 @@
@hrBorder: @grayLighter; @hrBorder: @grayLighter;
// Horizontal forms & lists
// -------------------------
@horizontalComponentOffset: 180px;
// Wells // Wells
// ------------------------- // -------------------------
@wellBackground: #f5f5f5; @wellBackground: #f5f5f5;