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

mdo · mdo · commit e27b1355b583 · 2012-08-28T10:12:04.000-07:00
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
@@ -743,7 +743,7 @@ dd {
 
 .dl-horizontal dt {
   float: left;
-  width: 120px;
+  width: 160px;
   overflow: hidden;
   clear: left;
   text-align: right;
@@ -752,7 +752,7 @@ dd {
 }
 
 .dl-horizontal dd {
-  margin-left: 130px;
+  margin-left: 180px;
 }
 
 hr {
@@ -1775,20 +1775,20 @@ legend + .control-group {
 
 .form-horizontal .control-label {
   float: left;
-  width: 140px;
+  width: 160px;
   padding-top: 5px;
   text-align: right;
 }
 
 .form-horizontal .controls {
   *display: inline-block;
   *padding-left: 20px;
-  margin-left: 160px;
+  margin-left: 180px;
   *margin-left: 0;
 }
 
 .form-horizontal .controls:first-child {
-  *padding-left: 160px;
+  *padding-left: 180px;
 }
 
 .form-horizontal .help-block {
@@ -1802,7 +1802,7 @@ legend + .control-group {
 }
 
 .form-horizontal .form-actions {
-  padding-left: 160px;
+  padding-left: 180px;
 }
 
 table {
diff --git a/docs/assets/js/bootstrap.min.js b/docs/assets/js/bootstrap.min.js
diff --git a/less/forms.less b/less/forms.less
@@ -615,7 +615,7 @@ legend + .control-group {
   // Float the labels left
   .control-label {
     float: left;
-    width: 140px;
+    width: @horizontalComponentOffset - 20;
     padding-top: 5px;
     text-align: right;
   }
@@ -625,10 +625,10 @@ legend + .control-group {
     // don't inherit the margin of the parent, in this case .controls
     *display: inline-block;
     *padding-left: 20px;
-    margin-left: 160px;
+    margin-left: @horizontalComponentOffset;
     *margin-left: 0;
     &:first-child {
-      *padding-left: 160px;
+      *padding-left: @horizontalComponentOffset;
     }
   }
   // 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
   .form-actions {
-    padding-left: 160px;
+    padding-left: @horizontalComponentOffset;
   }
 }
diff --git a/less/type.less b/less/type.less
@@ -119,13 +119,13 @@ dd {
   .clearfix(); // Ensure dl clears floats if empty dd elements present
   dt {
     float: left;
-    width: 120px;
+    width: @horizontalComponentOffset - 20;
     clear: left;
     text-align: right;
     .text-overflow();
   }
   dd {
-    margin-left: 130px;
+    margin-left: @horizontalComponentOffset;
   }
 }
 
diff --git a/less/variables.less b/less/variables.less
@@ -144,6 +144,11 @@
 @hrBorder:                @grayLighter;
 
 
+// Horizontal forms & lists
+// -------------------------
+@horizontalComponentOffset:       180px;
+
+
 // Wells
 // -------------------------
 @wellBackground:                  #f5f5f5;

Original file line number	Diff line number	Diff line change
`@@ -743,7 +743,7 @@ dd {`
`743`	`743`
`744`	`744`	`.dl-horizontal dt {`
`745`	`745`	`float: left;`
`746`		`- width: 120px;`
	`746`	`+ width: 160px;`
`747`	`747`	`overflow: hidden;`
`748`	`748`	`clear: left;`
`749`	`749`	`text-align: right;`
`@@ -752,7 +752,7 @@ dd {`
`752`	`752`	`}`
`753`	`753`
`754`	`754`	`.dl-horizontal dd {`
`755`		`- margin-left: 130px;`
	`755`	`+ margin-left: 180px;`
`756`	`756`	`}`
`757`	`757`
`758`	`758`	`hr {`
`@@ -1775,20 +1775,20 @@ legend + .control-group {`
`1775`	`1775`
`1776`	`1776`	`.form-horizontal .control-label {`
`1777`	`1777`	`float: left;`
`1778`		`- width: 140px;`
	`1778`	`+ width: 160px;`
`1779`	`1779`	`padding-top: 5px;`
`1780`	`1780`	`text-align: right;`
`1781`	`1781`	`}`
`1782`	`1782`
`1783`	`1783`	`.form-horizontal .controls {`
`1784`	`1784`	`*display: inline-block;`
`1785`	`1785`	`*padding-left: 20px;`
`1786`		`- margin-left: 160px;`
	`1786`	`+ margin-left: 180px;`
`1787`	`1787`	`*margin-left: 0;`
`1788`	`1788`	`}`
`1789`	`1789`
`1790`	`1790`	`.form-horizontal .controls:first-child {`
`1791`		`- *padding-left: 160px;`
	`1791`	`+ *padding-left: 180px;`
`1792`	`1792`	`}`
`1793`	`1793`
`1794`	`1794`	`.form-horizontal .help-block {`
`@@ -1802,7 +1802,7 @@ legend + .control-group {`
`1802`	`1802`	`}`
`1803`	`1803`
`1804`	`1804`	`.form-horizontal .form-actions {`
`1805`		`- padding-left: 160px;`
	`1805`	`+ padding-left: 180px;`
`1806`	`1806`	`}`
`1807`	`1807`
`1808`	`1808`	`table {`
Original file line number	Diff line number	Diff line change
`@@ -615,7 +615,7 @@ legend + .control-group {`
`615`	`615`	`// Float the labels left`
`616`	`616`	`.control-label {`
`617`	`617`	`float: left;`
`618`		`- width: 140px;`
	`618`	`+ width: @horizontalComponentOffset - 20;`
`619`	`619`	`padding-top: 5px;`
`620`	`620`	`text-align: right;`
`621`	`621`	`}`
`@@ -625,10 +625,10 @@ legend + .control-group {`
`625`	`625`	`// don't inherit the margin of the parent, in this case .controls`
`626`	`626`	`*display: inline-block;`
`627`	`627`	`*padding-left: 20px;`
`628`		`- margin-left: 160px;`
	`628`	`+ margin-left: @horizontalComponentOffset;`
`629`	`629`	`*margin-left: 0;`
`630`	`630`	`&:first-child {`
`631`		`- *padding-left: 160px;`
	`631`	`+ *padding-left: @horizontalComponentOffset;`
`632`	`632`	`}`
`633`	`633`	`}`
`634`	`634`	`// Remove bottom margin on block level help text since that's accounted for on .control-group`
`@@ -645,6 +645,6 @@ legend + .control-group {`
`645`	`645`	`}`
`646`	`646`	`// Move over buttons in .form-actions to align with .controls`
`647`	`647`	`.form-actions {`
`648`		`- padding-left: 160px;`
	`648`	`+ padding-left: @horizontalComponentOffset;`
`649`	`649`	`}`
`650`	`650`	`}`
Original file line number	Diff line number	Diff line change
`@@ -119,13 +119,13 @@ dd {`
`119`	`119`	`.clearfix(); // Ensure dl clears floats if empty dd elements present`
`120`	`120`	`dt {`
`121`	`121`	`float: left;`
`122`		`- width: 120px;`
	`122`	`+ width: @horizontalComponentOffset - 20;`
`123`	`123`	`clear: left;`
`124`	`124`	`text-align: right;`
`125`	`125`	`.text-overflow();`
`126`	`126`	`}`
`127`	`127`	`dd {`
`128`		`- margin-left: 130px;`
	`128`	`+ margin-left: @horizontalComponentOffset;`
`129`	`129`	`}`
`130`	`130`	`}`
`131`	`131`