From d8c87ddc285c598f09cb70e2244d7cef5a8e5bad Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Fri, 17 Jan 2014 14:27:54 -0800
Subject: fix #12277

Thanks to @Quy for pointing these out.
---
 docs/_includes/customizer-variables.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'docs/_includes/customizer-variables.html')

diff --git a/docs/_includes/customizer-variables.html b/docs/_includes/customizer-variables.html
index 0b4429d72..89fb39dec 100644
--- a/docs/_includes/customizer-variables.html
+++ b/docs/_includes/customizer-variables.html
@@ -131,7 +131,7 @@
   <div class="bs-customizer-input">
     <label for="input-@line-height-computed">@line-height-computed</label>
     <input id="input-@line-height-computed" type="text" value="floor((@font-size-base * @line-height-base))" data-var="@line-height-computed" class="form-control"/>
-    <p class="help-block">Computed &quot;line-height&quot; (<code>font-size</code> &amp;times; <code>line-height</code>) for use with <code>margin</code>, <code>padding</code>, etc.</p>
+    <p class="help-block">Computed &quot;line-height&quot; (<code>font-size</code> * <code>line-height</code>) for use with <code>margin</code>, <code>padding</code>, etc.</p>
   </div>
   <div class="bs-customizer-input">
     <label for="input-@headings-font-family">@headings-font-family</label>
@@ -1117,7 +1117,7 @@
   <div class="bs-customizer-input">
     <label for="input-@modal-content-fallback-border-color">@modal-content-fallback-border-color</label>
     <input id="input-@modal-content-fallback-border-color" type="text" value="#999" data-var="@modal-content-fallback-border-color" class="form-control"/>
-    <p class="help-block">Modal content border color &lt;strong&gt;for IE8&lt;/strong&gt;</p>
+    <p class="help-block">Modal content border color <strong>for IE8</strong></p>
   </div>
   <div class="bs-customizer-input">
     <label for="input-@modal-backdrop-bg">@modal-backdrop-bg</label>
-- 
cgit v1.2.3


From 937e067a27506cea4ffd58c71afafbcf6eae92dd Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Sun, 19 Jan 2014 15:28:30 -0800
Subject: grunt build-customizer-vars-form

---
 docs/_includes/customizer-variables.html | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'docs/_includes/customizer-variables.html')

diff --git a/docs/_includes/customizer-variables.html b/docs/_includes/customizer-variables.html
index 89fb39dec..d03c3e6e8 100644
--- a/docs/_includes/customizer-variables.html
+++ b/docs/_includes/customizer-variables.html
@@ -1143,6 +1143,10 @@
     <label for="input-@modal-lg">@modal-lg</label>
     <input id="input-@modal-lg" type="text" value="900px" data-var="@modal-lg" class="form-control"/>
   </div>
+  <div class="bs-customizer-input">
+    <label for="input-@modal-md">@modal-md</label>
+    <input id="input-@modal-md" type="text" value="600px" data-var="@modal-md" class="form-control"/>
+  </div>
   <div class="bs-customizer-input">
     <label for="input-@modal-sm">@modal-sm</label>
     <input id="input-@modal-sm" type="text" value="300px" data-var="@modal-sm" class="form-control"/>
-- 
cgit v1.2.3


From 3de48d29f5b9b0f83e4fe0b4bfb51e141407a9a2 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Mon, 20 Jan 2014 18:02:15 -0800
Subject: fix #12280 by templating the customizer's nav sidebar too

The customizer is such a PITA.
---
 docs/_includes/customizer-variables.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'docs/_includes/customizer-variables.html')

diff --git a/docs/_includes/customizer-variables.html b/docs/_includes/customizer-variables.html
index d03c3e6e8..3de586c7e 100644
--- a/docs/_includes/customizer-variables.html
+++ b/docs/_includes/customizer-variables.html
@@ -1,5 +1,5 @@
 
-<!-- NOTE: DO NOT EDIT THE FOLLOWING SECTION DIRECTLY! It is autogenerated via the `build-customizer-vars-form` Grunt task using the customizer-variables.jade template.-->
+<!-- NOTE: DO NOT EDIT THE FOLLOWING SECTION DIRECTLY! It is autogenerated via the `build-customizer-html` Grunt task using the customizer-variables.jade template.-->
 <h2 id="colors">Colors</h2>
 <p>Gray and brand colors for use across Bootstrap.</p>
 <div class="row">
@@ -1683,4 +1683,4 @@
     <p class="help-block">For <code>@screen-lg-min</code> and up.</p>
   </div>
 </div>
-<!-- NOTE: DO NOT EDIT THE PRECEDING SECTION DIRECTLY! It is autogenerated via the `build-customizer-vars-form` Grunt task using the customizer-variables.jade template.-->
\ No newline at end of file
+<!-- NOTE: DO NOT EDIT THE PRECEDING SECTION DIRECTLY! It is autogenerated via the `build-customizer-html` Grunt task using the customizer-variables.jade template.-->
\ No newline at end of file
-- 
cgit v1.2.3


From d4b1bfd667631f1d96a0b6ec4e734338e5b8811d Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Wed, 29 Jan 2014 22:44:06 -0800
Subject: grunt

---
 docs/_includes/customizer-variables.html | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'docs/_includes/customizer-variables.html')

diff --git a/docs/_includes/customizer-variables.html b/docs/_includes/customizer-variables.html
index 3de586c7e..c68c652ab 100644
--- a/docs/_includes/customizer-variables.html
+++ b/docs/_includes/customizer-variables.html
@@ -595,6 +595,10 @@
     <label for="input-@navbar-padding-vertical">@navbar-padding-vertical</label>
     <input id="input-@navbar-padding-vertical" type="text" value="((@navbar-height - @line-height-computed) / 2)" data-var="@navbar-padding-vertical" class="form-control"/>
   </div>
+  <div class="bs-customizer-input">
+    <label for="input-@navbar-collapse-max-height">@navbar-collapse-max-height</label>
+    <input id="input-@navbar-collapse-max-height" type="text" value="340px" data-var="@navbar-collapse-max-height" class="form-control"/>
+  </div>
   <div class="bs-customizer-input">
     <label for="input-@navbar-default-color">@navbar-default-color</label>
     <input id="input-@navbar-default-color" type="text" value="#777" data-var="@navbar-default-color" class="form-control"/>
-- 
cgit v1.2.3


From 228d4e59fcdb0e05811821a9aff899e7b4e5f4d9 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Fri, 7 Feb 2014 01:21:58 -0800
Subject: Fixes #12555: Rearrange variables to place grids and containers
 closer

---
 docs/_includes/customizer-variables.html | 62 ++++++++++++++++----------------
 1 file changed, 31 insertions(+), 31 deletions(-)

(limited to 'docs/_includes/customizer-variables.html')

diff --git a/docs/_includes/customizer-variables.html b/docs/_includes/customizer-variables.html
index c68c652ab..271ef55d9 100644
--- a/docs/_includes/customizer-variables.html
+++ b/docs/_includes/customizer-variables.html
@@ -572,6 +572,37 @@
     <p class="help-block">Point at which the navbar begins collapsing.</p>
   </div>
 </div>
+<h2 id="container-sizes">Container sizes</h2>
+<p>Define the maximum width of <code>.container</code> for different screen sizes.</p>
+<div class="row">
+  <div class="bs-customizer-input">
+    <label for="input-@container-tablet">@container-tablet</label>
+    <input id="input-@container-tablet" type="text" value="((720px + @grid-gutter-width))" data-var="@container-tablet" class="form-control"/>
+  </div>
+  <div class="bs-customizer-input">
+    <label for="input-@container-sm">@container-sm</label>
+    <input id="input-@container-sm" type="text" value="@container-tablet" data-var="@container-sm" class="form-control"/>
+    <p class="help-block">For <code>@screen-sm-min</code> and up.</p>
+  </div>
+  <div class="bs-customizer-input">
+    <label for="input-@container-desktop">@container-desktop</label>
+    <input id="input-@container-desktop" type="text" value="((940px + @grid-gutter-width))" data-var="@container-desktop" class="form-control"/>
+  </div>
+  <div class="bs-customizer-input">
+    <label for="input-@container-md">@container-md</label>
+    <input id="input-@container-md" type="text" value="@container-desktop" data-var="@container-md" class="form-control"/>
+    <p class="help-block">For <code>@screen-md-min</code> and up.</p>
+  </div>
+  <div class="bs-customizer-input">
+    <label for="input-@container-large-desktop">@container-large-desktop</label>
+    <input id="input-@container-large-desktop" type="text" value="((1140px + @grid-gutter-width))" data-var="@container-large-desktop" class="form-control"/>
+  </div>
+  <div class="bs-customizer-input">
+    <label for="input-@container-lg">@container-lg</label>
+    <input id="input-@container-lg" type="text" value="@container-large-desktop" data-var="@container-lg" class="form-control"/>
+    <p class="help-block">For <code>@screen-lg-min</code> and up.</p>
+  </div>
+</div>
 <h2 id="navbar">Navbar</h2>
 <p></p>
 <div class="row">
@@ -1656,35 +1687,4 @@
     <p class="help-block">Horizontal offset for forms and lists.</p>
   </div>
 </div>
-<h2 id="container-sizes">Container sizes</h2>
-<p>Define the maximum width of <code>.container</code> for different screen sizes.</p>
-<div class="row">
-  <div class="bs-customizer-input">
-    <label for="input-@container-tablet">@container-tablet</label>
-    <input id="input-@container-tablet" type="text" value="((720px + @grid-gutter-width))" data-var="@container-tablet" class="form-control"/>
-  </div>
-  <div class="bs-customizer-input">
-    <label for="input-@container-sm">@container-sm</label>
-    <input id="input-@container-sm" type="text" value="@container-tablet" data-var="@container-sm" class="form-control"/>
-    <p class="help-block">For <code>@screen-sm-min</code> and up.</p>
-  </div>
-  <div class="bs-customizer-input">
-    <label for="input-@container-desktop">@container-desktop</label>
-    <input id="input-@container-desktop" type="text" value="((940px + @grid-gutter-width))" data-var="@container-desktop" class="form-control"/>
-  </div>
-  <div class="bs-customizer-input">
-    <label for="input-@container-md">@container-md</label>
-    <input id="input-@container-md" type="text" value="@container-desktop" data-var="@container-md" class="form-control"/>
-    <p class="help-block">For <code>@screen-md-min</code> and up.</p>
-  </div>
-  <div class="bs-customizer-input">
-    <label for="input-@container-large-desktop">@container-large-desktop</label>
-    <input id="input-@container-large-desktop" type="text" value="((1140px + @grid-gutter-width))" data-var="@container-large-desktop" class="form-control"/>
-  </div>
-  <div class="bs-customizer-input">
-    <label for="input-@container-lg">@container-lg</label>
-    <input id="input-@container-lg" type="text" value="@container-large-desktop" data-var="@container-lg" class="form-control"/>
-    <p class="help-block">For <code>@screen-lg-min</code> and up.</p>
-  </div>
-</div>
 <!-- NOTE: DO NOT EDIT THE PRECEDING SECTION DIRECTLY! It is autogenerated via the `build-customizer-html` Grunt task using the customizer-variables.jade template.-->
\ No newline at end of file
-- 
cgit v1.2.3


From b683433f672525cbbe25a4d5aa928610a66ea030 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Sat, 8 Feb 2014 15:44:13 -0800
Subject: grunt

---
 docs/_includes/customizer-variables.html | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'docs/_includes/customizer-variables.html')

diff --git a/docs/_includes/customizer-variables.html b/docs/_includes/customizer-variables.html
index 271ef55d9..4ffc3ab38 100644
--- a/docs/_includes/customizer-variables.html
+++ b/docs/_includes/customizer-variables.html
@@ -1662,6 +1662,11 @@
     <input id="input-@blockquote-small-color" type="text" value="@gray-light" data-var="@blockquote-small-color" class="form-control"/>
     <p class="help-block">Blockquote small color</p>
   </div>
+  <div class="bs-customizer-input">
+    <label for="input-@blockquote-font-size">@blockquote-font-size</label>
+    <input id="input-@blockquote-font-size" type="text" value="(@font-size-base * 1.25)" data-var="@blockquote-font-size" class="form-control"/>
+    <p class="help-block">Blockquote font size</p>
+  </div>
   <div class="bs-customizer-input">
     <label for="input-@blockquote-border-color">@blockquote-border-color</label>
     <input id="input-@blockquote-border-color" type="text" value="@gray-lighter" data-var="@blockquote-border-color" class="form-control"/>
-- 
cgit v1.2.3