aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-09-14 15:55:46 -0700
committerMark Otto <[email protected]>2012-09-14 15:55:46 -0700
commit6c4b276cd4ca648db0afcd84aba809a74fa23bda (patch)
tree86ac334b86bcd71788fccf41a69a924d1f75ea4c /docs
parent78570890659e26f60effee3324fc3255cf6f64a3 (diff)
downloadbootstrap-6c4b276cd4ca648db0afcd84aba809a74fa23bda.tar.xz
bootstrap-6c4b276cd4ca648db0afcd84aba809a74fa23bda.zip
way cooler carousel example, along with updated screenshots for examples
Diffstat (limited to 'docs')
-rw-r--r--docs/assets/img/examples/bootstrap-example-marketing-narrow.pngbin0 -> 24920 bytes
-rw-r--r--docs/assets/img/examples/bootstrap-example-signin.pngbin0 -> 4470 bytes
-rw-r--r--docs/examples/carousel.html148
-rw-r--r--docs/getting-started.html23
-rw-r--r--docs/templates/pages/getting-started.mustache23
5 files changed, 142 insertions, 52 deletions
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
index 000000000..a9d2d4342
--- /dev/null
+++ b/docs/assets/img/examples/bootstrap-example-marketing-narrow.png
Binary files 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
index 000000000..5f5321cfd
--- /dev/null
+++ b/docs/assets/img/examples/bootstrap-example-signin.png
Binary files differ
diff --git a/docs/examples/carousel.html b/docs/examples/carousel.html
index 028bd6770..16bf9dc79 100644
--- a/docs/examples/carousel.html
+++ b/docs/examples/carousel.html
@@ -11,9 +11,38 @@
<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">
@@ -32,86 +61,94 @@
<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>
@@ -142,6 +179,13 @@
<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>
diff --git a/docs/getting-started.html b/docs/getting-started.html
index 7495ef2c2..7a6d05e42 100644
--- a/docs/getting-started.html
+++ b/docs/getting-started.html
@@ -262,6 +262,29 @@
<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>
diff --git a/docs/templates/pages/getting-started.mustache b/docs/templates/pages/getting-started.mustache
index 512801f2b..0eecd6247 100644
--- a/docs/templates/pages/getting-started.mustache
+++ b/docs/templates/pages/getting-started.mustache
@@ -191,6 +191,29 @@
<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>
generated by cgit v1.2.3 (git 2.25.1) at 2026-06-06 12:57:59 +0000