Merge branch '3.0.0-wip' into bs3_homepage

Conflicts:
	dist/css/bootstrap.min.css
	getting-started.html

1 files changed, 13 insertions, 5 deletions

diff --git a/assets/css/docs.css b/assets/css/docs.css
index f395682c5..3796b7089 100644
--- a/assets/css/docs.css
+++ b/assets/css/docs.css
@@ -138,7 +138,7 @@ body {
 .bs-masthead-links {
   margin-top: 20px;
   margin-bottom: 20px;
-  padding-left: 0;
+  padding: 0 15px;
   list-style: none;
 }
 .bs-masthead-links li {
@@ -417,7 +417,7 @@ body {
 .bs-example > blockquote:last-child,
 .bs-example > .form-control:last-child,
 .bs-example > .table:last-child,
-.bs-example > .navbar:last-child
+.bs-example > .navbar:last-child,
 .bs-example > .jumbotron:last-child,
 .bs-example > .alert:last-child,
 .bs-example > .panel:last-child,
@@ -534,6 +534,12 @@ body {
   }
 }
 
+/* Pagination */
+.bs-example .pagination {
+  margin-top: 10px;
+  margin-bottom: 10px;
+}
+
 /* Example modals */
 .bs-example-modal {
   background-color: #f5f5f5;
@@ -735,9 +741,7 @@ body {
 .bs-social-buttons li {
   display: inline-block;
   line-height: 1;
-}
-.bs-social-buttons li + li {
-  margin-left: 15px;
+  padding: 5px 8px;
 }
 .bs-social-buttons .twitter-follow-button {
   width: 225px !important;
@@ -849,6 +853,10 @@ body {
     border-bottom-right-radius: 4px;
   }
 
+  .bs-masthead-links {
+    padding: 0;
+  }
+
   .carbonad {
     margin: 0 !important;
     border: 1px solid #463265 !important;