Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip

Conflicts:
	bootstrap-1.3.0.css
This commit is contained in:
Jacob Thornton
2011-09-09 22:48:57 -07:00
5 changed files with 129 additions and 39 deletions

View File

@@ -771,9 +771,9 @@ input[type=submit].btn {
.box-shadow(inset 0 1px 0 #fff);
.clearfix();
margin-bottom: 0;
text-align: right;
.btn {
float: right;
margin-left: 10px;
margin-left: 5px;
}
}