Skip to content

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

Merge branch 'master' of github.com:twbs/bootstrap

parents e08e871f 72a31db2
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
docs/javascript.html
View file @ 45ea4564
...@@ -2034,7 +2034,7 @@ $('#myCarousel').on('slide.bs.carousel', function () { ...@@ -2034,7 +2034,7 @@ $('#myCarousel').on('slide.bs.carousel', function () {
<h1 id="affix" class="page-header">Affix <small>affix.js</small></h1> <h1 id="affix" class="page-header">Affix <small>affix.js</small></h1>
<h2 id="affix-examples">Example</h2> <h2 id="affix-examples">Example</h2>
<p>The subnavigation on the left is a live demo of the affix plugin.</p> <p>The subnavigation on the right is a live demo of the affix plugin.</p>
<hr class="bs-docs-separator"> <hr class="bs-docs-separator">
......
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