From 601013ca04d6374362c12af5dc48b8c1d44b93cc Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Sat, 30 Mar 2013 00:11:38 -0700
Subject: drop .muted for .text-muted

---
 docs/examples/carousel.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'docs/examples/carousel.html')

diff --git a/docs/examples/carousel.html b/docs/examples/carousel.html
index 598a6334b..dd0c3ca1f 100644
--- a/docs/examples/carousel.html
+++ b/docs/examples/carousel.html
@@ -369,7 +369,7 @@ body {
 
   <div class="featurette">
     <img class="featurette-image pull-right" src="../assets/img/examples/browser-icon-chrome.png">
-    <h2 class="featurette-heading">First featurette headling. <span class="muted">It'll blow your mind.</span></h2>
+    <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>
 
@@ -377,7 +377,7 @@ body {
 
   <div class="featurette">
     <img class="featurette-image pull-left" src="../assets/img/examples/browser-icon-firefox.png">
-    <h2 class="featurette-heading">Oh yeah, it's that good. <span class="muted">See for yourself.</span></h2>
+    <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>
 
@@ -385,7 +385,7 @@ body {
 
   <div class="featurette">
     <img class="featurette-image pull-right" src="../assets/img/examples/browser-icon-safari.png">
-    <h2 class="featurette-heading">And lastly, this one. <span class="muted">Checkmate.</span></h2>
+    <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>
 
-- 
cgit v1.2.3


From d299ff4fce995543c29c0630d58d0a101c477b76 Mon Sep 17 00:00:00 2001
From: Robert Burns <burnsra@gmail.com>
Date: Sun, 31 Mar 2013 21:25:45 -0400
Subject: Fix image paths and carousel controls for carousel example

---
 docs/examples/carousel.html | 59 +++++++++++++++------------------------------
 1 file changed, 19 insertions(+), 40 deletions(-)

(limited to 'docs/examples/carousel.html')

diff --git a/docs/examples/carousel.html b/docs/examples/carousel.html
index dd0c3ca1f..0c50c7a14 100644
--- a/docs/examples/carousel.html
+++ b/docs/examples/carousel.html
@@ -55,12 +55,6 @@ body {
   padding: 15px 20px;
 }
 
-/* Offset the responsive button for proper vertical alignment */
-.navbar .navbar-toggle {
-  margin-top: 10px;
-}
-
-
 
 /* CUSTOMIZE THE CAROUSEL
 -------------------------------------------------- */
@@ -75,16 +69,6 @@ body {
   z-index: 9;
 }
 
-.carousel-control {
-  height: 80px;
-  margin-top: 0;
-  font-size: 120px;
-  text-shadow: 0 1px 1px rgba(0,0,0,.4);
-  background-color: transparent;
-  border: 0;
-  z-index: 10;
-}
-
 .carousel .item {
   height: 500px;
 }
@@ -252,25 +236,21 @@ body {
 <!-- NAVBAR
 ================================================== -->
 <div class="navbar-wrapper">
-  <!-- Wrap the .navbar in .container to center it within the absolutely positioned parent. -->
   <div class="container">
 
     <div class="navbar navbar-inverse">
-      <div class="navbar-inner">
-        <!-- Responsive Navbar Part 1: Button for triggering responsive navbar (not covered in tutorial). Include responsive CSS to utilize. -->
-        <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse">
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-        </button>
+      <div class="container">
+	    <a class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse">
+	      <span class="icon-bar"></span>
+	      <span class="icon-bar"></span>
+	      <span class="icon-bar"></span>
+	    </a>
         <a class="navbar-brand" href="#">Project name</a>
-        <!-- Responsive Navbar Part 2: Place all navbar contents you want collapsed withing .navbar-collapse.collapse. -->
         <div class="nav-collapse collapse">
           <ul class="nav">
             <li class="active"><a href="#">Home</a></li>
             <li><a href="#about">About</a></li>
             <li><a href="#contact">Contact</a></li>
-            <!-- Read about Bootstrap dropdowns at http://twitter.github.com/bootstrap/javascript.html#dropdowns -->
             <li class="dropdown">
               <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
               <ul class="dropdown-menu">
@@ -284,13 +264,12 @@ body {
               </ul>
             </li>
           </ul>
-        </div><!--/.nav-collapse -->
-      </div><!-- /.navbar-inner -->
-    </div><!-- /.navbar -->
-
-  </div> <!-- /.container -->
-</div><!-- /.navbar-wrapper -->
+        </div>
+      </div>
+    </div>
 
+  </div>
+</div>
 
 
 <!-- Carousel
@@ -298,7 +277,7 @@ body {
 <div id="myCarousel" class="carousel slide">
   <div class="carousel-inner">
     <div class="item active">
-      <img src="../assets/img/examples/slide-01.jpg" alt="">
+      <img src="../../assets/img/examples/slide-01.jpg" alt="">
       <div class="container">
         <div class="carousel-caption">
           <h1>Example headline.</h1>
@@ -308,7 +287,7 @@ body {
       </div>
     </div>
     <div class="item">
-      <img src="../assets/img/examples/slide-02.jpg" alt="">
+      <img src="../../assets/img/examples/slide-02.jpg" alt="">
       <div class="container">
         <div class="carousel-caption">
           <h1>Another example headline.</h1>
@@ -318,7 +297,7 @@ body {
       </div>
     </div>
     <div class="item">
-      <img src="../assets/img/examples/slide-03.jpg" alt="">
+      <img src="../../assets/img/examples/slide-03.jpg" alt="">
       <div class="container">
         <div class="carousel-caption">
           <h1>One more for good measure.</h1>
@@ -328,8 +307,8 @@ body {
       </div>
     </div>
   </div>
-  <a class="left carousel-control" href="#myCarousel" data-slide="prev">&lsaquo;</a>
-  <a class="right carousel-control" href="#myCarousel" data-slide="next">&rsaquo;</a>
+  <a class="left carousel-control" href="#myCarousel" data-slide="prev"><span class="glyphicon glyphicon-chevron-left"></span></a>
+  <a class="right carousel-control" href="#myCarousel" data-slide="next"><span class="glyphicon glyphicon-chevron-right"></span></a>
 </div><!-- /.carousel -->
 
 
@@ -368,7 +347,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 pull-right" src="../../assets/img/examples/browser-icon-chrome.png">
     <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>
@@ -376,7 +355,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 pull-left" src="../../assets/img/examples/browser-icon-firefox.png">
     <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>
@@ -384,7 +363,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 pull-right" src="../../assets/img/examples/browser-icon-safari.png">
     <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>
-- 
cgit v1.2.3


From e183dd46a20daa725fe5ad7acb5313d7b20db6f1 Mon Sep 17 00:00:00 2001
From: Robert Burns <burnsra@gmail.com>
Date: Mon, 1 Apr 2013 09:27:49 -0400
Subject: Update carousel-caption btn styles

---
 docs/examples/carousel.html | 2 --
 1 file changed, 2 deletions(-)

(limited to 'docs/examples/carousel.html')

diff --git a/docs/examples/carousel.html b/docs/examples/carousel.html
index 0c50c7a14..e97d895c2 100644
--- a/docs/examples/carousel.html
+++ b/docs/examples/carousel.html
@@ -91,8 +91,6 @@ body {
 .carousel-caption .lead {
   margin: 0;
   line-height: 1.25;
-  color: #fff;
-  text-shadow: 0 1px 1px rgba(0,0,0,.4);
 }
 .carousel-caption .btn {
   margin-top: 10px;
-- 
cgit v1.2.3


From 1816483baa9de59dc1ea0cec67fcbd00b28c6b79 Mon Sep 17 00:00:00 2001
From: Robert Burns <burnsra@gmail.com>
Date: Mon, 1 Apr 2013 09:29:43 -0400
Subject: Add carousel indicators to example

---
 docs/examples/carousel.html | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'docs/examples/carousel.html')

diff --git a/docs/examples/carousel.html b/docs/examples/carousel.html
index e97d895c2..925314922 100644
--- a/docs/examples/carousel.html
+++ b/docs/examples/carousel.html
@@ -273,6 +273,12 @@ body {
 <!-- Carousel
 ================================================== -->
 <div id="myCarousel" class="carousel slide">
+  <!-- Indicators -->
+  <ol class="carousel-indicators">
+    <li data-target="#myCarousel" data-slide-to="0" class="active"></li>
+    <li data-target="#myCarousel" data-slide-to="1"></li>
+    <li data-target="#myCarousel" data-slide-to="2"></li>
+  </ol>
   <div class="carousel-inner">
     <div class="item active">
       <img src="../../assets/img/examples/slide-01.jpg" alt="">
-- 
cgit v1.2.3


From 89bbeec898c07a191e9f1a696e9061278e4da9f2 Mon Sep 17 00:00:00 2001
From: Robert Burns <burnsra@gmail.com>
Date: Mon, 1 Apr 2013 12:58:40 -0400
Subject: Additional cleanup to responsive navbar

---
 docs/examples/carousel.html | 38 +-------------------------------------
 1 file changed, 1 insertion(+), 37 deletions(-)

(limited to 'docs/examples/carousel.html')

diff --git a/docs/examples/carousel.html b/docs/examples/carousel.html
index 925314922..be75a5cc3 100644
--- a/docs/examples/carousel.html
+++ b/docs/examples/carousel.html
@@ -30,30 +30,6 @@ body {
   margin-top: 20px;
   margin-bottom: -90px; /* Negative margin to pull up carousel. 90px is roughly margins and height of navbar. */
 }
-.navbar-wrapper .navbar {
-
-}
-
-/* Remove border and change up box shadow for more contrast */
-.navbar .navbar-inner {
-  border: 0;
-  -webkit-box-shadow: 0 2px 10px rgba(0,0,0,.25);
-     -moz-box-shadow: 0 2px 10px rgba(0,0,0,.25);
-          box-shadow: 0 2px 10px rgba(0,0,0,.25);
-}
-
-/* Downsize the brand/project name a bit */
-.navbar .brand {
-  padding: 14px 20px 16px; /* Increase vertical padding to match navbar links */
-  font-size: 16px;
-  font-weight: bold;
-  text-shadow: 0 -1px 0 rgba(0,0,0,.5);
-}
-
-/* Navbar links: increase padding for taller navbar */
-.navbar .nav > li > a {
-  padding: 15px 20px;
-}
 
 
 /* CUSTOMIZE THE CAROUSEL
@@ -87,11 +63,7 @@ body {
   padding: 0 20px;
   margin-top: 200px;
 }
-.carousel-caption h1,
-.carousel-caption .lead {
-  margin: 0;
-  line-height: 1.25;
-}
+
 .carousel-caption .btn {
   margin-top: 10px;
 }
@@ -155,10 +127,6 @@ body {
     margin-bottom: 0;
     width: auto;
   }
-  .navbar-inner {
-    border-radius: 0;
-    margin: -20px 0;
-  }
 
   .carousel .item {
     height: 500px;
@@ -184,10 +152,6 @@ body {
 
 @media (max-width: 767px) {
 
-  .navbar-inner {
-    margin: -20px;
-  }
-
   .carousel {
     margin-left: -20px;
     margin-right: -20px;
-- 
cgit v1.2.3


From e0bce6af123fc3d935a34aae87d0787e7e54e07f Mon Sep 17 00:00:00 2001
From: Fabien <fabien.creative@gmail.com>
Date: Tue, 2 Apr 2013 13:30:13 +0200
Subject: Replace png img by holder.js in carousel example

---
 docs/examples/carousel.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'docs/examples/carousel.html')

diff --git a/docs/examples/carousel.html b/docs/examples/carousel.html
index be75a5cc3..538a440da 100644
--- a/docs/examples/carousel.html
+++ b/docs/examples/carousel.html
@@ -245,7 +245,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 +255,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 +265,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 +315,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 +323,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 +331,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>
-- 
cgit v1.2.3


From e56461fbd71af38cabff4cc650f6050f765ec603 Mon Sep 17 00:00:00 2001
From: Fabien <fabien.creative@gmail.com>
Date: Tue, 2 Apr 2013 13:39:04 +0200
Subject: Improve responsiveness for tablet and below of navbar in carousel
 example

- Remove margin-top of navbar-wrapper
- Remove border radius of navbar
- Space out the carousel
---
 docs/examples/carousel.html | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'docs/examples/carousel.html')

diff --git a/docs/examples/carousel.html b/docs/examples/carousel.html
index 538a440da..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>
-- 
cgit v1.2.3


From 0ac711059ba7aaa2996a529d7f9bf4110a6dd765 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Tue, 2 Apr 2013 16:17:04 -0700
Subject: refactor some of the carousel caption stuff to center it and tighten
 styles up; update carousel template to start to redo mobile first

---
 docs/examples/carousel.html | 90 ++++++++++++++++++++++++++++-----------------
 1 file changed, 56 insertions(+), 34 deletions(-)

(limited to 'docs/examples/carousel.html')

diff --git a/docs/examples/carousel.html b/docs/examples/carousel.html
index e86029221..792949fb0 100644
--- a/docs/examples/carousel.html
+++ b/docs/examples/carousel.html
@@ -27,11 +27,10 @@ body {
   left: 0;
   right: 0;
   z-index: 10;
-  margin-top: 20px;
-  margin-bottom: -90px; /* Negative margin to pull up carousel. 90px is roughly margins and height of navbar. */
 }
 
 
+
 /* CUSTOMIZE THE CAROUSEL
 -------------------------------------------------- */
 
@@ -39,12 +38,12 @@ body {
 .carousel {
   margin-bottom: 60px;
 }
-
-.carousel .container {
-  position: relative;
-  z-index: 9;
+/* Since positioning the image, we need to help out the caption */
+.carousel-caption {
+  z-index: 10;
 }
 
+/* Declare heights because of positioning of img element */
 .carousel .item {
   height: 500px;
 }
@@ -56,26 +55,21 @@ body {
   height: 500px;
 }
 
-.carousel-caption {
-  background-color: transparent;
-  position: static;
-  max-width: 550px;
-  padding: 0 20px;
-  margin-top: 200px;
-}
-
-.carousel-caption .btn {
-  margin-top: 10px;
-}
-
 
 
 /* MARKETING CONTENT
 -------------------------------------------------- */
 
+/* Pad the edges of the mobile views a bit */
+.marketing {
+  padding-left: 15px;
+  padding-right: 15px;
+}
+
 /* Center align the text within the three columns below the carousel */
 .marketing .col-span-4 {
   text-align: center;
+  margin-bottom: 20px;
 }
 .marketing h2 {
   font-weight: normal;
@@ -121,7 +115,35 @@ body {
 /* RESPONSIVE CSS
 -------------------------------------------------- */
 
-@media (max-width: 979px) {
+@media (min-width: 768px) {
+
+  /* Remve the edge padding needed for mobile */
+  .marketing {
+    padding-left: 0;
+    padding-right: 0;
+  }
+
+  /* Navbar positioning foo */
+  .navbar-wrapper {
+    margin-top: 20px;
+    margin-bottom: -90px; /* Negative margin to pull up carousel. 90px is roughly margins and height of navbar. */
+  }
+  /* The navbar becomes detached from the top, so we round the corners */
+  .navbar-wrapper .navbar {
+    border-radius: 4px;
+  }
+
+  /* Bump up size of carousel content */
+  .carousel-caption p {
+    margin-bottom: 20px;
+    font-size: 21px;
+    line-height: 1.4;
+  }
+
+}
+
+
+/*@media (max-width: 979px) {
 
   .container.navbar-wrapper {
     margin-bottom: 0;
@@ -189,7 +211,7 @@ body {
     font-size: 18px;
     line-height: 1.5;
   }
-  
+
   .navbar-wrapper {
     margin-top: 0;
   }
@@ -197,12 +219,12 @@ body {
   .navbar {
     border-radius: 0;
   }
-  
+
   #myCarousel {
     margin-top: 54px;
   }
 
-}
+}*/
 </style>
 
 
@@ -212,7 +234,7 @@ body {
 <div class="navbar-wrapper">
   <div class="container">
 
-    <div class="navbar navbar-inverse">
+    <div class="navbar navbar-inverse navbar-static-top">
       <div class="container">
 	    <a class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse">
 	      <span class="icon-bar"></span>
@@ -257,32 +279,32 @@ body {
   </ol>
   <div class="carousel-inner">
     <div class="item active">
-      <img data-src="holder.js/1500x550/auto/#777:#fff/text:First slide" alt="">
+      <img data-src="holder.js/1500x500/auto/#777:#7a7a7a/text:First slide" alt="">
       <div class="container">
         <div class="carousel-caption">
           <h1>Example headline.</h1>
-          <p class="lead">Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
-          <a class="btn btn-large btn-primary" href="#">Sign up today</a>
+          <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
+          <p><a class="btn btn-large btn-primary" href="#">Sign up today</a></p>
         </div>
       </div>
     </div>
     <div class="item">
-      <img data-src="holder.js/1500x550/auto/#777:#fff/text:Second slide" alt="">
+      <img data-src="holder.js/1500x500/auto/#777:#7a7a7a/text:Second slide" alt="">
       <div class="container">
         <div class="carousel-caption">
           <h1>Another example headline.</h1>
-          <p class="lead">Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
-          <a class="btn btn-large btn-primary" href="#">Learn more</a>
+          <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
+          <p><a class="btn btn-large btn-primary" href="#">Learn more</a></p>
         </div>
       </div>
     </div>
     <div class="item">
-      <img data-src="holder.js/1500x550/auto/#777:#fff/text:Third slide" alt="">
+      <img data-src="holder.js/1500x500/auto/#777:#7a7a7a/text:Third slide" alt="">
       <div class="container">
         <div class="carousel-caption">
           <h1>One more for good measure.</h1>
-          <p class="lead">Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
-          <a class="btn btn-large btn-primary" href="#">Browse gallery</a>
+          <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
+          <p><a class="btn btn-large btn-primary" href="#">Browse gallery</a></p>
         </div>
       </div>
     </div>
@@ -304,13 +326,13 @@ body {
     <div class="col-span-4">
       <img class="img-circle" data-src="holder.js/140x140">
       <h2>Heading</h2>
-      <p>Donec sed odio dui. Etiam porta sem malesuada magna mollis euismod. Nullam id dolor id nibh ultricies vehicula ut id elit. Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.</p>
+      <p>Donec sed odio dui. Etiam porta sem malesuada magna mollis euismod. Nullam id dolor id nibh ultricies vehicula ut id elit. Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Praesent commodo cursus magna.</p>
       <p><a class="btn" href="#">View details &raquo;</a></p>
     </div><!-- /.col-span-4 -->
     <div class="col-span-4">
       <img class="img-circle" data-src="holder.js/140x140">
       <h2>Heading</h2>
-      <p>Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
+      <p>Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh.</p>
       <p><a class="btn" href="#">View details &raquo;</a></p>
     </div><!-- /.col-span-4 -->
     <div class="col-span-4">
-- 
cgit v1.2.3


From ddc0e98716d05b2b583c0097a8fc76f976730fc6 Mon Sep 17 00:00:00 2001
From: Robert Burns <burnsra@gmail.com>
Date: Sun, 28 Apr 2013 09:10:01 -0400
Subject: Update examples after overhaul of navbar navs

---
 docs/examples/carousel.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/examples/carousel.html')

diff --git a/docs/examples/carousel.html b/docs/examples/carousel.html
index 792949fb0..4142b38f4 100644
--- a/docs/examples/carousel.html
+++ b/docs/examples/carousel.html
@@ -243,7 +243,7 @@ body {
 	    </a>
         <a class="navbar-brand" href="#">Project name</a>
         <div class="nav-collapse collapse">
-          <ul class="nav">
+          <ul class="nav navbar-nav">
             <li class="active"><a href="#">Home</a></li>
             <li><a href="#about">About</a></li>
             <li><a href="#contact">Contact</a></li>
-- 
cgit v1.2.3


From 62afdd01763466e413fbe67c7622e08a16fa30aa Mon Sep 17 00:00:00 2001
From: Robert Burns <burnsra@gmail.com>
Date: Sun, 28 Apr 2013 22:22:33 -0400
Subject: Update examples after grid changes

---
 docs/examples/carousel.html | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'docs/examples/carousel.html')

diff --git a/docs/examples/carousel.html b/docs/examples/carousel.html
index 4142b38f4..954375d4b 100644
--- a/docs/examples/carousel.html
+++ b/docs/examples/carousel.html
@@ -67,14 +67,14 @@ body {
 }
 
 /* Center align the text within the three columns below the carousel */
-.marketing .col-span-4 {
+.marketing .col-lg-4 {
   text-align: center;
   margin-bottom: 20px;
 }
 .marketing h2 {
   font-weight: normal;
 }
-.marketing .col-span-4 p {
+.marketing .col-lg-4 p {
   margin-left: 10px;
   margin-right: 10px;
 }
@@ -323,24 +323,24 @@ body {
 
   <!-- Three columns of text below the carousel -->
   <div class="row">
-    <div class="col-span-4">
+    <div class="col col-lg-4">
       <img class="img-circle" data-src="holder.js/140x140">
       <h2>Heading</h2>
       <p>Donec sed odio dui. Etiam porta sem malesuada magna mollis euismod. Nullam id dolor id nibh ultricies vehicula ut id elit. Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Praesent commodo cursus magna.</p>
       <p><a class="btn" href="#">View details &raquo;</a></p>
-    </div><!-- /.col-span-4 -->
-    <div class="col-span-4">
+    </div><!-- /.col-lg-4 -->
+    <div class="col col-lg-4">
       <img class="img-circle" data-src="holder.js/140x140">
       <h2>Heading</h2>
       <p>Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh.</p>
       <p><a class="btn" href="#">View details &raquo;</a></p>
-    </div><!-- /.col-span-4 -->
-    <div class="col-span-4">
+    </div><!-- /.col-lg-4 -->
+    <div class="col col-lg-4">
       <img class="img-circle" data-src="holder.js/140x140">
       <h2>Heading</h2>
       <p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
       <p><a class="btn" href="#">View details &raquo;</a></p>
-    </div><!-- /.col-span-4 -->
+    </div><!-- /.col-lg-4 -->
   </div><!-- /.row -->
 
 
-- 
cgit v1.2.3


From a62e97091c6c1bd732a8f7e0761e724dfe50e0df Mon Sep 17 00:00:00 2001
From: Seth Lilly <seth@sethlilly.com>
Date: Thu, 2 May 2013 14:03:54 -0300
Subject: Corrected typo in carousel.html

Changed text from "First featurette headling" to "First featurette heading" in the first `h2.featurette-heading` tag.
---
 docs/examples/carousel.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/examples/carousel.html')

diff --git a/docs/examples/carousel.html b/docs/examples/carousel.html
index 954375d4b..cd6855aab 100644
--- a/docs/examples/carousel.html
+++ b/docs/examples/carousel.html
@@ -350,7 +350,7 @@ body {
 
   <div class="featurette">
     <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>
+    <h2 class="featurette-heading">First featurette heading. <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>
 
-- 
cgit v1.2.3