From 7dba45bae7efe68f7fbb501ffb9a9b25bf036638 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillermo=20Gonz=C3=A1lez=20de=20Ag=C3=BCero?=
 <z06.guillermo@gmail.com>
Date: Sun, 28 Jul 2013 19:46:15 +0200
Subject: Deleted unnecessary ID from modals example

---
 javascript.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'javascript.html')

diff --git a/javascript.html b/javascript.html
index 10e469b44..1e1bc03cd 100644
--- a/javascript.html
+++ b/javascript.html
@@ -1218,7 +1218,7 @@ $('#my-alert').bind('closed.bs.alert', function () {
       </button>
     </div><!-- /example -->
 {% highlight html %}
-<button type="button" id="fat-btn" data-loading-text="Loading..." class="btn btn-primary">
+<button type="button" data-loading-text="Loading..." class="btn btn-primary">
   Loading state
 </button>
 {% endhighlight %}
-- 
cgit v1.2.3


From b1a1210f071b696450f323f35b55b399a17d5396 Mon Sep 17 00:00:00 2001
From: Chris Rebert <github@rebertia.com>
Date: Mon, 29 Jul 2013 03:35:45 -0700
Subject: fix #8694: apply tooltip demo ordering change from #8730 to popovers
 too

---
 javascript.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'javascript.html')

diff --git a/javascript.html b/javascript.html
index 86aef097d..089aeb217 100644
--- a/javascript.html
+++ b/javascript.html
@@ -963,17 +963,17 @@ $('#myTooltip').on('hidden.bs.tooltip', function () {
     <h4>Four directions</h4>
     <div class="bs-example tooltip-demo">
       <div class="bs-example-tooltips">
+        <button type="button" class="btn btn-default" data-toggle="popover" data-placement="left" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus.">
+          Popover on left
+        </button>
         <button type="button" class="btn btn-default" data-toggle="popover" data-placement="top" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus.">
           Popover on top
         </button>
-        <button type="button" class="btn btn-default" data-toggle="popover" data-placement="right" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus.">
-          Popover on right
-        </button>
         <button type="button" class="btn btn-default" data-toggle="popover" data-placement="bottom" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus.">
           Popover on bottom
         </button>
-        <button type="button" class="btn btn-default" data-toggle="popover" data-placement="left" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus.">
-          Popover on left
+        <button type="button" class="btn btn-default" data-toggle="popover" data-placement="right" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus.">
+          Popover on right
         </button>
       </div>
     </div><!-- /example -->
-- 
cgit v1.2.3