2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-30 15:24:08 +03:00

Merge branch 'master' of github.com:twitter/bootstrap

Conflicts:
	bootstrap-1.0.0.css
	bootstrap-1.0.0.min.css
	docs/index.html
This commit is contained in:
Jacob Thornton
2011-08-21 21:42:56 -07:00
7 changed files with 798 additions and 432 deletions
+8 -1
View File
@@ -114,7 +114,7 @@ form {
}
// Error styles
.error {
div.error {
background: lighten(@red, 57%);
padding: 10px 0;
margin: -10px 0 10px;
@@ -353,6 +353,13 @@ form.form-stacked {
}
}
}
div.error {
padding-top: 10px;
padding-bottom: 10px;
padding-left: 10px;
margin-top: 0;
margin-left: -10px;
}
.actions {
margin-left: -20px;
padding-left: 20px;