]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
way cooler carousel example, along with updated screenshots for examples
authorMark Otto <markotto@twitter.com>
Fri, 14 Sep 2012 22:55:46 +0000 (15:55 -0700)
committerMark Otto <markotto@twitter.com>
Fri, 14 Sep 2012 22:55:46 +0000 (15:55 -0700)
docs/assets/img/examples/bootstrap-example-marketing-narrow.png [new file with mode: 0644]
docs/assets/img/examples/bootstrap-example-signin.png [new file with mode: 0644]
docs/examples/carousel.html
docs/getting-started.html
docs/templates/pages/getting-started.mustache

diff --git a/docs/assets/img/examples/bootstrap-example-marketing-narrow.png b/docs/assets/img/examples/bootstrap-example-marketing-narrow.png
new file mode 100644 (file)
index 0000000..a9d2d43
Binary files /dev/null and b/docs/assets/img/examples/bootstrap-example-marketing-narrow.png differ
diff --git a/docs/assets/img/examples/bootstrap-example-signin.png b/docs/assets/img/examples/bootstrap-example-signin.png
new file mode 100644 (file)
index 0000000..5f5321c
Binary files /dev/null and b/docs/assets/img/examples/bootstrap-example-signin.png differ
index 028bd6770a66ccd41dc17a8420d3c82b3246be24..16bf9dc79f52fe0c782e09275c16e0febf06be7e 100644 (file)
     <link href="../assets/css/bootstrap.css" rel="stylesheet">
     <style type="text/css">
       body {
-        padding-top: 20px;
         padding-bottom: 40px;
       }
+
+      .navbar-wrapper {
+        position: relative;
+        z-index: 10;
+        margin-top: 20px;
+        margin-bottom: -85px;
+      }
+      .carousel-custom {
+        margin-bottom: 40px;
+      }
+      .carousel-custom .container {
+        position: absolute;
+        right: 0;
+        bottom: 0;
+        left: 0;
+      }
+      .carousel-custom .carousel-caption {
+        background-color: transparent;
+        position: static;
+        max-width: 50%;
+        padding: 0;
+        margin-bottom: 60px;
+      }
+      .carousel-custom .carousel-caption h1,
+      .carousel-custom .carousel-caption .lead {
+        margin: 0;
+        line-height: 1.25;
+        color: #fff;
+        text-shadow: 0 1px 3px rgba(0,0,0,.4);
+      }
     </style>
     <link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
 
 
   <body>
 
-    <div class="container">
-
-      <div class="navbar">
+    <div class="container navbar-wrapper">
+      <div class="navbar navbar-inverse">
         <div class="navbar-inner">
-          <div class="container">
-            <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>
-            <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>
-                <li class="dropdown">
-                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
-                  <ul class="dropdown-menu">
-                    <li><a href="#">Action</a></li>
-                    <li><a href="#">Another action</a></li>
-                    <li><a href="#">Something else here</a></li>
-                    <li class="divider"></li>
-                    <li class="nav-header">Nav header</li>
-                    <li><a href="#">Separated link</a></li>
-                    <li><a href="#">One more separated link</a></li>
-                  </ul>
-                </li>
-              </ul>
-            </div><!--/.nav-collapse -->
-          </div>
+          <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>
+          <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>
+              <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
+                <ul class="dropdown-menu">
+                  <li><a href="#">Action</a></li>
+                  <li><a href="#">Another action</a></li>
+                  <li><a href="#">Something else here</a></li>
+                  <li class="divider"></li>
+                  <li class="nav-header">Nav header</li>
+                  <li><a href="#">Separated link</a></li>
+                  <li><a href="#">One more separated link</a></li>
+                </ul>
+              </li>
+            </ul>
+          </div><!--/.nav-collapse -->
         </div>
       </div>
+    </div><!-- /.container -->
 
 
-      <!-- Carousel -->
-      <div id="myCarousel" class="carousel slide">
-        <div class="carousel-inner">
-          <div class="item active">
-            <img src="http://placehold.it/1170x500" alt="">
+    <!-- Carousel -->
+    <div id="myCarousel" class="carousel slide carousel-custom">
+      <div class="carousel-inner">
+        <div class="item active">
+          <img src="http://placehold.it/2000x700" alt="">
+          <div class="container">
             <div class="carousel-caption">
-              <h4>First Thumbnail label</h4>
-              <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>
+              <h1>First Thumbnail label</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>
             </div>
           </div>
-          <div class="item">
-            <img src="http://placehold.it/1170x500" alt="">
+        </div>
+        <div class="item">
+          <img src="http://placehold.it/2000x700" alt="">
+          <div class="container">
             <div class="carousel-caption">
-              <h4>Second Thumbnail label</h4>
-              <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>
+              <h1>Second Thumbnail label</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>
             </div>
           </div>
-          <div class="item">
-            <img src="http://placehold.it/1170x500" alt="">
+        </div>
+        <div class="item">
+          <img src="http://placehold.it/2000x700" alt="">
+          <div class="container">
             <div class="carousel-caption">
-              <h4>Third Thumbnail label</h4>
-              <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>
+              <h1>Third Thumbnail label</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>
             </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>
       </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 class="container">
 
       <!-- Example row of columns -->
       <div class="row">
         <div class="span4">
-          <img class="thumbnail" src="http://placehold.it/370x185">
+          <img src="http://placehold.it/370x200">
           <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. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.</p>
           <p><a class="btn" href="#">View details &raquo;</a></p>
         </div>
         <div class="span4">
-          <img class="thumbnail" src="http://placehold.it/370x185">
+          <img src="http://placehold.it/370x200">
           <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. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.</p>
           <p><a class="btn" href="#">View details &raquo;</a></p>
        </div>
         <div class="span4">
-          <img class="thumbnail" src="http://placehold.it/370x185">
+          <img src="http://placehold.it/370x200">
           <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. Cras mattis consectetur purus sit amet fermentum.</p>
           <p><a class="btn" href="#">View details &raquo;</a></p>
     <script src="../assets/js/bootstrap-collapse.js"></script>
     <script src="../assets/js/bootstrap-carousel.js"></script>
     <script src="../assets/js/bootstrap-typeahead.js"></script>
-
+    <script>
+      !function ($) {
+        $(function(){
+          // carousel demo
+          $('#myCarousel').carousel()
+        })
+      }(window.jQuery)
+    </script>
   </body>
 </html>
index 7495ef2c2a82349ec713b3166930f462723ac2a1..7a6d05e420d629c0ae01629d81d0e42b82291a50 100644 (file)
               <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">
+                <img src="assets/img/examples/bootstrap-example-marketing-narrow.png" alt="">
+              </a>
+              <h4>Narrow marketing</h4>
+              <p>Slim, lightweight marketing template for small projects or teams.</p>
+            </li>
+            <li class="span3">
+              <a class="thumbnail" href="examples/signin.html">
+                <img src="assets/img/examples/bootstrap-example-signin.png" alt="">
+              </a>
+              <h4>Sign in</h4>
+              <p>Barebones sign in form with custom, larger form controls and a flexible layout.</p>
+            </li>
+            <li class="span3">
+              <a class="thumbnail" href="examples/carousel.html">
+                <img src="assets/img/examples/bootstrap-example-carousel.png" alt="">
+              </a>
+              <h4>Carousel jumbotron</h4>
+              <p>A more interactive riff on the basic marketing site featuring a prominent carousel.</p>
+            </li>
+
           </ul>
         </section>
 
index 512801f2b7db55a06446d194ea7e602ce8615f25..0eecd6247d11312586b9e157eab33730528073c4 100644 (file)
               <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">
+                <img src="assets/img/examples/bootstrap-example-marketing-narrow.png" alt="">
+              </a>
+              <h4>{{_i}}Narrow marketing{{/i}}</h4>
+              <p>{{_i}}Slim, lightweight marketing template for small projects or teams.{{/i}}</p>
+            </li>
+            <li class="span3">
+              <a class="thumbnail" href="examples/signin.html">
+                <img src="assets/img/examples/bootstrap-example-signin.png" alt="">
+              </a>
+              <h4>{{_i}}Sign in{{/i}}</h4>
+              <p>{{_i}}Barebones sign in form with custom, larger form controls and a flexible layout.{{/i}}</p>
+            </li>
+            <li class="span3">
+              <a class="thumbnail" href="examples/carousel.html">
+                <img src="assets/img/examples/bootstrap-example-carousel.png" alt="">
+              </a>
+              <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>