Merge pull request #222 from edx/talbs/simplify-font-families

Simplify font-family Styling + Inheritance
edx · Nov 2, 2015 · 23829b4 · 23829b4
2 parents 104d5d2 + 6c1f216
commit 23829b4
Show file tree

Hide file tree

Showing 14 changed files with 17 additions and 44 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,8 +5,15 @@ Nothing yet
 
 - - -
 
+## 0.4.4 (2015-11-02)
+* Removed specific font-family declarations on headings/copy/form elements in favor of inheritance from _reset.scss's body rule (for easier customizations/overrides).
+
+- - -
+
 ## 0.4.3 (2015-10-28)
 * Added text truncation and wrapped Sass placeholders
+## 0.4.3 (2015-11-02)
+* Removed specific font-family declarations on headings/copy/form elements in favor of inheritance from _reset.scss's body rule (for easier customizations/overrides).
 
 - - -
 

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "edx-pattern-library",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "authors": [
     "edX UX Team <[email protected]>"
   ],

diff --git a/pattern-library/css/edx-pattern-library-ltr.css b/pattern-library/css/edx-pattern-library-ltr.css
diff --git a/pattern-library/css/edx-pattern-library-ltr.min.css b/pattern-library/css/edx-pattern-library-ltr.min.css
diff --git a/pattern-library/css/edx-pattern-library-rtl.css b/pattern-library/css/edx-pattern-library-rtl.css
diff --git a/pattern-library/css/edx-pattern-library-rtl.min.css b/pattern-library/css/edx-pattern-library-rtl.min.css
diff --git a/pattern-library/sass/patterns/_forms.scss b/pattern-library/sass/patterns/_forms.scss
@@ -153,7 +153,6 @@
     padding: rem($baseline/2);
     border: 1px solid $input-default-border-color;
     background: $input-default-background;
-    font-family: $text-base-font-family;
     font-size: font-size(base);
     color: $input-default-color;
 

diff --git a/pattern-library/sass/patterns/_headings.scss b/pattern-library/sass/patterns/_headings.scss
@@ -48,7 +48,6 @@ $headings-count: 8;
 .hd-6,
 .hd-7 {
 
-
     &.emphasized {
         font-weight: $headings-font-weight-x-bold;
     }

diff --git a/pattern-library/sass/utilities/_helpers.scss b/pattern-library/sass/utilities/_helpers.scss
@@ -110,18 +110,12 @@
 // reset of typography
 %reset-headings {
     margin: 0 0 spacing-horizontal(base) 0;
-    font-family: $headings-base-font-family;
     font-weight: $headings-base-font-weight;
     font-size: font-size(base);
     line-height: line-height(base);
     color: $headings-base-color;
 }
 
-// reset of copy
-%reset-copy {
-    font-family: $text-base-font-family;
-}
-
 // reset of code
 %reset-code {
     font-family: $font-family-monospace;

diff --git a/pattern-library/sass/utilities/_variables.scss b/pattern-library/sass/utilities/_variables.scss
@@ -399,7 +399,7 @@ $headings-font-weight-normal:               font-weight(normal) !default;
 $headings-font-weight-bold:                 font-weight(semi-bold) !default;
 $headings-font-weight-x-bold:               font-weight(bold) !default;
 
-$headings-base-font-family:                 $font-family-sans-serif !default;
+$headings-base-font-family:                 inherit !default;
 $headings-base-font-weight:                 $headings-font-weight-normal !default;
 $headings-base-color:                       palette(grayscale, x-dark) !default;
 

diff --git a/public/css/main-ltr.css b/public/css/main-ltr.css
diff --git a/public/css/main-ltr.min.css b/public/css/main-ltr.min.css
diff --git a/public/css/main-rtl.css b/public/css/main-rtl.css
diff --git a/public/css/main-rtl.min.css b/public/css/main-rtl.min.css
-Original file line number
+Diff line change
@@ Expand Up / @@ -48,7 +48,6 @@ $headings-count: 8; @@
     .hd-6,
     .hd-7 {
         &.emphasized {
             font-weight: $headings-font-weight-x-bold;
         }
@@ Expand Down @@