aboutsummaryrefslogtreecommitdiff
path: root/lib/forms.less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2011-08-21 20:51:13 -0700
committerMark Otto <[email protected]>2011-08-21 20:51:13 -0700
commit23ec21d0498a4a5c18dcbef9ec835bb0ef80aa22 (patch)
treee5e5f2ac156351d93f007fd9b399c0a6a6c01b5a /lib/forms.less
parentb59b82b032b2ef868e113b40014f36ff0d22adcd (diff)
parenta98d2cccb8076b106e08e7ca76e59af013ab2851 (diff)
downloadbootstrap-23ec21d0498a4a5c18dcbef9ec835bb0ef80aa22.tar.xz
bootstrap-23ec21d0498a4a5c18dcbef9ec835bb0ef80aa22.zip
resolve conflicts
Diffstat (limited to 'lib/forms.less')
-rw-r--r--lib/forms.less7
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/forms.less b/lib/forms.less
index 3a847ae84..d528bcd3f 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -342,6 +342,13 @@ form.form-stacked {
}
}
}
+ .error {
+ padding-top: 10px;
+ padding-bottom: 10px;
+ padding-left: 10px;
+ margin-top: 0;
+ margin-left: -10px;
+ }
.actions {
margin-left: -20px;
padding-left: 20px;