aboutsummaryrefslogtreecommitdiff
path: root/docs/index.html
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2011-09-10 15:29:53 -0700
committerMark Otto <[email protected]>2011-09-10 15:29:53 -0700
commita95a0ed71c935c61c7c3d045e82df0b1d0cf5725 (patch)
tree4f99c3837487851e475f317977169a389d277c6e /docs/index.html
parent99ede580cf85611bf446abd46fa1ad4daf850a59 (diff)
parenta8d447582741486e66a6a073015a9e9bd431af29 (diff)
downloadbootstrap-a95a0ed71c935c61c7c3d045e82df0b1d0cf5725.tar.xz
bootstrap-a95a0ed71c935c61c7c3d045e82df0b1d0cf5725.zip
conflict
Diffstat (limited to 'docs/index.html')
-rw-r--r--docs/index.html23
1 files changed, 4 insertions, 19 deletions
diff --git a/docs/index.html b/docs/index.html
index 09e7951fe..2c32d50bc 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -22,6 +22,7 @@
<script src="assets/js/google-code-prettify/prettify.js"></script>
<script>$(function () { prettyPrint() })</script>
<script src="../js/bootstrap-dropdown.js"></script>
+ <script src="../js/bootstrap-twipsy.js"></script>
<script src="assets/js/application.js"></script>
<script src="assets/js/application-scrollspy.js"></script>
@@ -1475,22 +1476,6 @@
<p class="muted" style="margin-bottom: 0">
Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> veritatis aut iste perspiciatis iste voluptas natus illo quasi odit aut natus consequuntur consequuntur, aut natus illo voluptatem odit perspiciatis laudantium rem doloremque totam voluptas. <a href="#" title="right">Voluptasdicta</a> eaque beatae aperiam ut enim voluptatem explicabo explicabo, voluptas quia odit fugit accusantium totam totam architecto explicabo sit quasi fugit fugit, totam doloremque unde sunt <a href="#" title="left">sed</a> dicta quae accusantium fugit voluptas nemo voluptas voluptatem <a href="#" title="above">rem</a> quae aut veritatis quasi quae.
</p>
- <div class="twipsy below">
- <div class="twipsy-arrow"></div>
- <div class="twipsy-inner">below!</div>
- </div>
- <div class="twipsy right">
- <div class="twipsy-arrow"></div>
- <div class="twipsy-inner">right!</div>
- </div>
- <div class="twipsy left">
- <div class="twipsy-arrow"></div>
- <div class="twipsy-inner">left!</div>
- </div>
- <div class="twipsy above">
- <div class="twipsy-arrow"></div>
- <div class="twipsy-inner">above!</div>
- </div>
</div>
</div>
</div>
@@ -1556,15 +1541,15 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita
</tr>
<tr>
<td><a href="./javascript.html#dropdowns">bootstrap-dropdown.js</a></td>
- <td>This plugin is for adding dropdown to the bootstrap nav.</td>
+ <td>This plugin is for adding dropdowns to the bootstrap topbar or tabbed navigations.</td>
</tr>
<tr>
<td><a href="./javascript.html#tabs">bootstrap-tabs.js</a></td>
- <td>This plugin adds quick, dynamic tab and pill functionality.</td>
+ <td>This plugin adds quick, dynamic tab and pill functionality for cycling through local content.</td>
</tr>
<tr>
<td><a href="./javascript.html#twipsy">bootstrap-twipsy.js</a></td>
- <td>Based on the excellent jQuery.tipsy plugin written by Jason Frame; twipsy is an updated version, which doesn't rely on images, uses css3 for animations, and data-attributes for title storage!</td>
+ <td>Based on the excellent jQuery.tipsy plugin written by Jason Frame; twipsy is an updated version, which doesn't rely on images, uses css3 for animations, and data-attributes for local title storage!</td>
</tr>
<tr>
<td><a href="./javascript.html#popover">bootstrap-popover.js</a></td>