From f3c2c1d66d2bf67af9f03dd00b8bc7b89201fc2e Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Mon, 17 Dec 2012 10:04:01 -0800
Subject: [PATCH] Update to reflect latest master changes (namely carousel
 zindex)

---
 assets/bootstrap.zip                | Bin 84297 -> 84297 bytes
 examples/carousel.html              |   2 +-
 javascript.html                     |   5 +++--
 templates/pages/javascript.mustache |   1 +
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/assets/bootstrap.zip b/assets/bootstrap.zip
index 283e1c8e09a17b911cc5d1f850a67f34d791d493..46b148b36bb603ffd7ff004dc4a3bc96526976ee 100644
GIT binary patch
delta 525
zcmX>(iS^_pR^9+_W)?065XcFbIFVODB|GkXKpqg6R&X;gvV3J^U|<me$|BU|0@Veo
zu;)V5O+L3miWwv{(*`V*6L)^&ok9VS(BuF?2e24W>E`Kz)%?srD<+F78nOcwf$Z4q
ztN7m)Ea;zZ3Kj%PZ0=4Mbp#1c43wU{Zv`hi)Ing2KnA>C;RF@~if=Yq8KVd`VDc#&
zxZt%@k%nOVjs7UJgS-O7FlSD#{G$(d)A~QMnjnSK&#N*T!&GkPRAXEz2QqZ}Ru@J+
zW}r3G6FnHkI3b|~QvTbGQF^+9E2B6w&}Se?8L%mlu8dx&B1c^r{SYD`BTd~H?U{kT
zgy;f^Omky&hKax|0f_@GF@jkx19pzTJ7WN<$U%3YjaVG0>%nNq4D>a^Z4Dlbwg{Ji
QJaONH(Gjdh*^^NX0GKSc1ONa4

delta 525
zcmX>(iS^_pR^9+_W)?065a`J3n8>T3GGW`{fJs1HTEWf0$nuqufq_K?D2q_n2~-!T
z!afnAZt}SmQp_NsnKob{pzy{!g#sX<$pL~6FtN?k1*`d)fmTcwRWxJ=*#X3xeHH(^
zf>rvbn}St>1iRBk9YHE521-xfw}KO_80a9dMIZxSuW*7JV6rks5p3$@Q#NqHYo{U&
z!KNDhQDz5u1*RM1rpiD1FsE-`|3_96q;UFqRYqf&%I%zLj4S0phECt=!l=g#bkg)h
z4@NOgNGO4n|8`@Pp041^D9#M@El5%ZY)YgnqZg{kQCCJkgb2t;Q#VF?n2``&)7%)H
zVQOHOfK&o4F+!*WiTJxS2B3-@bO+jq#eupWjE2lWUnAVs;K67Mvjt-BeGf)Quo`7g
GMl}GC1j=dv

diff --git a/examples/carousel.html b/examples/carousel.html
index ed7740a9..0958103f 100644
--- a/examples/carousel.html
+++ b/examples/carousel.html
@@ -78,7 +78,7 @@
 
     .carousel .container {
       position: relative;
-      z-index: 10;
+      z-index: 9;
     }
 
     .carousel-control {
diff --git a/javascript.html b/javascript.html
index 49903a0b..79dedd18 100644
--- a/javascript.html
+++ b/javascript.html
@@ -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">
diff --git a/templates/pages/javascript.mustache b/templates/pages/javascript.mustache
index 2f0c056c..e6b3f812 100644
--- a/templates/pages/javascript.mustache
+++ b/templates/pages/javascript.mustache
@@ -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