aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-01-15 12:53:35 -0800
committerMark Otto <[email protected]>2012-01-15 12:53:35 -0800
commitf43f2c0ea269e72251e7f858b44ccef966d079af (patch)
treef7af1d72f9a4ace87baf77c1afb50c5c7ded7f90
parent6077b7678c8d21eeb4bc33bbfede20a4cc41fa11 (diff)
downloadbootstrap-f43f2c0ea269e72251e7f858b44ccef966d079af.tar.xz
bootstrap-f43f2c0ea269e72251e7f858b44ccef966d079af.zip
fix grid sized horizontal form layout
-rw-r--r--bootstrap.css8
-rw-r--r--bootstrap.min.css6
-rw-r--r--lib/forms.less6
3 files changed, 10 insertions, 10 deletions
diff --git a/bootstrap.css b/bootstrap.css
index 798f808b3..a57618dc0 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:41:37 PST 2012
+ * Date: Sun Jan 15 12:53:17 PST 2012
*/
html, body {
margin: 0;
@@ -965,15 +965,15 @@ input::-webkit-input-placeholder {
}
.form-horizontal .control-group > label {
float: left;
- width: 120px;
+ width: 140px;
padding-top: 5px;
text-align: right;
}
.form-horizontal .controls {
- margin-left: 140px;
+ margin-left: 160px;
}
.form-horizontal .form-actions {
- padding-left: 140px;
+ padding-left: 160px;
}
table {
width: 100%;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 04e3d6138..1ef582c03 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -172,9 +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;}
-.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;}
+.form-horizontal .control-group>label{float:left;width:140px;padding-top:5px;text-align:right;}
+.form-horizontal .controls{margin-left:160px;}
+.form-horizontal .form-actions{padding-left:160px;}
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 ef4804afc..703accff8 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -469,16 +469,16 @@ input::-webkit-input-placeholder {
// Float the labels left
.control-group > label {
float: left;
- width: 120px;
+ width: 140px;
padding-top: 5px;
text-align: right;
}
// Move over all input controls and content
.controls {
- margin-left: 140px;
+ margin-left: 160px;
}
// Move over buttons in .form-actions to align with .controls
.form-actions {
- padding-left: 140px;
+ padding-left: 160px;
}
}