Merge branch 'master' into boulox-responsive-embed

Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/docs.min.js
	docs/css.html
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css

1 files changed, 19 insertions, 7 deletions

diff --git a/docs/examples/dashboard/dashboard.css b/docs/examples/dashboard/dashboard.css
index 750124bf8..e0e3632b8 100644
--- a/docs/examples/dashboard/dashboard.css
+++ b/docs/examples/dashboard/dashboard.css
@@ -17,6 +17,13 @@ body {
   border-bottom: 1px solid #eee;
 }
 
+/*
+ * Top navigation
+ * Hide default border to remove 1px line.
+ */
+.navbar-fixed-top {
+  border: 0;
+}
 
 /*
  * Sidebar
@@ -29,12 +36,14 @@ body {
 @media (min-width: 768px) {
   .sidebar {
     position: fixed;
-    top: 0;
-    left: 0;
+    top: 51px;
     bottom: 0;
+    left: 0;
     z-index: 1000;
     display: block;
-    padding: 70px 20px 20px;
+    padding: 20px;
+    overflow-x: hidden;
+    overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */
     background-color: #f5f5f5;
     border-right: 1px solid #eee;
   }
@@ -42,15 +51,17 @@ body {
 
 /* Sidebar navigation */
 .nav-sidebar {
-  margin-left: -20px;
   margin-right: -21px; /* 20px padding + 1px border */
   margin-bottom: 20px;
+  margin-left: -20px;
 }
 .nav-sidebar > li > a {
-  padding-left: 20px;
   padding-right: 20px;
+  padding-left: 20px;
 }
-.nav-sidebar > .active > a {
+.nav-sidebar > .active > a,
+.nav-sidebar > .active > a:hover,
+.nav-sidebar > .active > a:focus {
   color: #fff;
   background-color: #428bca;
 }
@@ -65,8 +76,8 @@ body {
 }
 @media (min-width: 768px) {
   .main {
+    padding-right: 40px;
     padding-left: 40px;
-    pading-right: 40px;
   }
 }
 .main .page-header {
@@ -89,5 +100,6 @@ body {
   margin-bottom: 20px;
 }
 .placeholder img {
+  display: inline-block;
   border-radius: 50%;
 }