set -load-local-fonts to false by default and removed double loading …

…of typography
predixdesignsystem · May 5, 2017 · f7300a3 · f7300a3
1 parent 0123889
commit f7300a3
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 51 deletions.
diff --git a/_base.typography.scss b/_base.typography.scss
@@ -12,14 +12,14 @@ $predix-font-family: "GE Inspira Sans", sans-serif !default;
 /// Load fonts locally
 /// @group px-typography-design:variables:style
 /// @type Boolean [default]
-$predix-load-local-fonts: true !default;
+$predix-load-local-fonts: false !default;
 
 /// Webfont path
 /// @group px-typography-design:variables:style
 /// @type String [default]
 $inuit-webfont-path: '//dzlpbrbc7yvq0.cloudfront.net/predixdev/fonts/2.0.0' !default;
 
-//FIXME: flip back to false when CDN fonts are available
+//flip back to false when CDN fonts are available
 @if $predix-load-local-fonts == true {
   $inuit-webfont-path: '../px-typography-design/type';
 }

diff --git a/css/px-typography-design-demo-styles.html b/css/px-typography-design-demo-styles.html
diff --git a/demo/index.html b/demo/index.html
@@ -3,13 +3,11 @@
 
 <!-- Common demo imports -->
 <link rel="import" href="../../px-sass-doc/px-sass-doc.html" />
-<link rel="import" href="../css/px-typography-design-demo-styles.html" />
 
 <!-- Demo DOM module -->
 <dom-module id="local-element-demo">
   <template>
     <!-- 0: Import the styles-->
-    <style include="px-typography-design-demo-styles" is="custom-style"></style>
 
 <!-- 1: Describe Module -->
 <px-sass-doc

diff --git a/sass/px-typography-design-demo.scss b/sass/px-typography-design-demo.scss