aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2011-08-20 23:56:32 -0700
committerMark Otto <[email protected]>2011-08-20 23:56:32 -0700
commit6db39d0ec3b48e299f8ced16e06bfa9e912b6be6 (patch)
treec5b56516ed8ab268ccfa6e24761b014fbb6ca672
parent79bdb80543702348976a9cbd0c0b9bd2472fb148 (diff)
downloadbootstrap-6db39d0ec3b48e299f8ced16e06bfa9e912b6be6.tar.xz
bootstrap-6db39d0ec3b48e299f8ced16e06bfa9e912b6be6.zip
fix error styles a bit on stacked form fields
-rw-r--r--bootstrap-1.0.0.css9
-rw-r--r--bootstrap-1.0.0.min.css1
-rw-r--r--docs/index.html7
-rw-r--r--lib/forms.less7
4 files changed, 23 insertions, 1 deletions
diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css
index ae25e3066..ba4111d9a 100644
--- a/bootstrap-1.0.0.css
+++ b/bootstrap-1.0.0.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: Sat Aug 20 23:46:35 PDT 2011
+ * Date: Sat Aug 20 23:56:06 PDT 2011
*/
/* Reset.less
* Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
@@ -969,6 +969,13 @@ form.form-stacked ul.inputs-list li label {
font-weight: normal;
padding-top: 0;
}
+form.form-stacked div.error {
+ padding-top: 10px;
+ padding-bottom: 10px;
+ padding-left: 10px;
+ margin-top: 0;
+ margin-left: -10px;
+}
form.form-stacked div.actions {
margin-left: -20px;
padding-left: 20px;
diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css
index 1c4eec5e6..d98fccf2f 100644
--- a/bootstrap-1.0.0.min.css
+++ b/bootstrap-1.0.0.min.css
@@ -130,6 +130,7 @@ form.form-stacked legend{margin-left:0;}
form.form-stacked label{display:block;float:none;width:auto;font-weight:bold;text-align:left;line-height:20px;padding-top:0;}
form.form-stacked div.clearfix{margin-bottom:9px;}form.form-stacked div.clearfix div.input{margin-left:0;}
form.form-stacked ul.inputs-list{margin-bottom:0;}form.form-stacked ul.inputs-list li{padding-top:0;}form.form-stacked ul.inputs-list li label{font-weight:normal;padding-top:0;}
+form.form-stacked div.error{padding-top:10px;padding-bottom:10px;padding-left:10px;margin-top:0;margin-left:-10px;}
form.form-stacked div.actions{margin-left:-20px;padding-left:20px;}
table{width:100%;margin-bottom:18px;padding:0;text-align:left;border-collapse:separate;font-size:13px;}table th,table td{padding:10px 10px 9px;line-height:13.5px;vertical-align:middle;border-bottom:1px solid #ddd;}
table th{padding-top:9px;font-weight:bold;border-bottom-width:2px;}
diff --git a/docs/index.html b/docs/index.html
index b53037cd8..940478c2d 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -824,6 +824,13 @@
</fieldset>
<fieldset>
<legend>Example form legend</legend>
+ <div class="clearfix error">
+ <label for="xlInput">X-Large Input</label>
+ <div class="input">
+ <input class="xlarge error" id="xlInput" name="xlInput" size="30" type="text" />
+ <span class="help-inline">Small snippet of help text</span>
+ </div>
+ </div> <!-- /clearfix -->
<div class="clearfix">
<label id="optionsCheckboxes">List of Options</label>
<div class="input">
diff --git a/lib/forms.less b/lib/forms.less
index f958693fc..ae67acd00 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -342,6 +342,13 @@ form.form-stacked {
}
}
}
+ div.error {
+ padding-top: 10px;
+ padding-bottom: 10px;
+ padding-left: 10px;
+ margin-top: 0;
+ margin-left: -10px;
+ }
div.actions {
margin-left: -20px;
padding-left: 20px;