github/bootstrap
1
1
Fork 0
mirror of https://github.com/jasny/bootstrap.git synced 2026-04-24 03:00:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
parent 527d01ce99 f4d3d7da2e
commit ce19e63d5b
65 changed files with 7799 additions and 401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/assets/css/docs.css
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` */