From a2a5be11a37b2095418c99139e2d648d770a5110 Mon Sep 17 00:00:00 2001
From: Lipis <lipiridis@gmail.com>
Date: Wed, 11 Sep 2013 01:34:56 +0200
Subject: Updated the old btn-large in carousel example

---
 examples/carousel/index.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'examples/carousel')

diff --git a/examples/carousel/index.html b/examples/carousel/index.html
index e92c27f7c..f716a6309 100644
--- a/examples/carousel/index.html
+++ b/examples/carousel/index.html
@@ -79,7 +79,7 @@
             <div class="carousel-caption">
               <h1>Example headline.</h1>
               <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
-              <p><a class="btn btn-large btn-primary" href="#" role="button">Sign up today</a></p>
+              <p><a class="btn btn-lg btn-primary" href="#" role="button">Sign up today</a></p>
             </div>
           </div>
         </div>
@@ -89,7 +89,7 @@
             <div class="carousel-caption">
               <h1>Another example headline.</h1>
               <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
-              <p><a class="btn btn-large btn-primary" href="#" role="button">Learn more</a></p>
+              <p><a class="btn btn-lg btn-primary" href="#" role="button">Learn more</a></p>
             </div>
           </div>
         </div>
@@ -99,7 +99,7 @@
             <div class="carousel-caption">
               <h1>One more for good measure.</h1>
               <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
-              <p><a class="btn btn-large btn-primary" href="#" role="button">Browse gallery</a></p>
+              <p><a class="btn btn-lg btn-primary" href="#" role="button">Browse gallery</a></p>
             </div>
           </div>
         </div>
-- 
cgit v1.2.3


From 8aa5181126d9480eef502403aa98e469a3597826 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Mon, 23 Sep 2013 13:00:43 -0700
Subject: move /assets/ to /docs-assets/ ; fixes #10715

---
 examples/carousel/index.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'examples/carousel')

diff --git a/examples/carousel/index.html b/examples/carousel/index.html
index f716a6309..8d1169247 100644
--- a/examples/carousel/index.html
+++ b/examples/carousel/index.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.png">
+    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
 
     <title>Carousel Template for Bootstrap</title>
 
@@ -14,8 +14,8 @@
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="../../assets/js/html5shiv.js"></script>
-      <script src="../../assets/js/respond.min.js"></script>
+      <script src="../../docs-assets/js/html5shiv.js"></script>
+      <script src="../../docs-assets/js/respond.min.js"></script>
     <![endif]-->
 
     <!-- Custom styles for this template -->
@@ -194,8 +194,8 @@
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="../../assets/js/jquery.js"></script>
+    <script src="../../docs-assets/js/jquery.js"></script>
     <script src="../../dist/js/bootstrap.min.js"></script>
-    <script src="../../assets/js/holder.js"></script>
+    <script src="../../docs-assets/js/holder.js"></script>
   </body>
 </html>
-- 
cgit v1.2.3


From 33e0877d21e701430f7bc185ab4e2c8b2e60f9c5 Mon Sep 17 00:00:00 2001
From: Julian Thilo <bigj95t@gmail.com>
Date: Tue, 24 Sep 2013 18:43:16 +0200
Subject: Disable IE Compatibility Mode in docs, examples

...because we don't support it and it may cause problems for people
trying to view the docs in IE.
---
 examples/carousel/index.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'examples/carousel')

diff --git a/examples/carousel/index.html b/examples/carousel/index.html
index 8d1169247..a57cab745 100644
--- a/examples/carousel/index.html
+++ b/examples/carousel/index.html
@@ -2,6 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-- 
cgit v1.2.3


From d72768a16abe811d987f2a38f980329260686114 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Wed, 9 Oct 2013 15:09:50 -0700
Subject: use CDN for html5shiv instead of vendoring it; fixes part of #10989

---
 examples/carousel/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'examples/carousel')

diff --git a/examples/carousel/index.html b/examples/carousel/index.html
index a57cab745..0815b2d4c 100644
--- a/examples/carousel/index.html
+++ b/examples/carousel/index.html
@@ -15,7 +15,7 @@
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="../../docs-assets/js/html5shiv.js"></script>
+      <script src="//oss.maxcdn.com/libs/html5shiv/3.6.2/html5shiv.js"></script>
       <script src="../../docs-assets/js/respond.min.js"></script>
     <![endif]-->
 
-- 
cgit v1.2.3


From 5e652332d1d5b5c3c5e86da0938d571795ce6161 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Wed, 9 Oct 2013 15:21:03 -0700
Subject: use CDN for jQuery instead of vendoring it; fixes part of #10989

---
 examples/carousel/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'examples/carousel')

diff --git a/examples/carousel/index.html b/examples/carousel/index.html
index 0815b2d4c..df12d5cef 100644
--- a/examples/carousel/index.html
+++ b/examples/carousel/index.html
@@ -195,7 +195,7 @@
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="../../docs-assets/js/jquery.js"></script>
+    <script src="//code.jquery.com/jquery-1.10.2.min.js"></script>
     <script src="../../dist/js/bootstrap.min.js"></script>
     <script src="../../docs-assets/js/holder.js"></script>
   </body>
-- 
cgit v1.2.3


From ef1fc34e616a0efda482ec54247a84d589244d55 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Wed, 9 Oct 2013 19:29:25 -0700
Subject: use data-ride="carousel" in the docs & examples; fixes #11005

---
 examples/carousel/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'examples/carousel')

diff --git a/examples/carousel/index.html b/examples/carousel/index.html
index a57cab745..c9a99cbd6 100644
--- a/examples/carousel/index.html
+++ b/examples/carousel/index.html
@@ -66,7 +66,7 @@
 
     <!-- Carousel
     ================================================== -->
-    <div id="myCarousel" class="carousel slide">
+    <div id="myCarousel" class="carousel slide" data-ride="carousel">
       <!-- Indicators -->
       <ol class="carousel-indicators">
         <li data-target="#myCarousel" data-slide-to="0" class="active"></li>
-- 
cgit v1.2.3


From c42af6951f0a665f9ad1d35a3a74051adb0aae03 Mon Sep 17 00:00:00 2001
From: Chris Rebert <github@rebertia.com>
Date: Thu, 10 Oct 2013 01:42:34 -0700
Subject: address #10965; mention Glyphicons-over-file:// problem in Carousel
 example

---
 examples/carousel/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'examples/carousel')

diff --git a/examples/carousel/index.html b/examples/carousel/index.html
index e5c3e0a31..e759e561e 100644
--- a/examples/carousel/index.html
+++ b/examples/carousel/index.html
@@ -79,7 +79,7 @@
           <div class="container">
             <div class="carousel-caption">
               <h1>Example headline.</h1>
-              <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
+              <p>Note: If you're viewing this page via a <code>file://</code> URL, the "next" and "previous" Glyphicon buttons on the left and right might not load/display properly due to web browser security rules.</p>
               <p><a class="btn btn-lg btn-primary" href="#" role="button">Sign up today</a></p>
             </div>
           </div>
-- 
cgit v1.2.3


From 4b175d908cdbe923cfb2509bd5549509c300a71e Mon Sep 17 00:00:00 2001
From: Chris Rebert <github@rebertia.com>
Date: Thu, 10 Oct 2013 01:51:09 -0700
Subject: use https:// for CDN links

- works when viewing page via file://
- sets a good example security-wise
---
 examples/carousel/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'examples/carousel')

diff --git a/examples/carousel/index.html b/examples/carousel/index.html
index e5c3e0a31..457a0013b 100644
--- a/examples/carousel/index.html
+++ b/examples/carousel/index.html
@@ -15,7 +15,7 @@
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="//oss.maxcdn.com/libs/html5shiv/3.6.2/html5shiv.js"></script>
+      <script src="https://oss.maxcdn.com/libs/html5shiv/3.6.2/html5shiv.js"></script>
       <script src="../../docs-assets/js/respond.min.js"></script>
     <![endif]-->
 
@@ -195,7 +195,7 @@
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="//code.jquery.com/jquery-1.10.2.min.js"></script>
+    <script src="https://code.jquery.com/jquery-1.10.2.min.js"></script>
     <script src="../../dist/js/bootstrap.min.js"></script>
     <script src="../../docs-assets/js/holder.js"></script>
   </body>
-- 
cgit v1.2.3


From c5da0597bcd0d2bd1daddd3a0f784b8a5e8e1a44 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Sun, 13 Oct 2013 23:18:30 -0700
Subject: use CDN for respond.js

---
 examples/carousel/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'examples/carousel')

diff --git a/examples/carousel/index.html b/examples/carousel/index.html
index 714231712..84c7aa5e6 100644
--- a/examples/carousel/index.html
+++ b/examples/carousel/index.html
@@ -16,7 +16,7 @@
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
       <script src="https://oss.maxcdn.com/libs/html5shiv/3.6.2/html5shiv.js"></script>
-      <script src="../../docs-assets/js/respond.min.js"></script>
+      <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
     <![endif]-->
 
     <!-- Custom styles for this template -->
-- 
cgit v1.2.3


From cf95fe20ba2b54eb433d513754741dc32e76a4cc Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Wed, 16 Oct 2013 15:36:14 -0700
Subject: upgrade to html5shiv v 3.7.0

---
 examples/carousel/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'examples/carousel')

diff --git a/examples/carousel/index.html b/examples/carousel/index.html
index 84c7aa5e6..8764b2015 100644
--- a/examples/carousel/index.html
+++ b/examples/carousel/index.html
@@ -15,7 +15,7 @@
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="https://oss.maxcdn.com/libs/html5shiv/3.6.2/html5shiv.js"></script>
+      <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
       <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
     <![endif]-->
 
-- 
cgit v1.2.3


From c23d6a2766f550c63f7cf64f89296a2bcd52a324 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Thu, 17 Oct 2013 18:39:03 -0700
Subject: Warn about IE8 + Respond.js + file:// problem in examples; fix #11019

---
 examples/carousel/index.html | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'examples/carousel')

diff --git a/examples/carousel/index.html b/examples/carousel/index.html
index 8764b2015..a9d5d02bb 100644
--- a/examples/carousel/index.html
+++ b/examples/carousel/index.html
@@ -13,6 +13,9 @@
     <!-- Bootstrap core CSS -->
     <link href="../../dist/css/bootstrap.css" rel="stylesheet">
 
+    <!-- Just for debugging purposes. Don't actually copy this line! -->
+    <!--[if lt IE 9]><script src="{{ page.base_url }}docs-assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
+
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
       <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
-- 
cgit v1.2.3