mirror of
https://github.com/twbs/bootstrap.git
synced 2025-08-06 13:46:42 +02:00
fixes #10153: restore headings-color variable
This commit is contained in:
File diff suppressed because one or more lines are too long
@@ -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>
|
||||
|
||||
|
4
dist/css/bootstrap.css
vendored
4
dist/css/bootstrap.css
vendored
@@ -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,
|
||||
|
2
dist/css/bootstrap.min.css
vendored
2
dist/css/bootstrap.min.css
vendored
File diff suppressed because one or more lines are too long
@@ -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;
|
||||
|
@@ -61,6 +61,8 @@
|
||||
@headings-font-family: @font-family-base;
|
||||
@headings-font-weight: 500;
|
||||
@headings-line-height: 1.1;
|
||||
@headings-color: inherit;
|
||||
|
||||
|
||||
// Iconography
|
||||
// -------------------------
|
||||
|
Reference in New Issue
Block a user