From: Mark Otto <markdotto@gmail.com>
Date: Tue, 16 Oct 2012 17:50:10 +0000 (-0500)
Subject: add in latest carousel example, reorg examples on getting started
X-Git-Tag: v2.2.0^2~22
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bf7833353145966f1934a2da4aa3771cb2436b48;p=thirdparty%2Fbootstrap.git

add in latest carousel example, reorg examples on getting started
---

diff --git a/docs/assets/img/examples/bootstrap-example-carousel.png b/docs/assets/img/examples/bootstrap-example-carousel.png
new file mode 100644
index 0000000000..a2f668abe1
Binary files /dev/null and b/docs/assets/img/examples/bootstrap-example-carousel.png differ
diff --git a/docs/examples/carousel.html b/docs/examples/carousel.html
index ee811b9c87..92134c506f 100644
--- a/docs/examples/carousel.html
+++ b/docs/examples/carousel.html
@@ -9,207 +9,240 @@
 
     <!-- Le styles -->
     <link href="../assets/css/bootstrap.css" rel="stylesheet">
-    <style type="text/css">
-      body {
-        padding-bottom: 40px;
-        color: #5a5a5a;
-      }
-
-      .navbar-wrapper {
-        position: relative;
-        z-index: 10;
-        margin-top: 20px;
-        margin-bottom: -90px;
-      }
-      .navbar-wrapper .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);
+    <link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
+    <style>
+
+    /* GLOBAL STYLES
+    -------------------------------------------------- */
+    /* Padding below the footer and lighter body text */
+
+    body {
+      padding-bottom: 40px;
+      color: #5a5a5a;
+    }
+
+
+
+    /* CUSTOMIZE THE NAVBAR
+    -------------------------------------------------- */
+
+    /* Special class on .container surrounding .navbar, used for positioning it into place. */
+    .navbar-wrapper {
+      position: relative;
+      z-index: 10;
+      margin-top: 20px;
+      margin-bottom: -90px; /* Negative margin to pull up carousel. 90px is roughly margins and height of 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;
+    }
+
+    /* Offset the responsive button for proper vertical alignment */
+    .navbar .btn-navbar {
+      margin-top: 10px;
+    }
+
+
+
+    /* CUSTOMIZE THE NAVBAR
+    -------------------------------------------------- */
+
+    /* Carousel base class */
+    .carousel {
+      margin-bottom: 60px;
+    }
+
+    .carousel .container {
+      position: absolute;
+      right: 0;
+      bottom: 0;
+      left: 0;
+    }
+
+    .carousel-control {
+      background-color: transparent;
+      border: 0;
+      font-size: 120px;
+      margin-top: 0;
+      text-shadow: 0 1px 1px rgba(0,0,0,.4);
+    }
+
+    .carousel .item {
+      height: 500px;
+    }
+    .carousel img {
+      min-width: 100%;
+      height: 500px;
+    }
+
+    .carousel-caption {
+      background-color: transparent;
+      position: static;
+      max-width: 550px;
+      padding: 0 20px;
+      margin-bottom: 100px;
+    }
+    .carousel-caption h1,
+    .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;
+    }
+
+
+
+    /* MARKETING CONTENT
+    -------------------------------------------------- */
+
+    /* Center align the text within the three columns below the carousel */
+    .marketing .span4 {
+      text-align: center;
+    }
+    .marketing h2 {
+      font-weight: normal;
+    }
+    .marketing .span4 p {
+      margin-left: 10px;
+      margin-right: 10px;
+    }
+
+
+    /* Featurettes
+    ------------------------- */
+
+    .featurette-divider {
+      margin: 80px 0; /* Space out the Bootstrap <hr> more */
+    }
+    .featurette {
+      padding-top: 120px; /* Vertically center images part 1: add padding above and below text. */
+      overflow: hidden; /* Vertically center images part 2: clear their floats. */
+    }
+    .featurette-image {
+      margin-top: -120px; /* Vertically center images part 3: negative margin up the image the same amount of the padding to center it. */
+    }
+
+    /* Give some space on the sides of the floated elements so text doesn't run right into it. */
+    .featurette-image.pull-left {
+      margin-right: 40px;
+    }
+    .featurette-image.pull-right {
+      margin-left: 40px;
+    }
+
+    /* Thin out the marketing headings */
+    .featurette-heading {
+      font-size: 50px;
+      font-weight: 300;
+      line-height: 1;
+      letter-spacing: -1px;
+    }
+
+
+
+    /* RESPONSIVE CSS
+    -------------------------------------------------- */
+
+    @media (max-width: 979px) {
+
+      .container.navbar-wrapper {
+        margin-bottom: 0;
+        width: auto;
       }
-      .navbar-wrapper .brand {
-        font-size: 16px;
-        font-weight: bold;
-        padding: 14px 20px 16px;
+      .navbar-inner {
+        border-radius: 0;
+        margin: -20px 0;
       }
-      .navbar-wrapper .brand {
-        color: #444;
-        text-shadow: 0 -1px 0 rgba(0,0,0,.5);
+
+      .carousel .item {
+        height: 500px;
       }
-      .navbar-wrapper .brand:hover {
-        color: #555;
+      .carousel img {
+        width: auto;
+        height: 500px;
       }
-      .navbar .nav > li > a {
-        padding: 15px 20px;
+
+      .featurette {
+        height: auto;
+        padding: 0;
       }
-      .navbar .btn-navbar {
-        margin-top: 10px;
+      .featurette-image.pull-left,
+      .featurette-image.pull-right {
+        display: block;
+        float: none;
+        max-width: 40%;
+        margin: 0 auto 20px;
       }
+    }
 
 
+    @media (max-width: 767px) {
+
+      .navbar-inner {
+        margin: -20px;
+      }
+
       .carousel {
-        margin-bottom: 60px;
+        margin-left: -20px;
+        margin-right: -20px;
       }
       .carousel .container {
-        position: absolute;
-        right: 0;
-        bottom: 0;
-        left: 0;
-      }
 
-      .carousel-control {
-        background-color: transparent;
-        border: 0;
-        font-size: 120px;
-        margin-top: 0;
-        text-shadow: 0 1px 1px rgba(0,0,0,.4);
       }
-
       .carousel .item {
-        height: 500px;
+        height: 300px;
       }
       .carousel img {
-        min-width: 100%;
-        height: 500px;
+        height: 300px;
       }
-
       .carousel-caption {
-        background-color: transparent;
-        position: static;
-        max-width: 550px;
-        padding: 0 20px;
-        margin-bottom: 100px;
+        width: 65%;
+        padding: 0 70px;
+        margin-bottom: 40px;
       }
-      .carousel-caption h1,
-      .carousel-caption .lead {
-        margin: 0;
-        line-height: 1.25;
-        color: #fff;
-        text-shadow: 0 1px 1px rgba(0,0,0,.4);
+      .carousel-caption h1 {
+        font-size: 30px;
       }
+      .carousel-caption .lead,
       .carousel-caption .btn {
-        margin-top: 10px;
+        font-size: 18px;
       }
 
-      .marketing {
-
-      }
-      .marketing .span4 {
-        text-align: center;
-      }
-      .marketing h2 {
-        font-weight: normal;
-      }
-      .marketing p {
-        margin-left: 10px;
-        margin-right: 10px;
+      .marketing .span4 + .span4 {
+        margin-top: 40px;
       }
 
-      .featurette-divider {
-        margin: 80px 0;
-      }
-      .featurette {
-        padding: 80px 0;
-        overflow: hidden;
-      }
-      .featurette-image {
-        margin-top: -80px;
-      }
-      .featurette-image.pull-left {
-        margin-right: 40px;
-      }
-      .featurette-image.pull-right {
-        margin-left: 40px;
-      }
       .featurette-heading {
-        font-size: 50px;
-        font-weight: 300;
-        line-height: 1;
-        letter-spacing: -1px;
+        font-size: 30px;
       }
-
-
-
-      @media (max-width: 979px) {
-
-        .container.navbar-wrapper {
-          margin-bottom: 0;
-          width: auto;
-        }
-        .navbar-inner {
-          border-radius: 0;
-          margin: -20px 0;
-        }
-
-        .carousel .item {
-          height: 500px;
-        }
-        .carousel img {
-          width: auto;
-          height: 500px;
-        }
-
-        .featurette {
-          height: auto;
-          padding: 0;
-        }
-        .featurette-image.pull-left,
-        .featurette-image.pull-right {
-          display: block;
-          float: none;
-          max-width: 40%;
-          margin: 0 auto 20px;
-        }
+      .featurette .lead {
+        font-size: 18px;
+        line-height: 1.5;
       }
 
-
-      @media (max-width: 767px) {
-
-        .navbar-inner {
-          margin: -20px;
-        }
-
-        .carousel {
-          margin-left: -20px;
-          margin-right: -20px;
-        }
-        .carousel .container {
-
-        }
-        .carousel .item {
-          height: 300px;
-        }
-        .carousel img {
-          height: 300px;
-        }
-        .carousel-caption {
-          width: 65%;
-          padding: 0 70px;
-          margin-bottom: 40px;
-        }
-        .carousel-caption h1 {
-          font-size: 30px;
-        }
-        .carousel-caption .lead,
-        .carousel-caption .btn {
-          font-size: 18px;
-        }
-
-        .marketing .span4 + .span4 {
-          margin-top: 40px;
-        }
-
-        .featurette-heading {
-          font-size: 30px;
-        }
-        .featurette .lead {
-          font-size: 18px;
-          line-height: 1.5;
-        }
-
-      }
+    }
     </style>
-    <link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
 
     <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
     <!--[if lt IE 9]>
@@ -226,20 +259,29 @@
 
   <body>
 
+
+
+    <!-- NAVBAR
+    ================================================== -->
+    <!-- Wrap the .navbar in .container to center it on the page and provide easy way to target it with .navbar-wrapper. -->
     <div class="container navbar-wrapper">
+
       <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. -->
           <a class="btn btn-navbar" 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="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">
@@ -254,19 +296,22 @@
               </li>
             </ul>
           </div><!--/.nav-collapse -->
-        </div>
-      </div>
+        </div><!-- /.navbar-inner -->
+      </div><!-- /.navbar -->
+
     </div><!-- /.container -->
 
 
-    <!-- Carousel -->
-    <div id="myCarousel" class="carousel slide carousel-custom">
+
+    <!-- Carousel
+    ================================================== -->
+    <div id="myCarousel" class="carousel slide">
       <div class="carousel-inner">
         <div class="item active">
           <img src="../assets/img/examples/slide-01.jpg" alt="">
           <div class="container">
             <div class="carousel-caption">
-              <h1>Example heading.</h1>
+              <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>
             </div>
@@ -276,7 +321,7 @@
           <img src="../assets/img/examples/slide-02.jpg" alt="">
           <div class="container">
             <div class="carousel-caption">
-              <h1>Heading, too.</h1>
+              <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>
             </div>
@@ -286,7 +331,7 @@
           <img src="../assets/img/examples/slide-03.jpg" alt="">
           <div class="container">
             <div class="carousel-caption">
-              <h1>One more time.</h1>
+              <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>
             </div>
@@ -295,66 +340,79 @@
       </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>
-    </div>
+    </div><!-- /.carousel -->
 
 
 
-    <div class="container">
+    <!-- Marketing messaging and featurettes
+    ================================================== -->
+    <!-- Wrap the rest of the page in another container to center all the content. -->
+
+    <div class="container marketing">
 
-      <!-- Example row of columns -->
-      <div class="row marketing">
+      <!-- Three columns of text below the carousel -->
+      <div class="row">
         <div class="span4">
+          <img class="img-circle" src="http://placehold.it/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.</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, vel scelerisque nisl consectetur et.</p>
           <p><a class="btn" href="#">View details &raquo;</a></p>
-        </div>
+        </div><!-- /.span4 -->
         <div class="span4">
+          <img class="img-circle" src="http://placehold.it/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.</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, ut fermentum massa justo sit amet risus.</p>
           <p><a class="btn" href="#">View details &raquo;</a></p>
-       </div>
+        </div><!-- /.span4 -->
         <div class="span4">
+          <img class="img-circle" src="http://placehold.it/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.</p>
+          <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>
-      </div>
+        </div><!-- /.span4 -->
+      </div><!-- /.row -->
+
+
+      <!-- START THE FEATURETTES -->
 
       <hr class="featurette-divider">
 
       <div class="featurette">
-
-        <img class="pull-right featurette-image" 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="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>
 
       <hr class="featurette-divider">
 
-
       <div class="featurette">
-        <img class="pull-left featurette-image" 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="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>
 
       <hr class="featurette-divider">
 
-
       <div class="featurette">
-        <img class="pull-right featurette-image" 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="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>
 
       <hr class="featurette-divider">
 
+      <!-- /END THE FEATURETTES -->
+
+
+      <!-- FOOTER -->
       <footer>
         <p class="pull-right"><a href="#">Back to top</a></p>
         <p>&copy; 2012 Company, Inc. &middot; <a href="#">Privacy</a> &middot; <a href="#">Terms</a></p>
       </footer>
 
-    </div> <!-- /container -->
+    </div><!-- /.container -->
+
+
 
     <!-- Le javascript
     ================================================== -->
diff --git a/docs/getting-started.html b/docs/getting-started.html
index 9af46fb55e..e86e924f3e 100644
--- a/docs/getting-started.html
+++ b/docs/getting-started.html
@@ -241,6 +241,13 @@
           </div>
           <p class="lead">Move beyond the base template with a few example layouts. We encourage folks to iterate on these examples and not simply use them as an end result.</p>
           <ul class="thumbnails bootstrap-examples">
+            <li class="span3">
+              <a class="thumbnail" href="examples/starter-template.html">
+                <img src="assets/img/examples/bootstrap-example-starter.jpg" alt="">
+              </a>
+              <h4>Starter template</h4>
+              <p>A barebones HTML document with all the Bootstrap CSS and JavaScript included.</p>
+            </li>
             <li class="span3">
               <a class="thumbnail" href="examples/hero.html">
                 <img src="assets/img/examples/bootstrap-example-hero.jpg" alt="">
@@ -255,13 +262,6 @@
               <h4>Fluid layout</h4>
               <p>Uses our new responsive, fluid grid system to create a seamless liquid layout.</p>
             </li>
-            <li class="span3">
-              <a class="thumbnail" href="examples/starter-template.html">
-                <img src="assets/img/examples/bootstrap-example-starter.jpg" alt="">
-              </a>
-              <h4>Starter template</h4>
-              <p>A barebones HTML document with all the Bootstrap CSS and JavaScript included.</p>
-            </li>
 
             <li class="span3">
               <a class="thumbnail" href="examples/marketing-narrow.html">
@@ -285,7 +285,6 @@
               <p>Pin a fixed-height footer to the bottom of the user's viewport.</p>
             </li>
 
-<!--
             <li class="span3">
               <a class="thumbnail" href="examples/carousel.html">
                 <img src="assets/img/examples/bootstrap-example-carousel.png" alt="">
@@ -293,7 +292,6 @@
               <h4>Carousel jumbotron</h4>
               <p>A more interactive riff on the basic marketing site featuring a prominent carousel.</p>
             </li>
- -->
           </ul>
         </section>
 
diff --git a/docs/templates/pages/getting-started.mustache b/docs/templates/pages/getting-started.mustache
index e96ec292cf..2eec7ff769 100644
--- a/docs/templates/pages/getting-started.mustache
+++ b/docs/templates/pages/getting-started.mustache
@@ -170,6 +170,13 @@
           </div>
           <p class="lead">{{_i}}Move beyond the base template with a few example layouts. We encourage folks to iterate on these examples and not simply use them as an end result.{{/i}}</p>
           <ul class="thumbnails bootstrap-examples">
+            <li class="span3">
+              <a class="thumbnail" href="examples/starter-template.html">
+                <img src="assets/img/examples/bootstrap-example-starter.jpg" alt="">
+              </a>
+              <h4>{{_i}}Starter template{{/i}}</h4>
+              <p>{{_i}}A barebones HTML document with all the Bootstrap CSS and JavaScript included.{{/i}}</p>
+            </li>
             <li class="span3">
               <a class="thumbnail" href="examples/hero.html">
                 <img src="assets/img/examples/bootstrap-example-hero.jpg" alt="">
@@ -184,13 +191,6 @@
               <h4>{{_i}}Fluid layout{{/i}}</h4>
               <p>{{_i}}Uses our new responsive, fluid grid system to create a seamless liquid layout.{{/i}}</p>
             </li>
-            <li class="span3">
-              <a class="thumbnail" href="examples/starter-template.html">
-                <img src="assets/img/examples/bootstrap-example-starter.jpg" alt="">
-              </a>
-              <h4>{{_i}}Starter template{{/i}}</h4>
-              <p>{{_i}}A barebones HTML document with all the Bootstrap CSS and JavaScript included.{{/i}}</p>
-            </li>
 
             <li class="span3">
               <a class="thumbnail" href="examples/marketing-narrow.html">
@@ -214,7 +214,6 @@
               <p>{{_i}}Pin a fixed-height footer to the bottom of the user's viewport.{{/i}}</p>
             </li>
 
-<!--
             <li class="span3">
               <a class="thumbnail" href="examples/carousel.html">
                 <img src="assets/img/examples/bootstrap-example-carousel.png" alt="">
@@ -222,7 +221,6 @@
               <h4>{{_i}}Carousel jumbotron{{/i}}</h4>
               <p>{{_i}}A more interactive riff on the basic marketing site featuring a prominent carousel.{{/i}}</p>
             </li>
- -->
           </ul>
         </section>