4 files changed, 23 insertions, 32 deletions
diff --git a/docs/examples/carousel/carousel.css b/docs/examples/carousel/carousel.css
index 08448b99c..bd7567af3 100644
--- a/docs/examples/carousel/carousel.css
+++ b/docs/examples/carousel/carousel.css
@@ -22,7 +22,7 @@ body {
 }
 
 /* Flip around the padding for proper display in narrow viewports */
-.navbar-wrapper .container {
+.navbar-wrapper > .container {
   padding-right: 0;
   padding-left: 0;
 }
@@ -30,6 +30,9 @@ body {
   padding-right: 15px;
   padding-left: 15px;
 }
+.navbar-wrapper .navbar .container {
+  width: auto;
+}
 
 
 /* CUSTOMIZE THE CAROUSEL
@@ -63,12 +66,6 @@ body {
 /* MARKETING CONTENT
 -------------------------------------------------- */
 
-/* Pad the edges of the mobile views a bit */
-.marketing {
-  padding-right: 15px;
-  padding-left: 15px;
-}
-
 /* Center align the text within the three columns below the carousel */
 .marketing .col-lg-4 {
   margin-bottom: 20px;
@@ -104,12 +101,6 @@ body {
 
 @media (min-width: 768px) {
 
-  /* Remove the edge padding needed for mobile */
-  .marketing {
-    padding-right: 0;
-    padding-left: 0;
-  }
-
   /* Navbar positioning foo */
   .navbar-wrapper {
     margin-top: 20px;
diff --git a/docs/examples/theme/theme.css b/docs/examples/theme/theme.css
index 181f99842..b7c8d4cd2 100644
--- a/docs/examples/theme/theme.css
+++ b/docs/examples/theme/theme.css
@@ -12,3 +12,7 @@ body {
 .theme-showcase > p > .btn {
   margin: 5px 0;
 }
+
+.theme-showcase .navbar .container {
+  width: auto;
+}
diff --git a/docs/examples/tooltip-viewport/index.html b/docs/examples/tooltip-viewport/index.html
index dc0b47310..ddeb70774 100644
--- a/docs/examples/tooltip-viewport/index.html
+++ b/docs/examples/tooltip-viewport/index.html
@@ -32,21 +32,19 @@
 
   <body>
 
-    <button class="btn pull-right tooltip-bottom" title="This should be shifted to the left">Shift Left</button>
-    <button class="btn tooltip-bottom" title="This should be shifted to the right">Shift Right</button>
-    <button class="btn tooltip-right" title="This should be shifted down">Shift Down</button>
+    <button class="btn btn-default pull-right tooltip-bottom" title="This should be shifted to the left">Shift Left</button>
+    <button class="btn btn-default tooltip-bottom" title="This should be shifted to the right">Shift Right</button>
+    <button class="btn btn-default tooltip-right" title="This should be shifted down">Shift Down</button>
 
-    <div class="placeholder">There is a button down there ↓</div>
-
-    <button class="btn tooltip-right" title="This should be shifted up">Shift Up</button>
+    <button class="btn btn-default tooltip-right btn-bottom" title="This should be shifted up">Shift Up</button>
 
     <div class="container-viewport">
-      <button class="btn tooltip-viewport-bottom" title="This should be shifted to the left">Shift Left</button>
-      <button class="btn tooltip-viewport-right" title="This should be shifted down">Shift Down</button>
+      <button class="btn btn-default tooltip-viewport-bottom" title="This should be shifted to the left">Shift Left</button>
+      <button class="btn btn-default tooltip-viewport-right" title="This should be shifted down">Shift Down</button>
 
-      <button class="btn pull-right tooltip-viewport-bottom" title="This should be shifted to the right">Shift Right</button>
+      <button class="btn btn-default pull-right tooltip-viewport-bottom" title="This should be shifted to the right">Shift Right</button>
 
-      <button class="btn tooltip-viewport-right btn-bottom" title="This should be shifted up">Shift Up</button>
+      <button class="btn btn-default tooltip-viewport-right btn-bottom" title="This should be shifted up">Shift Up</button>
     </div>
 
 
diff --git a/docs/examples/tooltip-viewport/tooltip-viewport.css b/docs/examples/tooltip-viewport/tooltip-viewport.css
index b9a237cfc..26aa2e348 100644
--- a/docs/examples/tooltip-viewport/tooltip-viewport.css
+++ b/docs/examples/tooltip-viewport/tooltip-viewport.css
@@ -8,18 +8,16 @@ body {
 .tooltip .tooltip-inner {
   min-width: 250px;
   max-width: 500px;
-  min-height: 200px;
-}
-.placeholder {
-  height: 900px;
+  min-height: 100px;
+  text-align: left;
 }
 .container-viewport {
   position: absolute;
-  top: 600px;
-  left: 200px;
-  width: 600px;
-  height: 400px;
-  background: #c00;
+  top: 100px;
+  right: 250px;
+  left: 250px;
+  height: 300px;
+  background-color: #eee;
 }
 .btn-bottom {
   position: absolute;