2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-15 11:59:39 +03:00

Merge branch '2.1.2-wip' into box-sizing-exercise

Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/base-css.html
	docs/templates/pages/base-css.mustache
	less/forms.less
	less/mixins.less
This commit is contained in:
Mark Otto
2012-09-25 22:00:41 -07:00
65 changed files with 7799 additions and 401 deletions
+1 -1
View File
@@ -133,7 +133,7 @@ hr.soften {
/* Download button */
.masthead .btn {
padding: 14px 24px;
padding: 19px 24px;
font-size: 24px;
font-weight: 200;
color: #fff; /* redeclare to override the `.jumbotron a` */