2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-11 18:02:28 +03:00

Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

Conflicts:
	_layouts/customize.html
This commit is contained in:
Jacob Thornton
2013-08-07 23:10:11 -07:00
34 changed files with 495 additions and 200 deletions
+3 -3
View File
@@ -124,7 +124,7 @@ body {
/* Download button */
.bs-masthead .btn-outline {
margin-top: 20px;
margin-bottom: 5px;
margin-bottom: 20px;
padding: 18px 24px;
font-size: 21px;
}
@@ -208,8 +208,8 @@ body {
position: relative;
}
.bs-docs-section + .bs-docs-section {
margin-top: 80px;
.bs-docs-section h1[id] {
padding-top: 80px;
}
/* Ads in page headers */