mirror/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-24 12:40:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'meleyal-fix-carousel-docs' into 2.0.2-wip

Browse Source 
Conflicts:
	docs/javascript.html
	docs/templates/pages/javascript.mustache
This commit is contained in:
Mark Otto 2012-02-27 21:22:20 -08:00
commit 5cc4fcf6a2
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
docs/assets/bootstrap.zip
View File

Binary file not shown.

4
docs/javascript.html
View File

@ -1319,7 +1319,7 @@ $('#myCollapsible').on('hidden', function () {
</tbody> </tbody>
</table> </table>
<h3>Markup</h3> <h3>Markup</h3>
<p>Data attributes are integral to the carousel plugin. Check out the example code below for the various markup types.</p> <p>Data attributes are used for the previous and next conrols. Check out the example markup below.</p>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
&lt;div id="myCarousel" class="carousel"&gt; &lt;div id="myCarousel" class="carousel"&gt;
&lt;!-- Carousel items --&gt; &lt;!-- Carousel items --&gt;
@ -1352,7 +1352,7 @@ $('.carousel').carousel({
<h4>.carousel('next')</h4> <h4>.carousel('next')</h4>
<p>Cycles to the next item.</p> <p>Cycles to the next item.</p>
<h3>Events</h3> <h3>Events</h3>
<p>Bootstrap's carousel class exposes a few events for hooking into carousel functionality.</p> <p>Bootstrap's carousel class exposes two events for hooking into carousel functionality.</p>
<table class="table table-bordered table-striped"> <table class="table table-bordered table-striped">
<thead> <thead>
<tr> <tr>

4
docs/templates/pages/javascript.mustache vendored
View File

@ -1243,7 +1243,7 @@ $('#myCollapsible').on('hidden', function () {
</tbody> </tbody>
</table> </table>
<h3>{{_i}}Markup{{/i}}</h3> <h3>{{_i}}Markup{{/i}}</h3>
<p>{{_i}}Data attributes are integral to the carousel plugin. Check out the example code below for the various markup types.{{/i}}</p> <p>{{_i}}Data attributes are used for the previous and next conrols. Check out the example markup below.{{/i}}</p>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
&lt;div id="myCarousel" class="carousel"&gt; &lt;div id="myCarousel" class="carousel"&gt;
&lt;!-- {{_i}}Carousel items{{/i}} --&gt; &lt;!-- {{_i}}Carousel items{{/i}} --&gt;
@ -1276,7 +1276,7 @@ $('.carousel').carousel({
<h4>.carousel('next')</h4> <h4>.carousel('next')</h4>
<p>{{_i}}Cycles to the next item.{{/i}}</p> <p>{{_i}}Cycles to the next item.{{/i}}</p>
<h3>{{_i}}Events{{/i}}</h3> <h3>{{_i}}Events{{/i}}</h3>
<p>{{_i}}Bootstrap's carousel class exposes a few events for hooking into carousel functionality.{{/i}}</p> <p>{{_i}}Bootstrap's carousel class exposes two events for hooking into carousel functionality.{{/i}}</p>
<table class="table table-bordered table-striped"> <table class="table table-bordered table-striped">
<thead> <thead>
<tr> <tr>