Moved .brand-font selector to _base.font.css and out of theme files

grommet · Jun 30, 2015 · 43ccac3 · 43ccac3
1 parent af61fff
commit 43ccac3
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/src/scss/grommet-core/_base.font.scss b/src/scss/grommet-core/_base.font.scss
@@ -1,5 +1,6 @@
 // (C) Copyright 2014-2015 Hewlett-Packard Development Company, L.P.
 
-html {
+html, 
+.brand-font {
   font-family: $brand-font-family;
 }
diff --git a/src/scss/hpe/_hpe.defaults.scss b/src/scss/hpe/_hpe.defaults.scss
@@ -45,11 +45,6 @@ $brand-graph-colors: (#FF8D6D, #877B75, #2AD2C9, #614767, #617D78);
   src: url("~grommet/scss/hpe/font/SimRg.otf") format("opentype");
 }
 
-html,
-.brand-font {
-  font-family: $brand-font-family; 
-}
-
 .large-number-font {
   font-family: 'Simple', 'Metric', Arial, sans-serif;
 }

diff --git a/src/scss/hpinc/_hpinc.defaults.scss b/src/scss/hpinc/_hpinc.defaults.scss
@@ -22,11 +22,6 @@ $focus-border-color: #99d5ef;
   src: url("~grommet/scss/hpinc/font/hps-me-w27-regular-woff.woff") format('woff');
 }
 
-html,
-.brand-font {
-  font-family: $brand-font-family;
-}
-
 .control-icon {
   path,
   line,