home/bootstrap
2
0
Fork 0
mirror of https://github.com/wahyd4/bootstrap.git synced 2026-08-13 14:56:02 +10:00
Code Issues Packages Projects Releases Wiki Activity

Update to reflect latest master changes (namely carousel zindex)

Browse Source
This commit is contained in:
Mark Otto
2012-12-17 10:04:01 -08:00
parent a06f08c3c0
commit f3c2c1d66d
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/bootstrap.zip
BIN
View File
Binary file not shown.
examples/carousel.html
+1 -1
View File
@@ -78,7 +78,7 @@
.carousel .container {
position: relative;
z-index: 10;
z-index: 9;
}
.carousel-control {
javascript.html
+3 -2
View File
@@ -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">
templates/pages/javascript.mustache
+1
View File
@@ -65,6 +65,7 @@ $("#myModal").modal('show') // initializes and invokes show immed
<h3>{{_i}}No Conflict{{/i}}</h3>
<p>{{_i}}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.{{/i}}</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