fixes #10153: restore headings-color variable

twbs · Sep 1, 2013 · 794d784 · koenpunt · Oct 4, 2013 · cvrebert
1 parent 9e541fc
commit 794d784
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 6 deletions.
diff --git a/assets/js/raw-files.js b/assets/js/raw-files.js
diff --git a/customize.html b/customize.html
@@ -421,15 +421,14 @@ <h4>Headings</h4>
       <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">
-        <p class="help-block">Choose a separate font-family for headings.</p>
         <label>@headings-font-weight</label>
         <input type="text" class="form-control" placeholder="500" data-var="@headings-font-weight">
-        <p class="help-block">Choose a separate font-weight for headings.</p>
       </div>
       <div class="col-lg-6">
         <label>@headings-line-height</label>
         <input type="text" class="form-control" placeholder="1.1" data-var="@headings-line-height">
-        <p class="help-block">Choose a separate line-height for headings.</p>
+        <label>@headings-color</label>
+        <input type="text" class="form-control" placeholder="inherit" data-var="@headings-color">
       </div>
     </div>
 

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
@@ -399,7 +399,8 @@ p {
   }
 }
 
-small {
+small,
+.small {
   font-size: 85%;
 }
 
@@ -458,6 +459,7 @@ h6,
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-weight: 500;
   line-height: 1.1;
+  color: inherit;
 }
 
 h1 small,

diff --git a/dist/css/bootstrap.min.css b/dist/css/bootstrap.min.css
diff --git a/less/type.less b/less/type.less
@@ -53,6 +53,7 @@ h1, h2, h3, h4, h5, h6,
   font-family: @headings-font-family;
   font-weight: @headings-font-weight;
   line-height: @headings-line-height;
+  color: inherit;
 
   small {
     font-weight: normal;

diff --git a/less/variables.less b/less/variables.less
@@ -61,6 +61,8 @@
 @headings-font-family:    @font-family-base;
 @headings-font-weight:    500;
 @headings-line-height:    1.1;
+@headings-color:          inherit;
+
 
 // Iconography
 // -------------------------