Merge branch '2.2.2-wip' into exploratory

Conflicts:
	less/button-groups.less

1 files changed, 4 insertions, 6 deletions

diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index ebd111fd8..9a7525422 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -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;
-  }
 }