rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-06 04:08:22 +01:00
Code Issues Actions Packages Releases Activity

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

Browse Source
This commit is contained in:
Mark Otto 2013-06-02 14:08:50 -07:00
commit bd170e8366
4 changed files with 92 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/assets/js/bootstrap.js vendored
View File

@ -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()

2
docs/assets/js/bootstrap.min.js vendored
View File

File diff suppressed because one or more lines are too long

11
docs/getting-started.html
View File

@ -116,7 +116,8 @@ 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="row">
<div class="col col-lg-4"> <div class="col col-lg-4">
<a class="thumbnail" href="/examples/starter-template/" target="_blank"> <a class="thumbnail" href="/examples/starter-template/" target="_blank">
<img src="/assets/img/examples/bootstrap-example-starter.png" alt=""> <img src="/assets/img/examples/bootstrap-example-starter.png" alt="">
@ -138,6 +139,8 @@ bootstrap/
<h4>Basic marketing site</h4> <h4>Basic marketing site</h4>
<p>Features a jumbotron for primary message and three supporting elements.</p> <p>Features a jumbotron for primary message and three supporting elements.</p>
</div> </div>
</div>
<div class="row">
<div class="col col-lg-4"> <div class="col col-lg-4">
<a class="thumbnail" href="/examples/jumbotron-narrow/" target="_blank"> <a class="thumbnail" href="/examples/jumbotron-narrow/" target="_blank">
<img src="/assets/img/examples/bootstrap-example-jumbotron-narrow.png" alt=""> <img src="/assets/img/examples/bootstrap-example-jumbotron-narrow.png" alt="">
@ -159,6 +162,8 @@ bootstrap/
<h4>Sign in</h4> <h4>Sign in</h4>
<p>Barebones sign in form with custom, larger form controls and a flexible layout.</p> <p>Barebones sign in form with custom, larger form controls and a flexible layout.</p>
</div> </div>
</div>
<div class="row">
<div class="col col-lg-4"> <div class="col col-lg-4">
<a class="thumbnail" href="/examples/sticky-footer/" target="_blank"> <a class="thumbnail" href="/examples/sticky-footer/" target="_blank">
<img src="/assets/img/examples/bootstrap-example-sticky-footer.png" alt=""> <img src="/assets/img/examples/bootstrap-example-sticky-footer.png" alt="">
@ -180,7 +185,8 @@ bootstrap/
<h4>Carousel jumbotron</h4> <h4>Carousel jumbotron</h4>
<p>An interactive riff on the basic marketing site featuring a prominent carousel.</p> <p>An interactive riff on the basic marketing site featuring a prominent carousel.</p>
</div> </div>
</div>
<div class="row">
<div class="col col-lg-4"> <div class="col col-lg-4">
<a class="thumbnail" href="/examples/navbar/" target="_blank"> <a class="thumbnail" href="/examples/navbar/" target="_blank">
<img src="/assets/img/examples/bootstrap-example-navbar.png" alt=""> <img src="/assets/img/examples/bootstrap-example-navbar.png" alt="">
@ -204,6 +210,7 @@ bootstrap/
</div> </div>
</div> </div>
</div> </div>
</div>

2
js/carousel.js
View File

@ -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()