Merge branch 'twbs/v4-dev' into v4-dev

1 files changed, 63 insertions, 55 deletions

diff --git a/docs/assets/css/docs.min.css b/docs/assets/css/docs.min.css
index 3d4f5a396..e2c4402b9 100644
--- a/docs/assets/css/docs.min.css
+++ b/docs/assets/css/docs.min.css
@@ -1,5 +1,5 @@
 /*!
- * Bootstrap Docs (http://getbootstrap.com)
+ * Bootstrap Docs (https://getbootstrap.com)
  * Copyright 2011-2016 The Bootstrap Authors
  * Copyright 2011-2016 Twitter, Inc.
  * Licensed under the Creative Commons Attribution 3.0 Unported License. For
@@ -113,7 +113,7 @@
   margin-bottom: -2rem !important;
 }
 
-@media (min-width: 544px) {
+@media (min-width: 576px) {
   .bd-masthead {
     padding-top: 8rem;
     padding-bottom: 2rem;
@@ -174,7 +174,7 @@
   text-align: center;
 }
 
-@media (min-width: 544px) {
+@media (min-width: 576px) {
   .bd-featurette {
     text-align: left;
   }
@@ -202,7 +202,7 @@
   margin: 2.5rem auto;
 }
 
-@media (min-width: 544px) {
+@media (min-width: 576px) {
   .half-rule {
     margin-right: 0;
     margin-left: 0;
@@ -281,64 +281,54 @@
   }
 }
 
-.carbonad {
-  width: auto !important;
-  height: auto !important;
-  padding: 1.25rem !important;
-  margin: 2rem -30px -2rem !important;
+#carbonads {
+  display: block;
+  padding: 15px 15px 15px 160px;
+  margin: 50px -15px 0;
   overflow: hidden;
-  font-family: inherit !important;
-  font-size: .8rem !important;
-  line-height: 1rem !important;
-  color: #cdbfe3 !important;
+  font-size: 13px;
+  line-height: 1.5;
   text-align: left;
-  background: #3e2c5a !important;
-  border: 0 !important;
+  border: solid #866ab3;
+  border-width: 1px 0 0;
 }
 
-.carbonad-img {
-  margin: 0 !important;
+#carbonads a {
+  color: #fff;
+  text-decoration: none;
 }
 
-.carbonad-text,
-.carbonad-tag {
-  display: block !important;
-  float: none !important;
-  width: auto !important;
-  height: auto !important;
-  margin-left: 145px !important;
-  font-family: inherit !important;
+@media (min-width: 576px) {
+  #carbonads {
+    max-width: 330px;
+    margin: 50px auto 0;
+    border-width: 1px;
+    border-radius: 4px;
+  }
 }
 
-.carbonad-text {
-  padding-top: 0 !important;
+@media (min-width: 992px) {
+  #carbonads {
+    position: absolute;
+    top: 0;
+    right: 15px;
+    margin-top: 0;
+  }
+  .bd-masthead #carbonads {
+    position: static;
+  }
 }
 
-.carbonad-tag {
-  color: inherit !important;
-  text-align: left !important;
+.carbon-img {
+  float: left;
+  margin-left: -145px;
 }
 
-.carbonad-text a,
-.carbonad-tag a {
+.carbon-poweredby {
+  display: block;
   color: #cdbfe3 !important;
 }
 
-.carbonad-text a:hover,
-.carbonad-tag a:hover {
-  color: #fff !important;
-}
-
-@media (min-width: 544px) {
-  .carbonad {
-    width: 330px !important;
-    padding: 1rem !important;
-    margin-right: auto !important;
-    margin-left: auto !important;
-    border-radius: .25rem;
-  }
-}
-
 .bd-content > table {
   display: block;
   width: 100%;
@@ -384,7 +374,7 @@
   margin-bottom: .25rem;
 }
 
-@media (min-width: 544px) {
+@media (min-width: 576px) {
   .bd-title {
     font-size: 3rem;
   }
@@ -428,7 +418,7 @@
   font-weight: 300;
 }
 
-@media (min-width: 544px) {
+@media (min-width: 576px) {
   .bd-pageheader {
     padding-top: 4rem;
     padding-bottom: 4rem;
@@ -610,7 +600,7 @@
   margin-bottom: 0;
 }
 
-@media (min-width: 544px) {
+@media (min-width: 576px) {
   .bd-footer {
     text-align: left;
   }
@@ -700,7 +690,7 @@
   clear: both;
 }
 
-@media (min-width: 544px) {
+@media (min-width: 576px) {
   .bd-example {
     padding: 1.5rem;
     margin-right: 0;
@@ -819,7 +809,7 @@
   margin: 1rem -1rem -1rem;
 }
 
-@media (min-width: 544px) {
+@media (min-width: 576px) {
   .bd-example .navbar-fixed-top {
     margin: -1.5rem -1.5rem 1rem;
   }
@@ -925,7 +915,7 @@
   background-color: #f7f7f9;
 }
 
-@media (min-width: 544px) {
+@media (min-width: 576px) {
   .highlight {
     padding: 1.5rem;
     margin-right: 0;
@@ -1007,13 +997,13 @@
   border: 1px solid #d6e9c6;
 }
 
-@media (max-width: 543px) {
+@media (max-width: 575px) {
   .hidden-xs-only {
     display: none !important;
   }
 }
 
-@media (min-width: 544px) and (max-width: 767px) {
+@media (min-width: 576px) and (max-width: 767px) {
   .hidden-sm-only {
     display: none !important;
   }
@@ -1525,6 +1515,24 @@
   color: #999;
 }
 
+.language-bash::before {
+  color: #009;
+  content: "$ ";
+  -webkit-user-select: none;
+     -moz-user-select: none;
+      -ms-user-select: none;
+          user-select: none;
+}
+
+.language-powershell::before {
+  color: #009;
+  content: "PM> ";
+  -webkit-user-select: none;
+     -moz-user-select: none;
+      -ms-user-select: none;
+          user-select: none;
+}
+
 .anchorjs-link {
   color: inherit;
 }