From 8087f95ca4ed948cd10b92836ddfce56307707da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= <legospace9876@gmail.com>
Date: Sat, 7 Dec 2013 10:27:28 +0100
Subject: Load minified Bootstrap JS code

---
 _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 1188e10cf..095e96eb5 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -2,7 +2,7 @@
 ================================================== -->
 <!-- Placed at the end of the document so the pages load faster -->
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
-<script src="{{ page.base_url }}dist/js/bootstrap.js"></script>
+<script src="{{ page.base_url }}dist/js/bootstrap.min.js"></script>
 
 <script src="{{ page.base_url }}docs-assets/js/holder.js"></script>
 
-- 
cgit v1.2.3


From 775c29fef6d87dd91ebc6dba5980f3b59976b435 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Sat, 7 Dec 2013 11:40:08 -0800
Subject: Fixes #11764: Add meta data to docs for description, keywords, and
 authors

---
 _includes/header.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to '_includes')

diff --git a/_includes/header.html b/_includes/header.html
index 41ecfc8e4..93594b4bc 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -1,8 +1,9 @@
 <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="">
+<meta name="description" content="Bootstrap, a sleek, intuitive, and powerful mobile first front-end framework for faster and easier web development.">
+<meta name="keywords" content="HTML, CSS, JS, JavaScript, framework, bootstrap, front-end, frontend, web development">
+<meta name="author" content="Mark Otto, Jacob Thornton, and Bootstrap contibutors">
 
 <title>
   {% if page.title == "Bootstrap" %}
-- 
cgit v1.2.3


From b1215d1b2ecd6cd3898af19ce43cc647e2ec854a Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Sat, 7 Dec 2013 12:18:13 -0800
Subject: Fixes #11193: Add kbd element styles to indicate user input via
 keyboard

---
 _includes/nav-css.html | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to '_includes')

diff --git a/_includes/nav-css.html b/_includes/nav-css.html
index 543d004f3..215bf338b 100644
--- a/_includes/nav-css.html
+++ b/_includes/nav-css.html
@@ -37,7 +37,14 @@
     <li><a href="#type-lists">Lists</a></li>
   </ul>
 </li>
-<li><a href="#code">Code</a></li>
+<li>
+  <a href="#code">Code</a>
+  <ul class="nav">
+    <li><a href="#code-inline">Inline code</a></li>
+    <li><a href="#code-user-input">User input</a></li>
+    <li><a href="#code-block">Blocks of code</a></li>
+  </ul>
+</li>
 <li>
   <a href="#tables">Tables</a>
   <ul class="nav">
-- 
cgit v1.2.3


From 07de53c644b315852c5f315ab91bfd6d65660d50 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Sat, 7 Dec 2013 14:09:03 -0800
Subject: Contextual list group cleanup

* Adds nav link to sidebar for contextual classes
* Refactors to use prefixed classes, like .list-group-item-info, instead of chained classes
* Adds default and linked variations to example in docs
---
 _includes/nav-components.html | 1 +
 1 file changed, 1 insertion(+)

(limited to '_includes')

diff --git a/_includes/nav-components.html b/_includes/nav-components.html
index f7a705b5f..131114883 100644
--- a/_includes/nav-components.html
+++ b/_includes/nav-components.html
@@ -121,6 +121,7 @@
     <li><a href="#list-group-basic">Basic example</a></li>
     <li><a href="#list-group-badges">Badges</a></li>
     <li><a href="#list-group-linked">Linked items</a></li>
+    <li><a href="#list-group-contextual-classes">Contextual classes</a></li>
     <li><a href="#list-group-custom-content">Custom content</a></li>
   </ul>
 </li>
-- 
cgit v1.2.3


From 6273604601c58284f49b38ae4e52533b9689437c Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Sat, 7 Dec 2013 20:52:51 -0800
Subject: Add .container-fluid variation for full-width containers and layouts

/cc #10711 #9862
---
 _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 215bf338b..0228932dd 100644
--- a/_includes/nav-css.html
+++ b/_includes/nav-css.html
@@ -16,6 +16,7 @@
     <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>
+    <li><a href="#grid-example-fluid">Ex: Fluid container</a></li>
     <li><a href="#grid-example-mixed">Ex: Mobile and desktops</a></li>
     <li><a href="#grid-example-mixed-complete">Ex: Mobile, tablet, desktops</a></li>
     <li><a href="#grid-responsive-resets">Responsive column resets</a></li>
-- 
cgit v1.2.3