rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-29 21:52:22 +01:00
Code Issues Actions Packages Releases Activity

fixes #10153: restore headings-color variable

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/js/raw-files.js
View File

File diff suppressed because one or more lines are too long

5
customize.html
View File

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

4
dist/css/bootstrap.css vendored
View File

@ -399,7 +399,8 @@ p {
} }
} }
small { small,
.small {
font-size: 85%; font-size: 85%;
} }
@ -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,

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

1
less/type.less
View File

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

2
less/variables.less
View File

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