mirror of
https://github.com/wahyd4/bootstrap.git
synced 2026-08-09 12:56:17 +10:00
Update to reflect latest master changes (namely carousel zindex)
This commit is contained in:
+3
-2
@@ -146,6 +146,7 @@ $("#myModal").modal('show') // initializes and invokes show immed
|
||||
|
||||
<h3>No Conflict</h3>
|
||||
<p>Sometimes it is necessary to use Bootstrap plugins with other UI frameworks. In these circumstances, namespace collisions can occasionally occur. If this happens, you may call <code>.noConflict</code> on the plugin you wish to revert the value of.</p>
|
||||
|
||||
<pre class="prettyprint linenums">
|
||||
var bootstrapButton = $.fn.button.noConflict() // return $.fn.button to previously assigned value
|
||||
$.fn.bootstrapBtn = bootstrapButton // give $().bootstrapBtn the bootstrap functionality
|
||||
@@ -447,7 +448,7 @@ $('#myModal').on('hidden', function () {
|
||||
</div>
|
||||
</div>
|
||||
</div> <!-- /navbar-example -->
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h3>Within tabs</h3>
|
||||
<div class="bs-docs-example">
|
||||
@@ -484,7 +485,7 @@ $('#myModal').on('hidden', function () {
|
||||
</ul>
|
||||
</li>
|
||||
</ul> <!-- /tabs -->
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<hr class="bs-docs-separator">
|
||||
|
||||
Reference in New Issue
Block a user