Skip to content

B
bootstrap
Commit bd170e83 authored by Mark Otto's avatar Mark Otto
Browse files
Options

Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

parents 19d07266 ddf95c91
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 92 additions and 85 deletions
docs/assets/js/bootstrap.js
View file @ bd170e83
...@@ -442,7 +442,7 @@ ...@@ -442,7 +442,7 @@
$target.carousel(options) $target.carousel(options)
if (slideIndex = $this.attr('data-slide-to')) { if (slideIndex = $this.attr('data-slide-to')) {
$target.data('bs-carousel').pause().to(slideIndex).cycle() $target.data('bs.carousel').pause().to(slideIndex).cycle()
} }
e.preventDefault() e.preventDefault()
......
docs/assets/js/bootstrap.min.js
View file @ bd170e83
This diff is collapsed.
docs/getting-started.html
View file @ bd170e83
...@@ -116,91 +116,98 @@ bootstrap/ ...@@ -116,91 +116,98 @@ bootstrap/
{% endhighlight %} {% endhighlight %}
<h3 id="examples-list">Examples</h3> <h3 id="examples-list">Examples</h3>
<div class="row bs-examples"> <div class="bs-examples">
<div class="col col-lg-4"> <div class="row">
<a class="thumbnail" href="/examples/starter-template/" target="_blank"> <div class="col col-lg-4">
<img src="/assets/img/examples/bootstrap-example-starter.png" alt=""> <a class="thumbnail" href="/examples/starter-template/" target="_blank">
</a> <img src="/assets/img/examples/bootstrap-example-starter.png" alt="">
<h4>Starter template</h4> </a>
<p>A barebones HTML page with Bootstrap's CSS and JavaScript included.</p> <h4>Starter template</h4>
<p>A barebones HTML page with Bootstrap's CSS and JavaScript included.</p>
</div>
<div class="col col-lg-4">
<a class="thumbnail" href="/examples/grid/" target="_blank">
<img src="/assets/img/examples/bootstrap-example-grid.png" alt="">
</a>
<h4>Basic grid layouts</h4>
<p>Simple grid layouts to familiarize you with using the Bootstrap grid system.</p>
</div>
<div class="col col-lg-4">
<a class="thumbnail" href="/examples/jumbotron/" target="_blank">
<img src="/assets/img/examples/bootstrap-example-marketing.png" alt="">
</a>
<h4>Basic marketing site</h4>
<p>Features a jumbotron for primary message and three supporting elements.</p>
</div>
</div> </div>
<div class="col col-lg-4"> <div class="row">
<a class="thumbnail" href="/examples/grid/" target="_blank"> <div class="col col-lg-4">
<img src="/assets/img/examples/bootstrap-example-grid.png" alt=""> <a class="thumbnail" href="/examples/jumbotron-narrow/" target="_blank">
</a> <img src="/assets/img/examples/bootstrap-example-jumbotron-narrow.png" alt="">
<h4>Basic grid layouts</h4> </a>
<p>Simple grid layouts to familiarize you with using the Bootstrap grid system.</p> <h4>Narrow marketing</h4>
<p>Slim, lightweight marketing template for small projects or teams.</p>
</div>
<div class="col col-lg-4">
<a class="thumbnail" href="/examples/justified-nav/" target="_blank">
<img src="/assets/img/examples/bootstrap-example-justified-nav.png" alt="">
</a>
<h4>Justified nav</h4>
<p>Marketing page with equal-width navigation links in a modified navbar.</p>
</div>
<div class="col col-lg-4">
<a class="thumbnail" href="/examples/signin/" target="_blank">
<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>
</div>
</div> </div>
<div class="col col-lg-4"> <div class="row">
<a class="thumbnail" href="/examples/jumbotron/" target="_blank"> <div class="col col-lg-4">
<img src="/assets/img/examples/bootstrap-example-marketing.png" alt=""> <a class="thumbnail" href="/examples/sticky-footer/" target="_blank">
</a> <img src="/assets/img/examples/bootstrap-example-sticky-footer.png" alt="">
<h4>Basic marketing site</h4> </a>
<p>Features a jumbotron for primary message and three supporting elements.</p> <h4>Sticky footer</h4>
<p>Pin a fixed-height footer to the bottom of the user's viewport.</p>
</div>
<div class="col col-lg-4">
<a class="thumbnail" href="/examples/sticky-footer-navbar/" target="_blank">
<img src="/assets/img/examples/bootstrap-example-sticky-footer-navbar.png" alt="">
</a>
<h4>Sticky footer w/ navbar</h4>
<p>Add a fixed navbar to the default sticky footer template.</p>
</div>
<div class="col col-lg-4">
<a class="thumbnail" href="/examples/carousel/" target="_blank">
<img src="/assets/img/examples/bootstrap-example-carousel.png" alt="">
</a>
<h4>Carousel jumbotron</h4>
<p>An interactive riff on the basic marketing site featuring a prominent carousel.</p>
</div>
</div> </div>
<div class="col col-lg-4"> <div class="row">
<a class="thumbnail" href="/examples/jumbotron-narrow/" target="_blank"> <div class="col col-lg-4">
<img src="/assets/img/examples/bootstrap-example-jumbotron-narrow.png" alt=""> <a class="thumbnail" href="/examples/navbar/" target="_blank">
</a> <img src="/assets/img/examples/bootstrap-example-navbar.png" alt="">
<h4>Narrow marketing</h4> </a>
<p>Slim, lightweight marketing template for small projects or teams.</p> <h4>Navbar</h4>
</div> <p>Basic template for showcasing how the navbar works.</p>
<div class="col col-lg-4"> </div>
<a class="thumbnail" href="/examples/justified-nav/" target="_blank"> <div class="col col-lg-4">
<img src="/assets/img/examples/bootstrap-example-justified-nav.png" alt=""> <a class="thumbnail" href="/examples/navbar-static-top/" target="_blank">
</a> <img src="/assets/img/examples/bootstrap-example-navbar-static-top.png" alt="">
<h4>Justified nav</h4> </a>
<p>Marketing page with equal-width navigation links in a modified navbar.</p> <h4>Static top navbar</h4>
</div> <p>Basic template for showcasing the static navbar variation.</p>
<div class="col col-lg-4"> </div>
<a class="thumbnail" href="/examples/signin/" target="_blank"> <div class="col col-lg-4">
<img src="/assets/img/examples/bootstrap-example-signin.png" alt=""> <a class="thumbnail" href="/examples/navbar-fixed-top/" target="_blank">
</a> <img src="/assets/img/examples/bootstrap-example-navbar-fixed-top.png" alt="">
<h4>Sign in</h4> </a>
<p>Barebones sign in form with custom, larger form controls and a flexible layout.</p> <h4>Fixed top navbar</h4>
</div> <p>Basic template for showcasing the fixed navbar variation.</p>
<div class="col col-lg-4"> </div>
<a class="thumbnail" href="/examples/sticky-footer/" target="_blank">
<img src="/assets/img/examples/bootstrap-example-sticky-footer.png" alt="">
</a>
<h4>Sticky footer</h4>
<p>Pin a fixed-height footer to the bottom of the user's viewport.</p>
</div>
<div class="col col-lg-4">
<a class="thumbnail" href="/examples/sticky-footer-navbar/" target="_blank">
<img src="/assets/img/examples/bootstrap-example-sticky-footer-navbar.png" alt="">
</a>
<h4>Sticky footer w/ navbar</h4>
<p>Add a fixed navbar to the default sticky footer template.</p>
</div>
<div class="col col-lg-4">
<a class="thumbnail" href="/examples/carousel/" target="_blank">
<img src="/assets/img/examples/bootstrap-example-carousel.png" alt="">
</a>
<h4>Carousel jumbotron</h4>
<p>An interactive riff on the basic marketing site featuring a prominent carousel.</p>
</div>
<div class="col col-lg-4">
<a class="thumbnail" href="/examples/navbar/" target="_blank">
<img src="/assets/img/examples/bootstrap-example-navbar.png" alt="">
</a>
<h4>Navbar</h4>
<p>Basic template for showcasing how the navbar works.</p>
</div>
<div class="col col-lg-4">
<a class="thumbnail" href="/examples/navbar-static-top/" target="_blank">
<img src="/assets/img/examples/bootstrap-example-navbar-static-top.png" alt="">
</a>
<h4>Static top navbar</h4>
<p>Basic template for showcasing the static navbar variation.</p>
</div>
<div class="col col-lg-4">
<a class="thumbnail" href="/examples/navbar-fixed-top/" target="_blank">
<img src="/assets/img/examples/bootstrap-example-navbar-fixed-top.png" alt="">
</a>
<h4>Fixed top navbar</h4>
<p>Basic template for showcasing the fixed navbar variation.</p>
</div> </div>
</div> </div>
</div> </div>
......
js/carousel.js
View file @ bd170e83
...@@ -194,7 +194,7 @@ ...@@ -194,7 +194,7 @@
$target.carousel(options) $target.carousel(options)
if (slideIndex = $this.attr('data-slide-to')) { if (slideIndex = $this.attr('data-slide-to')) {
$target.data('bs-carousel').pause().to(slideIndex).cycle() $target.data('bs.carousel').pause().to(slideIndex).cycle()
} }
e.preventDefault() e.preventDefault()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment