Merge branch 'master' into icon_paths

Conflicts:
	dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.css.map

1 files changed, 20 insertions, 11 deletions

diff --git a/docs/assets/css/_src/docs.css b/docs/assets/css/_src/docs.css
index 3be2431c4..b19861ecf 100644
--- a/docs/assets/css/_src/docs.css
+++ b/docs/assets/css/_src/docs.css
@@ -583,7 +583,8 @@ body {
 }
 
 /* Back to top (hidden on mobile) */
-.back-to-top {
+.back-to-top,
+.bs-docs-theme-toggle {
   display: none;
   padding: 4px 10px;
   margin-top: 10px;
@@ -592,13 +593,18 @@ body {
   font-weight: 500;
   color: #999;
 }
-.back-to-top:hover {
+.back-to-top:hover,
+.bs-docs-theme-toggle:hover {
   color: #563d7c;
   text-decoration: none;
 }
+.bs-docs-theme-toggle {
+  margin-top: 0;
+}
 
 @media (min-width: 768px) {
-  .back-to-top {
+  .back-to-top,
+  .bs-docs-theme-toggle {
     display: block;
   }
 }
@@ -666,7 +672,9 @@ h1[id] {
 .bs-callout {
   padding: 20px;
   margin: 20px 0;
-  border-left: 3px solid #eee;
+  border: 1px solid #eee;
+  border-left-width: 5px;
+  border-radius: 3px;
 }
 .bs-callout h4 {
   margin-top: 0;
@@ -676,28 +684,29 @@ h1[id] {
   margin-bottom: 0;
 }
 .bs-callout code {
-  background-color: #fff;
   border-radius: 3px;
 }
 
+/* Tighten up space between multiple callouts */
+.bs-callout + .bs-callout {
+  margin-top: -5px;
+}
+
 /* Variations */
 .bs-callout-danger {
-  background-color: #fdf7f7;
-  border-color: #d9534f;
+  border-left-color: #d9534f;
 }
 .bs-callout-danger h4 {
   color: #d9534f;
 }
 .bs-callout-warning {
-  background-color: #fcf8f2;
-  border-color: #f0ad4e;
+  border-left-color: #f0ad4e;
 }
 .bs-callout-warning h4 {
   color: #f0ad4e;
 }
 .bs-callout-info {
-  background-color: #f4f8fa;
-  border-color: #5bc0de;
+  border-left-color: #5bc0de;
 }
 .bs-callout-info h4 {
   color: #5bc0de;