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

Merge branch '2.2.2-wip' into exploratory

Browse Source 
Conflicts:
	less/button-groups.less
This commit is contained in:
Mark Otto
2012-11-22 22:04:21 -08:00
parent fa1c130552 e0d0190803
commit 7e56e2265d
17 changed files with 46 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/assets/css/docs.css
+4 -6
View File
@@ -281,9 +281,10 @@ only screen and ( -o-min-device-pixel-ratio: 2/1) {
line-height: 1.25;
color: #999;
}
.marketing img {
.marketing-img {
display: block;
margin: 0 auto 30px;
max-height: 145px;
}
@@ -292,7 +293,8 @@ only screen and ( -o-min-device-pixel-ratio: 2/1) {
-------------------------------------------------- */
.footer {
padding: 70px 0;
text-align: center;
padding: 30px 0;
margin-top: 70px;
border-top: 1px solid #e5e5e5;
background-color: #f5f5f5;
@@ -988,8 +990,4 @@ form.bs-docs-example {
padding-top: 20px;
padding-bottom: 20px;
}
/* Unfloat the back to top in footer to prevent odd text wrapping */
.footer .pull-right {
float: none;
}
}