root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 14 Packages Projects Releases Wiki Activity

Fixes #11741: Don't set headings font-family again, just use inherit

This commit is contained in:
Mark Otto 2013-12-08 02:14:24 -08:00
parent c37b710e85
commit 1f9bfa89dc
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
customize.html
View File

@ -436,7 +436,7 @@ base_url: "../"
<div class="row"> <div class="row">
<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="inherit" data-var="@headings-font-family">
<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">
</div> </div>

2
dist/css/bootstrap.css vendored
View File

@ -397,7 +397,7 @@ h6,
.h4, .h4,
.h5, .h5,
.h6 { .h6 {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: inherit;
font-weight: 500; font-weight: 500;
line-height: 1.1; line-height: 1.1;
color: inherit; color: inherit;

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

2
less/variables.less
View File

@ -58,7 +58,7 @@
@line-height-base: 1.428571429; // 20/14 @line-height-base: 1.428571429; // 20/14
@line-height-computed: floor(@font-size-base * @line-height-base); // ~20px @line-height-computed: floor(@font-size-base * @line-height-base); // ~20px
@headings-font-family: @font-family-base; @headings-font-family: inherit;
@headings-font-weight: 500; @headings-font-weight: 500;
@headings-line-height: 1.1; @headings-line-height: 1.1;
@headings-color: inherit; @headings-color: inherit;