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

twbs · Dec 8, 2013 · 1f9bfa8 · 1f9bfa8
1 parent c37b710
commit 1f9bfa8
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/customize.html b/customize.html
@@ -436,7 +436,7 @@ <h3>Headings</h3>
     <div class="row">
       <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">
+        <input type="text" class="form-control" placeholder="inherit" data-var="@headings-font-family">
         <label>@headings-font-weight</label>
         <input type="text" class="form-control" placeholder="500" data-var="@headings-font-weight">
       </div>

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
@@ -397,7 +397,7 @@ h6,
 .h4,
 .h5,
 .h6 {
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-family: inherit;
   font-weight: 500;
   line-height: 1.1;
   color: inherit;

diff --git a/dist/css/bootstrap.min.css b/dist/css/bootstrap.min.css
diff --git a/docs-assets/js/raw-files.js b/docs-assets/js/raw-files.js
diff --git a/less/variables.less b/less/variables.less
@@ -58,7 +58,7 @@
 @line-height-base:        1.428571429; // 20/14
 @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-line-height:    1.1;
 @headings-color:          inherit;