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

---
 _includes/header.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '_includes')

diff --git a/_includes/header.html b/_includes/header.html
index d3cb270cb..d9094a0ac 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -21,7 +21,7 @@
 
 <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
 <!--[if lt IE 9]>
-  <script src="{{ page.base_url }}docs-assets/js/html5shiv.js"></script>
+  <script src="//oss.maxcdn.com/libs/html5shiv/3.6.2/html5shiv.js"></script>
   <script src="{{ page.base_url }}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

---
 _includes/footer.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '_includes')

diff --git a/_includes/footer.html b/_includes/footer.html
index 9e66c58a1..c791b4144 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,7 +1,7 @@
 <!-- Bootstrap core JavaScript
 ================================================== -->
 <!-- Placed at the end of the document so the pages load faster -->
-<script src="{{ page.base_url }}docs-assets/js/jquery.js"></script>
+<script src="//code.jquery.com/jquery-1.10.2.min.js"></script>
 <script src="{{ page.base_url }}dist/js/bootstrap.js"></script>
 
 <script src="http://platform.twitter.com/widgets.js"></script>
-- 
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
---
 _includes/footer.html | 2 +-
 _includes/header.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to '_includes')

diff --git a/_includes/footer.html b/_includes/footer.html
index c791b4144..7f9f8f103 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,7 +1,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="{{ page.base_url }}dist/js/bootstrap.js"></script>
 
 <script src="http://platform.twitter.com/widgets.js"></script>
diff --git a/_includes/header.html b/_includes/header.html
index d9094a0ac..efd14c332 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -21,7 +21,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="{{ page.base_url }}docs-assets/js/respond.min.js"></script>
 <![endif]-->
 
-- 
cgit v1.2.3


From 12fa502e67df45d27e151fd51b5a497489232626 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Sun, 13 Oct 2013 15:23:58 -0700
Subject: Document caret /cc #10102

---
 _includes/nav-css.html | 1 +
 1 file changed, 1 insertion(+)

(limited to '_includes')

diff --git a/_includes/nav-css.html b/_includes/nav-css.html
index ae5962c7c..4ef5e4bca 100644
--- a/_includes/nav-css.html
+++ b/_includes/nav-css.html
@@ -79,6 +79,7 @@
   <a href="#helper-classes">Helper classes</a>
   <ul class="nav">
     <li><a href="#helper-classes-close">Close icon</a></li>
+    <li><a href="#helper-classes-carets">Carets</a></li>
     <li><a href="#helper-classes-floats">Quick floats</a></li>
     <li><a href="#helper-classes-center">Center content blocks</a></li>
     <li><a href="#helper-classes-clearfix">Clearfix</a></li>
-- 
cgit v1.2.3


From 49f177fe6034c00242705a2f02b29758aaf96879 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Sun, 13 Oct 2013 17:12:04 -0700
Subject: finish grid docs intro for now; needs work though

---
 _includes/nav-css.html | 1 +
 1 file changed, 1 insertion(+)

(limited to '_includes')

diff --git a/_includes/nav-css.html b/_includes/nav-css.html
index 4ef5e4bca..543d004f3 100644
--- a/_includes/nav-css.html
+++ b/_includes/nav-css.html
@@ -12,6 +12,7 @@
 <li>
   <a href="#grid">Grid system</a>
   <ul class="nav">
+    <li><a href="#grid-intro">Introduction</a></li>
     <li><a href="#grid-media-queries">Media queries</a></li>
     <li><a href="#grid-options">Grid options</a></li>
     <li><a href="#grid-example-basic">Ex: Stacked-to-horizonal</a></li>
-- 
cgit v1.2.3