diff options
| author | Mark Otto <[email protected]> | 2011-09-10 21:06:09 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-09-10 21:06:09 -0700 |
| commit | 3407ed948d8454041f872d26e0c3e7752876147d (patch) | |
| tree | 4ef8c11b7b939c428b21c305a987709ec6c91453 /docs/javascript.html | |
| parent | 00b7dff3595d340be61894a0674800f8ed02b4ab (diff) | |
| parent | a71d5d8e991eee4073d3312743778b1991cfb650 (diff) | |
| download | bootstrap-3407ed948d8454041f872d26e0c3e7752876147d.tar.xz bootstrap-3407ed948d8454041f872d26e0c3e7752876147d.zip | |
resolved conflict
Diffstat (limited to 'docs/javascript.html')
| -rw-r--r-- | docs/javascript.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/javascript.html b/docs/javascript.html index dbb4d1458..089edda5d 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -171,7 +171,7 @@ $('#modal-content') </div> <div class="row"> <div class="span4 columns"> - <p>This plugin is for adding dropdowns to the bootstrap nav.</p> + <p>This plugin is for adding dropdown interaction to the bootstrap topbar or tabbed navigations.</p> <a href="../js/bootstrap-dropdown.js" target="_blank" class="btn primary">Download</a> </div> <div class="span12 columns"> @@ -180,7 +180,7 @@ $('#modal-content') <h3>Method</h3> <h4>$().dropdown</h4> <p> - Activates menus for given topbar navigation. + Activates menus for given topbar or tabbed navigation. </p> <h3>Demo</h3> <script> |