2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-27 14:46:01 +03:00

resolve conflicts

This commit is contained in:
Mark Otto
2011-08-21 20:51:13 -07:00
7 changed files with 802 additions and 689 deletions
+7
View File
@@ -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;