diff options
| author | Jacob Thornton <[email protected]> | 2011-09-12 11:14:35 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2011-09-12 11:14:35 -0700 |
| commit | 7396cb8c51c3bc919a60b960770629a6749a5159 (patch) | |
| tree | 298f98d39a4a00cbb339b7d978566d3a45bd15c6 /lib | |
| parent | 1645b57efe01d7f2ebc5d28d527a00f1222d0070 (diff) | |
| parent | 72ce695cfdac130b998a21b42490aad53a91ef8b (diff) | |
| download | bootstrap-7396cb8c51c3bc919a60b960770629a6749a5159.tar.xz bootstrap-7396cb8c51c3bc919a60b960770629a6749a5159.zip | |
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/forms.less | 4 | ||||
| -rw-r--r-- | lib/patterns.less | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/forms.less b/lib/forms.less index 5b19129f8..d15dfded4 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -153,7 +153,7 @@ select:focus { } // Error styles -form div.error { +form div.clearfix.error { background: lighten(@red, 57%); padding: 10px 0; margin: -10px 0 10px; @@ -443,7 +443,7 @@ textarea[readonly] { } } } - div.error { + div.clearfix.error { padding-top: 10px; padding-bottom: 10px; padding-left: 10px; diff --git a/lib/patterns.less b/lib/patterns.less index 4fb1558e5..46c1b1cbd 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -779,8 +779,8 @@ input[type=submit].btn { .box-shadow(inset 0 1px 0 #fff); .clearfix(); margin-bottom: 0; - text-align: right; .btn { + float: right; margin-left: 5px; } } |