Commit 794d7845 authored by Mark Otto's avatar Mark Otto

fixes #10153: restore headings-color variable

parent 9e541fc7
This diff is collapsed.
...@@ -421,15 +421,14 @@ base_url: "../" ...@@ -421,15 +421,14 @@ base_url: "../"
<div class="col-lg-6"> <div class="col-lg-6">
<label>@headings-font-family</label> <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="@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> <label>@headings-font-weight</label>
<input type="text" class="form-control" placeholder="500" data-var="@headings-font-weight"> <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>
<div class="col-lg-6"> <div class="col-lg-6">
<label>@headings-line-height</label> <label>@headings-line-height</label>
<input type="text" class="form-control" placeholder="1.1" data-var="@headings-line-height"> <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>
</div> </div>
......
...@@ -399,7 +399,8 @@ p { ...@@ -399,7 +399,8 @@ p {
} }
} }
small { small,
.small {
font-size: 85%; font-size: 85%;
} }
...@@ -458,6 +459,7 @@ h6, ...@@ -458,6 +459,7 @@ h6,
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: 500; font-weight: 500;
line-height: 1.1; line-height: 1.1;
color: inherit;
} }
h1 small, h1 small,
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -53,6 +53,7 @@ h1, h2, h3, h4, h5, h6, ...@@ -53,6 +53,7 @@ h1, h2, h3, h4, h5, h6,
font-family: @headings-font-family; font-family: @headings-font-family;
font-weight: @headings-font-weight; font-weight: @headings-font-weight;
line-height: @headings-line-height; line-height: @headings-line-height;
color: inherit;
small { small {
font-weight: normal; font-weight: normal;
......
...@@ -61,6 +61,8 @@ ...@@ -61,6 +61,8 @@
@headings-font-family: @font-family-base; @headings-font-family: @font-family-base;
@headings-font-weight: 500; @headings-font-weight: 500;
@headings-line-height: 1.1; @headings-line-height: 1.1;
@headings-color: inherit;
// Iconography // Iconography
// ------------------------- // -------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment