Merge branch 'example-fix' of https://github.com/Boulox/bootstrap into Boulox-example-fix

6 files changed, 23 insertions, 11 deletions

diff --git a/docs/examples/carousel.html b/docs/examples/carousel.html
index be75a5cc3..e86029221 100644
--- a/docs/examples/carousel.html
+++ b/docs/examples/carousel.html
@@ -189,6 +189,18 @@ body {
     font-size: 18px;
     line-height: 1.5;
   }
+  
+  .navbar-wrapper {
+    margin-top: 0;
+  }
+
+  .navbar {
+    border-radius: 0;
+  }
+  
+  #myCarousel {
+    margin-top: 54px;
+  }
 
 }
 </style>
@@ -245,7 +257,7 @@ body {
   </ol>
   <div class="carousel-inner">
     <div class="item active">
-      <img src="../../assets/img/examples/slide-01.jpg" alt="">
+      <img data-src="holder.js/1500x550/auto/#777:#fff/text:First slide" alt="">
       <div class="container">
         <div class="carousel-caption">
           <h1>Example headline.</h1>
@@ -255,7 +267,7 @@ body {
       </div>
     </div>
     <div class="item">
-      <img src="../../assets/img/examples/slide-02.jpg" alt="">
+      <img data-src="holder.js/1500x550/auto/#777:#fff/text:Second slide" alt="">
       <div class="container">
         <div class="carousel-caption">
           <h1>Another example headline.</h1>
@@ -265,7 +277,7 @@ body {
       </div>
     </div>
     <div class="item">
-      <img src="../../assets/img/examples/slide-03.jpg" alt="">
+      <img data-src="holder.js/1500x550/auto/#777:#fff/text:Third slide" alt="">
       <div class="container">
         <div class="carousel-caption">
           <h1>One more for good measure.</h1>
@@ -315,7 +327,7 @@ body {
   <hr class="featurette-divider">
 
   <div class="featurette">
-    <img class="featurette-image pull-right" src="../../assets/img/examples/browser-icon-chrome.png">
+    <img class="featurette-image img-circle pull-right" data-src="holder.js/512x512">
     <h2 class="featurette-heading">First featurette headling. <span class="text-muted">It'll blow your mind.</span></h2>
     <p class="lead">Donec ullamcorper nulla non metus auctor fringilla. Vestibulum id ligula porta felis euismod semper. Praesent commodo cursus magna, vel scelerisque nisl consectetur. Fusce dapibus, tellus ac cursus commodo.</p>
   </div>
@@ -323,7 +335,7 @@ body {
   <hr class="featurette-divider">
 
   <div class="featurette">
-    <img class="featurette-image pull-left" src="../../assets/img/examples/browser-icon-firefox.png">
+    <img class="featurette-image img-circle pull-left" data-src="holder.js/512x512">
     <h2 class="featurette-heading">Oh yeah, it's that good. <span class="text-muted">See for yourself.</span></h2>
     <p class="lead">Donec ullamcorper nulla non metus auctor fringilla. Vestibulum id ligula porta felis euismod semper. Praesent commodo cursus magna, vel scelerisque nisl consectetur. Fusce dapibus, tellus ac cursus commodo.</p>
   </div>
@@ -331,7 +343,7 @@ body {
   <hr class="featurette-divider">
 
   <div class="featurette">
-    <img class="featurette-image pull-right" src="../../assets/img/examples/browser-icon-safari.png">
+    <img class="featurette-image img-circle pull-right" data-src="holder.js/512x512">
     <h2 class="featurette-heading">And lastly, this one. <span class="text-muted">Checkmate.</span></h2>
     <p class="lead">Donec ullamcorper nulla non metus auctor fringilla. Vestibulum id ligula porta felis euismod semper. Praesent commodo cursus magna, vel scelerisque nisl consectetur. Fusce dapibus, tellus ac cursus commodo.</p>
   </div>
diff --git a/docs/examples/navbar-fixed-top.html b/docs/examples/navbar-fixed-top.html
index e1f1c882a..06ed424c2 100644
--- a/docs/examples/navbar-fixed-top.html
+++ b/docs/examples/navbar-fixed-top.html
@@ -60,7 +60,7 @@ title: Fixed navbar template
         <h1>Navbar example</h1>
         <p>This example is a quick exercise to illustrate how the default, static navbar and fixed to top navbar work. It includes the responsive CSS and HTML, so it also adapts to your viewport and device.</p>
         <p>
-          <a class="btn btn-large btn-primary" href="../../components/#navbar">View navbar docs &raquo;</a>
+          <a class="btn btn-large btn-primary" href="../../docs/#navbar">View navbar docs &raquo;</a>
         </p>
       </div>
 
diff --git a/docs/examples/navbar-static-top.html b/docs/examples/navbar-static-top.html
index 2679a670b..9a234114f 100644
--- a/docs/examples/navbar-static-top.html
+++ b/docs/examples/navbar-static-top.html
@@ -57,7 +57,7 @@ title: Static navbar template
     <h1>Navbar example</h1>
     <p>This example is a quick exercise to illustrate how the default, static navbar and fixed to top navbar work. It includes the responsive CSS and HTML, so it also adapts to your viewport and device.</p>
     <p>
-      <a class="btn btn-large btn-primary" href="../../components/#navbar">View navbar docs &raquo;</a>
+      <a class="btn btn-large btn-primary" href="../../docs/#navbar">View navbar docs &raquo;</a>
     </p>
   </div>
 
diff --git a/docs/examples/navbar.html b/docs/examples/navbar.html
index 6cba51dc5..5b5ffb77b 100644
--- a/docs/examples/navbar.html
+++ b/docs/examples/navbar.html
@@ -60,7 +60,7 @@ title: Navbar template
     <h1>Navbar example</h1>
     <p>This example is a quick exercise to illustrate how the default, static navbar and fixed to top navbar work. It includes the responsive CSS and HTML, so it also adapts to your viewport and device.</p>
     <p>
-      <a class="btn btn-large btn-primary" href="../../components/#navbar">View navbar docs &raquo;</a>
+      <a class="btn btn-large btn-primary" href="../../docs/#navbar">View navbar docs &raquo;</a>
     </p>
   </div>
 
diff --git a/docs/examples/sticky-footer-navbar.html b/docs/examples/sticky-footer-navbar.html
index 96b228212..716412a9d 100644
--- a/docs/examples/sticky-footer-navbar.html
+++ b/docs/examples/sticky-footer-navbar.html
@@ -104,7 +104,7 @@ title: Sticky footer with navbar template
       <h1>Sticky footer with fixed navbar</h1>
     </div>
     <p class="lead">Pin a fixed-height footer to the bottom of the viewport in desktop browsers with this custom HTML and CSS. A fixed navbar has been added within <code>#wrap</code> with <code>padding-top: 60px;</code> on the <code>.container</code>.</p>
-    <p>Back to <a href="./sticky-footer.html">the default sticky footer</a> minus the navbar.</p>
+    <p>Back to <a href="../sticky-footer">the default sticky footer</a> minus the navbar.</p>
   </div>
 
   <div id="push"></div>
diff --git a/docs/examples/sticky-footer.html b/docs/examples/sticky-footer.html
index 1f27ffabc..62c108812 100644
--- a/docs/examples/sticky-footer.html
+++ b/docs/examples/sticky-footer.html
@@ -69,7 +69,7 @@ title: Sticky footer template
       <h1>Sticky footer</h1>
     </div>
     <p class="lead">Pin a fixed-height footer to the bottom of the viewport in desktop browsers with this custom HTML and CSS.</p>
-    <p>Use <a href="./sticky-footer-navbar.html">the sticky footer with a fixed navbar</a> if need be, too.</p>
+    <p>Use <a href="../sticky-footer-navbar">the sticky footer with a fixed navbar</a> if need be, too.</p>
   </div>
 
   <div id="push"></div>