From b8f9f82d182d8300246ba9c4e75a5db6e77f62d3 Mon Sep 17 00:00:00 2001
From: Bas Bosman <sbg.bosman@mindef.nl>
Date: Wed, 30 Oct 2013 14:10:16 +0100
Subject: Add well-border variable

Add a variable to allow the well border color to be specified.

The reason I'd like to see this included is that my companies styleguide
requires an explicit border color on well-like constructs. This variable
allows me to easily override the default to use that color.
---
 customize.html | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'customize.html')

diff --git a/customize.html b/customize.html
index 5b6a09c40..794f1c3f4 100644
--- a/customize.html
+++ b/customize.html
@@ -1147,6 +1147,8 @@ base_url: "../"
     <h3>Wells</h3>
     <label>@well-bg</label>
     <input type="text" class="form-control" placeholder="#f5f5f5" data-var="@well-bg">
+    <label>@well-border</label>
+    <input type="text" class="form-control" placeholder="darken(@well-bg, 7%)" data-var="@well-border">
 
 
     <h2 id="variables-accordion">Accordion</h2>
-- 
cgit v1.2.3


From ae4d5f21a96fab3691ca33e9e3747a01c467e10e Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Sat, 16 Nov 2013 18:01:59 -0800
Subject: fixes #11449: use menlo over monaco

---
 customize.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'customize.html')

diff --git a/customize.html b/customize.html
index 5b6a09c40..5b15a4c5a 100644
--- a/customize.html
+++ b/customize.html
@@ -399,7 +399,7 @@ base_url: "../"
         <input type="text" class="form-control" placeholder="Georgia, 'Times New Roman', Times, serif" data-var="@font-family-serif">
         <p class="help-block">Default serif fonts.</p>
         <label>@font-family-monospace</label>
-        <input type="text" class="form-control" placeholder="Monaco, Menlo, Consolas, 'Courier New', monospace" data-var="@font-family-monospace">
+        <input type="text" class="form-control" placeholder="Menlo, Monaco, Consolas, 'Courier New', monospace" data-var="@font-family-monospace">
         <p class="help-block">Default monospace fonts for <code>&lt;code&gt;</code> and <code>&lt;pre&gt;</code>.</p>
 
         <h4>Base type styes</h4>
-- 
cgit v1.2.3


From 7472c01ce2aad5fa9d79b78c21172dcc60ffc841 Mon Sep 17 00:00:00 2001
From: kostyatretyak <ktretyakgm@gmail.com>
Date: Wed, 4 Dec 2013 06:21:54 +0200
Subject: Corrected a small error in the documentation

---
 customize.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'customize.html')

diff --git a/customize.html b/customize.html
index 5b15a4c5a..13821b533 100644
--- a/customize.html
+++ b/customize.html
@@ -1056,7 +1056,7 @@ base_url: "../"
         <p class="help-block">Hovered dropdown menu entry text color</p>
         <label>@dropdown-link-hover-bg</label>
         <input type="text" class="form-control" placeholder="#f5f5f5" data-var="@dropdown-link-hover-bg">
-        <p class="help-block">Hovered dropdown menu entry text color</p>
+        <p class="help-block">Hovered dropdown menu entry background color</p>
 
         <label>@dropdown-link-active-color</label>
         <input type="text" class="form-control" placeholder="@component-active-color" data-var="@dropdown-link-active-color">
-- 
cgit v1.2.3


From 1f9bfa89dc219654b5e096bda9233a58c69216fa Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Sun, 8 Dec 2013 02:14:24 -0800
Subject: Fixes #11741: Don't set headings font-family again, just use inherit

---
 customize.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'customize.html')

diff --git a/customize.html b/customize.html
index 13821b533..35d74354e 100644
--- a/customize.html
+++ b/customize.html
@@ -436,7 +436,7 @@ base_url: "../"
     <div class="row">
       <div class="col-lg-6">
         <label>@headings-font-family</label>
-        <input type="text" class="form-control" placeholder="@font-family-base" data-var="@headings-font-family">
+        <input type="text" class="form-control" placeholder="inherit" data-var="@headings-font-family">
         <label>@headings-font-weight</label>
         <input type="text" class="form-control" placeholder="500" data-var="@headings-font-weight">
       </div>
-- 
cgit v1.2.3


From 997a1f4ed244c7f42214e0d5adcee24e8e3c83f1 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Sun, 8 Dec 2013 17:17:04 -0800
Subject: fix dependency mapping of buttons and button-groups in customizer

---
 customize.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'customize.html')

diff --git a/customize.html b/customize.html
index 35d74354e..53ed8d710 100644
--- a/customize.html
+++ b/customize.html
@@ -56,7 +56,7 @@ base_url: "../"
         </div>
         <div class="checkbox">
           <label>
-            <input type="checkbox" checked value="buttons.less">
+            <input type="checkbox" checked value="buttons.less" data-dependents="button-groups.less">
             Buttons
           </label>
         </div>
-- 
cgit v1.2.3