fixing double-import of fonts when typography.scss is included multip…

…le times
BrightspaceUI · Dec 14, 2015 · 0ba696b · 0ba696b
1 parent 77368c8
commit 0ba696b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/base-font-size.scss b/base-font-size.scss
@@ -0,0 +1 @@
+$vui-base-fontSize: 20px;
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vui-typography",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Mixins and CSS for applying basic typography styles",
   "scripts": {
     "clean": "rimraf *.css",

diff --git a/px-to-base-rem.scss b/px-to-base-rem.scss
@@ -1,4 +1,4 @@
-@import 'typography.scss';
+@import 'base-font-size.scss';
 @import 'px-to-rem.scss';
 
 @function px-to-base-rem($targetPx) {

diff --git a/typography.scss b/typography.scss
@@ -1,8 +1,7 @@
 @import 'bower_components/vui-colors/colors.scss';
 @import 'px-to-rem.scss';
 @import 'fonts.scss';
-
-$vui-base-fontSize: 20px;
+@import 'base-font-size.scss';
 
 @mixin vui-typography() {