rev/bootstrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

resolved conflict

Browse source
This commit is contained in:
Mark Otto 2011-09-10 21:06:09 -07:00
commit 3407ed948d
6 changed files with 52 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docs/javascript.html
View file

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