fixes #10153: restore headings-color variable

This commit is contained in:
Mark Otto 2013-09-01 09:49:28 +02:00
parent 9e541fc717
commit 794d784519
6 changed files with 10 additions and 6 deletions

File diff suppressed because one or more lines are too long

View File

@ -421,15 +421,14 @@ base_url: "../"
<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>

View File

@ -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,

File diff suppressed because one or more lines are too long

View File

@ -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;

View File

@ -61,6 +61,8 @@
@headings-font-family: @font-family-base;
@headings-font-weight: 500;
@headings-line-height: 1.1;
@headings-color: inherit;
// Iconography
// -------------------------