From: Mark Otto <markdotto@gmail.com>
Date: Tue, 6 Sep 2016 05:41:10 +0000 (-0700)
Subject: ads in content, sidebar changes, etc
X-Git-Tag: v4.0.0-beta~194
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11d52ba9498990483d822a5a42d371393a110080;p=thirdparty%2Fbootstrap.git

ads in content, sidebar changes, etc
---

diff --git a/docs/assets/scss/_ads.scss b/docs/assets/scss/_ads.scss
index 237b1e70b7..efb91e5652 100644
--- a/docs/assets/scss/_ads.scss
+++ b/docs/assets/scss/_ads.scss
@@ -48,3 +48,22 @@
   display: block;
   color: #cdbfe3 !important;
 }
+
+.bd-content {
+  #carbonads {
+    position: static;
+    max-width: 400px;
+    margin: 2rem 0;
+    line-height: 1.4;
+    background-color: #f5f5f5;
+    border: 0;
+
+    a {
+      color: #333;
+    }
+
+    .carbon-poweredby {
+      color: #777 !important;
+    }
+  }
+}
diff --git a/docs/assets/scss/_content.scss b/docs/assets/scss/_content.scss
index 41f429b009..b08477b7f1 100644
--- a/docs/assets/scss/_content.scss
+++ b/docs/assets/scss/_content.scss
@@ -65,8 +65,8 @@
 }
 
 .bd-title {
-  margin-top: 2rem;
-  margin-bottom: 2rem;
+  margin-top: 1rem;
+  margin-bottom: 1rem;
   font-weight: 300;
 
   @include media-breakpoint-up(sm) {
diff --git a/docs/assets/scss/_nav.scss b/docs/assets/scss/_nav.scss
index e1589e13ef..51758485cb 100644
--- a/docs/assets/scss/_nav.scss
+++ b/docs/assets/scss/_nav.scss
@@ -7,6 +7,7 @@
   padding-left: 0;
   margin-bottom: 2rem;
   border-bottom: 1px solid rgba(0,0,0,.1);
+  box-shadow: 0 6px 12px rgba(0,0,0,.05);
 
   .navbar-nav {
     .nav-link {
diff --git a/docs/assets/scss/_sidebar.scss b/docs/assets/scss/_sidebar.scss
index 302c04c974..3986bc65eb 100644
--- a/docs/assets/scss/_sidebar.scss
+++ b/docs/assets/scss/_sidebar.scss
@@ -6,17 +6,18 @@
   @include media-breakpoint-up(md) {
     position: sticky;
     top: 2rem;
+    max-height: calc(100vh - 4rem);
+    overflow-y: auto;
   }
 }
 
 .bd-search {
   position: relative;
-  margin-bottom: 1.5rem;
 
   .form-control {
-    height: 2.45rem;
-    padding-top: .4rem;
-    padding-bottom: .4rem;
+    // height: 2.45rem;
+    // padding-top: .4rem;
+    // padding-bottom: .4rem;
     background-color: #fafafa;
 
     &:focus {
@@ -63,7 +64,9 @@
 
 .bd-toc-link {
   display: block;
-  padding: .25rem .75rem;
+  padding-top: .25rem;
+  padding-bottom: .25rem;
+  // padding: .25rem .75rem;
   color: $gray;
 }
 .bd-toc-link:hover,
@@ -93,7 +96,9 @@
 // All levels of nav
 .bd-sidebar .nav > li > a {
   display: block;
-  padding: .25rem .75rem;
+  padding-top: .25rem;
+  padding-bottom: .25rem;
+  // padding: .25rem .75rem;
   font-size: 90%;
   color: #99979c;
 }