mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-17 02:54:01 +02:00
Code Issues Releases Wiki Activity

resolved conflict

Browse Source
This commit is contained in:
Mark Otto
2011-09-10 21:06:09 -07:00
parent 00b7dff359 a71d5d8e99
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/index.html
View File

@@ -1467,7 +1467,7 @@
<!-- Tooltips -->
<div class="row">
<div class="span4">
<h2>Tool Tips</h2>
<h2>Tooltips</h2>
<p>Twipsies are super useful for aiding a confused user and pointing them in the right direction.</p>
</div>
<div class="span12">
@@ -1542,7 +1542,7 @@ 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 dropdowns to the bootstrap topbar or tabbed navigations.</td>
<td>This plugin is for adding dropdown interaction to the bootstrap topbar or tabbed navigations.</td>
</tr>
<tr>
<td><a href="./javascript.html#tabs">bootstrap-tabs.js</a></td>

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>