From 77549410d52f86c2d42136014f5a2ae21f4cabee Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Sun, 8 Sep 2013 18:37:39 -0700
Subject: Add Welcome section to docs

* Fixes unrelated typo in readme
* Add new Welcome section with history, team, callouts, and community
subsections
* Redesigns callouts to be a bit lighterweight with colored headings
---
 _includes/nav-getting-started.html | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to '_includes')

diff --git a/_includes/nav-getting-started.html b/_includes/nav-getting-started.html
index 243c05fb0..c06896e6a 100644
--- a/_includes/nav-getting-started.html
+++ b/_includes/nav-getting-started.html
@@ -1,3 +1,12 @@
+<li>
+  <a href="#welcome">Welcome</a>
+  <ul class="nav">
+    <li><a href="#welcome-history">Brief history</a></li>
+    <li><a href="#welcome-core-team">Core team</a></li>
+    <li><a href="#welcome-callouts">Callouts</a></li>
+    <li><a href="#welcome-community">Community</a></li>
+  </ul>
+</li>
 <li>
   <a href="#download">Download Bootstrap</a>
   <ul class="nav">
-- 
cgit v1.2.3


From 022e40404c283bc6f211cf3e5d55ef7a7d204cdb Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Tue, 10 Sep 2013 21:46:12 -0700
Subject: Remove multiple touch icons and roll with a single one

---
 _includes/header.html | 3 ---
 1 file changed, 3 deletions(-)

(limited to '_includes')

diff --git a/_includes/header.html b/_includes/header.html
index 433af17f8..982c9e02e 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -26,9 +26,6 @@
 
 <!-- Favicons -->
 <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ page.base_url }}assets/ico/apple-touch-icon-144-precomposed.png">
-<link rel="apple-touch-icon-precomposed" sizes="114x114" href="{{ page.base_url }}assets/ico/apple-touch-icon-114-precomposed.png">
-  <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ page.base_url }}assets/ico/apple-touch-icon-72-precomposed.png">
-                <link rel="apple-touch-icon-precomposed" href="{{ page.base_url }}assets/ico/apple-touch-icon-57-precomposed.png">
                                <link rel="shortcut icon" href="{{ page.base_url }}assets/ico/favicon.png">
 
 <script>
-- 
cgit v1.2.3


From c69092a17696b4a0ab6927d695f2fb56d65f498e Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Wed, 11 Sep 2013 12:30:46 -0700
Subject: move to separate about page

---
 _includes/nav-about.html | 9 +++++++++
 _includes/nav-main.html  | 5 +++++
 2 files changed, 14 insertions(+)
 create mode 100644 _includes/nav-about.html

(limited to '_includes')

diff --git a/_includes/nav-about.html b/_includes/nav-about.html
new file mode 100644
index 000000000..d6f971f6b
--- /dev/null
+++ b/_includes/nav-about.html
@@ -0,0 +1,9 @@
+<li>
+  <a href="#history">History</a>
+</li>
+<li>
+  <a href="#team">Core team</a>
+</li>
+<li>
+  <a href="#community">Community</a>
+</li>
diff --git a/_includes/nav-main.html b/_includes/nav-main.html
index c880c3293..a64b7c8ae 100644
--- a/_includes/nav-main.html
+++ b/_includes/nav-main.html
@@ -27,6 +27,11 @@
           <a href="{{ page.base_url }}customize">Customize</a>
         </li>
       </ul>
+      <ul class="nav navbar-nav navbar-right">
+        <li{% if page.slug == "about" %} class="active"{% endif %}>
+          <a href="{{ page.base_url }}about">About</a>
+        </li>
+      </ul>
     </nav>
   </div>
 </header>
-- 
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

---
 _includes/footer.html | 18 +++++++++---------
 _includes/header.html | 12 ++++++------
 2 files changed, 15 insertions(+), 15 deletions(-)

(limited to '_includes')

diff --git a/_includes/footer.html b/_includes/footer.html
index d187f95d5..9e66c58a1 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,21 +1,21 @@
 <!-- Bootstrap core JavaScript
 ================================================== -->
 <!-- Placed at the end of the document so the pages load faster -->
-<script src="{{ page.base_url }}assets/js/jquery.js"></script>
+<script src="{{ page.base_url }}docs-assets/js/jquery.js"></script>
 <script src="{{ page.base_url }}dist/js/bootstrap.js"></script>
 
 <script src="http://platform.twitter.com/widgets.js"></script>
-<script src="{{ page.base_url }}assets/js/holder.js"></script>
+<script src="{{ page.base_url }}docs-assets/js/holder.js"></script>
 
-<script src="{{ page.base_url }}assets/js/application.js"></script>
+<script src="{{ page.base_url }}docs-assets/js/application.js"></script>
 
 {% if page.slug == "customize" %}
-<script src="{{ page.base_url }}assets/js/less.js"></script>
-<script src="{{ page.base_url }}assets/js/jszip.js"></script>
-<script src="{{ page.base_url }}assets/js/uglify.js"></script>
-<script src="{{ page.base_url }}assets/js/filesaver.js"></script>
-<script src="{{ page.base_url }}assets/js/raw-files.js"></script>
-<script src="{{ page.base_url }}assets/js/customizer.js"></script>
+<script src="{{ page.base_url }}docs-assets/js/less.js"></script>
+<script src="{{ page.base_url }}docs-assets/js/jszip.js"></script>
+<script src="{{ page.base_url }}docs-assets/js/uglify.js"></script>
+<script src="{{ page.base_url }}docs-assets/js/filesaver.js"></script>
+<script src="{{ page.base_url }}docs-assets/js/raw-files.js"></script>
+<script src="{{ page.base_url }}docs-assets/js/customizer.js"></script>
 {% endif %}
 
 <!-- Analytics
diff --git a/_includes/header.html b/_includes/header.html
index 982c9e02e..2be9dc110 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -15,18 +15,18 @@
 <link href="{{ page.base_url }}dist/css/bootstrap.css" rel="stylesheet">
 
 <!-- Documentation extras -->
-<link href="{{ page.base_url }}assets/css/docs.css" rel="stylesheet">
-<link href="{{ page.base_url }}assets/css/pygments-manni.css" rel="stylesheet">
+<link href="{{ page.base_url }}docs-assets/css/docs.css" rel="stylesheet">
+<link href="{{ page.base_url }}docs-assets/css/pygments-manni.css" rel="stylesheet">
 
 <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
 <!--[if lt IE 9]>
-  <script src="{{ page.base_url }}assets/js/html5shiv.js"></script>
-  <script src="{{ page.base_url }}assets/js/respond.min.js"></script>
+  <script src="{{ page.base_url }}docs-assets/js/html5shiv.js"></script>
+  <script src="{{ page.base_url }}docs-assets/js/respond.min.js"></script>
 <![endif]-->
 
 <!-- Favicons -->
-<link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ page.base_url }}assets/ico/apple-touch-icon-144-precomposed.png">
-                               <link rel="shortcut icon" href="{{ page.base_url }}assets/ico/favicon.png">
+<link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ page.base_url }}docs-assets/ico/apple-touch-icon-144-precomposed.png">
+                               <link rel="shortcut icon" href="{{ page.base_url }}docs-assets/ico/favicon.png">
 
 <script>
   var _gaq = _gaq || [];
-- 
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.
---
 _includes/header.html | 1 +
 1 file changed, 1 insertion(+)

(limited to '_includes')

diff --git a/_includes/header.html b/_includes/header.html
index 2be9dc110..d3cb270cb 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -1,4 +1,5 @@
 <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

---
 _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 c814ad18333d7deefd3bff5446b02d6933f49f02 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Fri, 11 Oct 2013 22:00:37 -0700
Subject: Combine separate efforts for grid mixins into one, cleanup and
 reorganize

---
 _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..09f498bfb 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -13,7 +13,7 @@
 </title>
 
 <!-- Bootstrap core CSS -->
-<link href="{{ page.base_url }}dist/css/bootstrap.css" rel="stylesheet">
+<link href="{{ page.base_url }}dist/css/bootstrap.min.css" rel="stylesheet">
 
 <!-- Documentation extras -->
 <link href="{{ page.base_url }}docs-assets/css/docs.css" rel="stylesheet">
-- 
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


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

---
 _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 b25f2cf43..e70f6a8b6 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -22,7 +22,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="{{ page.base_url }}docs-assets/js/respond.min.js"></script>
+  <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
 <![endif]-->
 
 <!-- Favicons -->
-- 
cgit v1.2.3


From 25607c268337c6505f633309e2765cf328a6896b Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Sun, 13 Oct 2013 23:19:11 -0700
Subject: add translations, copy edit a few things, and fix alignment of ads

---
 _includes/nav-about.html | 3 +++
 1 file changed, 3 insertions(+)

(limited to '_includes')

diff --git a/_includes/nav-about.html b/_includes/nav-about.html
index d6f971f6b..2cf12359b 100644
--- a/_includes/nav-about.html
+++ b/_includes/nav-about.html
@@ -7,3 +7,6 @@
 <li>
   <a href="#community">Community</a>
 </li>
+<li>
+  <a href="#translations">Translations</a>
+</li>
-- 
cgit v1.2.3


From 1f5c754d576f9534da2cc2176bf2193d31ed6937 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Mon, 14 Oct 2013 11:05:49 -0700
Subject: remove dupe content

---
 _includes/nav-getting-started.html | 9 ---------
 1 file changed, 9 deletions(-)

(limited to '_includes')

diff --git a/_includes/nav-getting-started.html b/_includes/nav-getting-started.html
index c06896e6a..243c05fb0 100644
--- a/_includes/nav-getting-started.html
+++ b/_includes/nav-getting-started.html
@@ -1,12 +1,3 @@
-<li>
-  <a href="#welcome">Welcome</a>
-  <ul class="nav">
-    <li><a href="#welcome-history">Brief history</a></li>
-    <li><a href="#welcome-core-team">Core team</a></li>
-    <li><a href="#welcome-callouts">Callouts</a></li>
-    <li><a href="#welcome-community">Community</a></li>
-  </ul>
-</li>
 <li>
   <a href="#download">Download Bootstrap</a>
   <ul class="nav">
-- 
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

---
 _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 e70f6a8b6..1885b58eb 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="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

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

(limited to '_includes')

diff --git a/_includes/header.html b/_includes/header.html
index 1885b58eb..41ecfc8e4 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -18,6 +18,7 @@
 <!-- Documentation extras -->
 <link href="{{ page.base_url }}docs-assets/css/docs.css" rel="stylesheet">
 <link href="{{ page.base_url }}docs-assets/css/pygments-manni.css" rel="stylesheet">
+<!--[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]>
-- 
cgit v1.2.3