]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
ads in content, sidebar changes, etc
authorMark Otto <markdotto@gmail.com>
Tue, 6 Sep 2016 05:41:10 +0000 (22:41 -0700)
committerMark Otto <markdotto@gmail.com>
Tue, 6 Sep 2016 05:41:10 +0000 (22:41 -0700)
docs/assets/scss/_ads.scss
docs/assets/scss/_content.scss
docs/assets/scss/_nav.scss
docs/assets/scss/_sidebar.scss

index 237b1e70b7519837024b623558f7ab78b2c7f931..efb91e5652014db5de33ee0fe764e07553381ec7 100644 (file)
   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;
+    }
+  }
+}
index 41f429b0093fdc415e15b99cf6e56075421c7c85..b08477b7f12889981f56fa80074e5770a2ef206a 100644 (file)
@@ -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) {
index e1589e13efcf19b187faec64b8f0e5b7b9e1b4d5..51758485cbe8c0b3450432cb237b55efd7268e55 100644 (file)
@@ -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 {
index 302c04c974bc248b53cbd6ce262104989870b4a0..3986bc65eb07d253f2f67535ae39b8b59a1fee5e 100644 (file)
@@ -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;
 }