feat(fonts): migrate to dependency approach

moves font imports to the node modules dir
Tripwire · Mar 2, 2017 · 8f938fa · 8f938fa
1 parent 4c22b38
commit 8f938fa
Show file tree

Hide file tree

Showing 89 changed files with 189 additions and 2,271 deletions.
diff --git a/package.json b/package.json
@@ -56,7 +56,9 @@
   },
   "dependencies": {
     "d3": "^4.4.0",
+    "elegant-icons": "^0.0.1",
     "flexbox-react": "^4.1.0",
+    "lato-font": "^2.0.0",
     "react": "^15.4.1",
     "react-dom": "^15.4.1",
     "semantic-ui-react": "^0.66.0"

diff --git a/semantic/src/themes/tripwire/elements/icon.variables b/semantic/src/themes/tripwire/elements/icon.variables
@@ -16,10 +16,10 @@
   url("@{fontPath}/@{fontName}.ttf") format('truetype'),
   url("@{fontPath}/@{fontName}.svg#icons") format('svg'),
 
-  url("../../src/styles/fonts/ElegantIcons.woff") format('woff'),
-  url("../../src/styles/fonts/ElegantIcons.eot") format('embedded-opentype'),
-  url("../../src/styles/fonts/ElegantIcons.ttf") format('truetype'),
-  url("../../src/styles/fonts/ElegantIcons.svg#icons") format('svg'),
+  url("../../node_modules/elegant-icons/fonts/ElegantIcons.woff") format('woff'),
+  url("../../node_modules/elegant-icons/fonts/ElegantIcons.eot") format('embedded-opentype'),
+  url("../../node_modules/elegant-icons/fonts/ElegantIcons.ttf") format('truetype'),
+  url("../../node_modules/elegant-icons/fonts/ElegantIcons.svg#icons") format('svg'),
 ;
 
 @opacity: 1;

diff --git a/semantic/src/themes/tripwire/modules/popup.overrides b/semantic/src/themes/tripwire/modules/popup.overrides
@@ -6,29 +6,34 @@
 }
 
 .ui.popup.red:before {
-  box-shadow: -1px -1px 0 0 @red !important;
+  color: @red !important;
+
+}
+.ui.popup:before{
+  color: darken(@borderColor, 10);
 }
 
+
 .ui.popup.yellow {
     border: 1px solid @yellow !important; 
 }
 
 .ui.popup.yellow:before {
-  box-shadow: -1px -1px 0 0 @yellow !important;
+  color: @yellow !important;
 }
 
 .ui.popup.grey {
     border: 1px solid @grey !important; 
 }
 
 .ui.popup.grey:before {
-  box-shadow: -1px -1px 0 0 @grey !important;
+  color: @grey !important;
 }
 
 .ui.popup.blue {
     border: 1px solid @blue !important; 
 }
 
 .ui.popup.blue:before {
-  box-shadow: -1px -1px 0 0 @blue !important;
+  color: @blue !important;
 }
diff --git a/semantic/src/themes/tripwire/modules/popup.variables b/semantic/src/themes/tripwire/modules/popup.variables
@@ -56,10 +56,10 @@
 @arrowCenterBackground: @arrowBackground;
 @arrowBottomBackground: @arrowBackground;
 
-@arrowBoxShadow: @arrowStroke @arrowStroke 0px 0px @arrowColor;
-@leftArrowBoxShadow: @arrowStroke -@arrowStroke 0px 0px @arrowColor;
-@rightArrowBoxShadow: -@arrowStroke @arrowStroke 0px 0px @arrowColor;
-@bottomArrowBoxShadow: -@arrowStroke -@arrowStroke 0px 0px @arrowColor;
+@arrowBoxShadow: @arrowStroke @arrowStroke 0px 0px;
+@leftArrowBoxShadow: @arrowStroke -@arrowStroke 0px 0px;
+@rightArrowBoxShadow: -@arrowStroke @arrowStroke 0px 0px;
+@bottomArrowBoxShadow: -@arrowStroke -@arrowStroke 0px 0px;
 
 /*-------------------
        Types

diff --git a/src/components/charts/CircleChart/Circle.jsx b/src/components/charts/CircleChart/Circle.jsx
@@ -41,7 +41,7 @@ const CircleChart = (props) => {
               textAnchor='middle'
               dy='.35em'
               fontSize='2.5em'
-              fontWeight='lighter'
+              fontWeight='300'
             >
               {endPercentValue}
             </text>

diff --git a/src/styles/app.css b/src/styles/app.css
@@ -1,8 +1,6 @@
-/*@import url('https://fonts.googleapis.com/css?family=Lato:300,400,400i,700');*/
-@import "fonts/typography.css";
-@import 'fonts/style.css';
-@import 'fonts/Lato/latofonts.css';
 @import "variables.css";
+@import "./elegant-icons.css";
+@import "./lato.css";
 .svg-overflow-visible svg {
   overflow: visible;
 } 
diff --git a/src/styles/fonts/style.css → src/styles/elegant-icons.css b/src/styles/fonts/style.css → src/styles/elegant-icons.css
@@ -1,10 +1,10 @@
 @font-face {
 	font-family: 'ElegantIcons';
-	src:url('fonts/ElegantIcons.eot');
-	src:url('fonts/ElegantIcons.eot?#iefix') format('embedded-opentype'),
-		url('fonts/ElegantIcons.woff') format('woff'),
-		url('fonts/ElegantIcons.ttf') format('truetype'),
-		url('fonts/ElegantIcons.svg#ElegantIcons') format('svg');
+	src:url('../../node_modules/elegant-icons/fonts/ElegantIcons.eot');
+	src:url('../../node_modules/elegant-icons/fonts/ElegantIcons.eot?#iefix') format('embedded-opentype'),
+		url('../../node_modules/elegant-icons/fonts/ElegantIcons.woff') format('woff'),
+		url('../../node_modules/elegant-icons/fonts/ElegantIcons.ttf') format('truetype'),
+		url('../../node_modules/elegant-icons/fonts/ElegantIcons.svg#ElegantIcons') format('svg');
 	font-weight: normal;
 	font-style: normal;
 }

diff --git a/src/styles/fonts/ElegantIcons.eot b/src/styles/fonts/ElegantIcons.eot
diff --git a/src/styles/fonts/ElegantIcons.svg b/src/styles/fonts/ElegantIcons.svg
diff --git a/src/styles/fonts/ElegantIcons.ttf b/src/styles/fonts/ElegantIcons.ttf
diff --git a/src/styles/fonts/ElegantIcons.woff b/src/styles/fonts/ElegantIcons.woff
diff --git a/src/styles/fonts/Lato/fonts/Lato-Black.eot b/src/styles/fonts/Lato/fonts/Lato-Black.eot
diff --git a/src/styles/fonts/Lato/fonts/Lato-Black.ttf b/src/styles/fonts/Lato/fonts/Lato-Black.ttf
diff --git a/src/styles/fonts/Lato/fonts/Lato-Black.woff b/src/styles/fonts/Lato/fonts/Lato-Black.woff
diff --git a/src/styles/fonts/Lato/fonts/Lato-Black.woff2 b/src/styles/fonts/Lato/fonts/Lato-Black.woff2
diff --git a/src/styles/fonts/Lato/fonts/Lato-BlackItalic.eot b/src/styles/fonts/Lato/fonts/Lato-BlackItalic.eot
diff --git a/src/styles/fonts/Lato/fonts/Lato-BlackItalic.ttf b/src/styles/fonts/Lato/fonts/Lato-BlackItalic.ttf
diff --git a/src/styles/fonts/Lato/fonts/Lato-BlackItalic.woff b/src/styles/fonts/Lato/fonts/Lato-BlackItalic.woff
diff --git a/src/styles/fonts/Lato/fonts/Lato-BlackItalic.woff2 b/src/styles/fonts/Lato/fonts/Lato-BlackItalic.woff2
diff --git a/src/styles/fonts/Lato/fonts/Lato-Bold.eot b/src/styles/fonts/Lato/fonts/Lato-Bold.eot
diff --git a/src/styles/fonts/Lato/fonts/Lato-Bold.ttf b/src/styles/fonts/Lato/fonts/Lato-Bold.ttf
diff --git a/src/styles/fonts/Lato/fonts/Lato-Bold.woff b/src/styles/fonts/Lato/fonts/Lato-Bold.woff
diff --git a/src/styles/fonts/Lato/fonts/Lato-Bold.woff2 b/src/styles/fonts/Lato/fonts/Lato-Bold.woff2
diff --git a/src/styles/fonts/Lato/fonts/Lato-BoldItalic.eot b/src/styles/fonts/Lato/fonts/Lato-BoldItalic.eot
diff --git a/src/styles/fonts/Lato/fonts/Lato-BoldItalic.ttf b/src/styles/fonts/Lato/fonts/Lato-BoldItalic.ttf
diff --git a/src/styles/fonts/Lato/fonts/Lato-BoldItalic.woff b/src/styles/fonts/Lato/fonts/Lato-BoldItalic.woff
diff --git a/src/styles/fonts/Lato/fonts/Lato-BoldItalic.woff2 b/src/styles/fonts/Lato/fonts/Lato-BoldItalic.woff2
diff --git a/src/styles/fonts/Lato/fonts/Lato-Hairline.eot b/src/styles/fonts/Lato/fonts/Lato-Hairline.eot
diff --git a/src/styles/fonts/Lato/fonts/Lato-Hairline.ttf b/src/styles/fonts/Lato/fonts/Lato-Hairline.ttf
diff --git a/src/styles/fonts/Lato/fonts/Lato-Hairline.woff b/src/styles/fonts/Lato/fonts/Lato-Hairline.woff
diff --git a/src/styles/fonts/Lato/fonts/Lato-Hairline.woff2 b/src/styles/fonts/Lato/fonts/Lato-Hairline.woff2
diff --git a/src/styles/fonts/Lato/fonts/Lato-HairlineItalic.eot b/src/styles/fonts/Lato/fonts/Lato-HairlineItalic.eot
diff --git a/src/styles/fonts/Lato/fonts/Lato-HairlineItalic.ttf b/src/styles/fonts/Lato/fonts/Lato-HairlineItalic.ttf
diff --git a/src/styles/fonts/Lato/fonts/Lato-HairlineItalic.woff b/src/styles/fonts/Lato/fonts/Lato-HairlineItalic.woff
diff --git a/src/styles/fonts/Lato/fonts/Lato-HairlineItalic.woff2 b/src/styles/fonts/Lato/fonts/Lato-HairlineItalic.woff2
diff --git a/src/styles/fonts/Lato/fonts/Lato-Heavy.eot b/src/styles/fonts/Lato/fonts/Lato-Heavy.eot
diff --git a/src/styles/fonts/Lato/fonts/Lato-Heavy.ttf b/src/styles/fonts/Lato/fonts/Lato-Heavy.ttf
diff --git a/src/styles/fonts/Lato/fonts/Lato-Heavy.woff b/src/styles/fonts/Lato/fonts/Lato-Heavy.woff
diff --git a/src/styles/fonts/Lato/fonts/Lato-Heavy.woff2 b/src/styles/fonts/Lato/fonts/Lato-Heavy.woff2
diff --git a/src/styles/fonts/Lato/fonts/Lato-HeavyItalic.eot b/src/styles/fonts/Lato/fonts/Lato-HeavyItalic.eot
diff --git a/src/styles/fonts/Lato/fonts/Lato-HeavyItalic.ttf b/src/styles/fonts/Lato/fonts/Lato-HeavyItalic.ttf
diff --git a/src/styles/fonts/Lato/fonts/Lato-HeavyItalic.woff b/src/styles/fonts/Lato/fonts/Lato-HeavyItalic.woff
diff --git a/src/styles/fonts/Lato/fonts/Lato-HeavyItalic.woff2 b/src/styles/fonts/Lato/fonts/Lato-HeavyItalic.woff2
diff --git a/src/styles/fonts/Lato/fonts/Lato-Italic.eot b/src/styles/fonts/Lato/fonts/Lato-Italic.eot
diff --git a/src/styles/fonts/Lato/fonts/Lato-Italic.ttf b/src/styles/fonts/Lato/fonts/Lato-Italic.ttf
diff --git a/src/styles/fonts/Lato/fonts/Lato-Italic.woff b/src/styles/fonts/Lato/fonts/Lato-Italic.woff
diff --git a/src/styles/fonts/Lato/fonts/Lato-Italic.woff2 b/src/styles/fonts/Lato/fonts/Lato-Italic.woff2
diff --git a/src/styles/fonts/Lato/fonts/Lato-Light.eot b/src/styles/fonts/Lato/fonts/Lato-Light.eot
diff --git a/src/styles/fonts/Lato/fonts/Lato-Light.ttf b/src/styles/fonts/Lato/fonts/Lato-Light.ttf
diff --git a/src/styles/fonts/Lato/fonts/Lato-Light.woff b/src/styles/fonts/Lato/fonts/Lato-Light.woff
diff --git a/src/styles/fonts/Lato/fonts/Lato-Light.woff2 b/src/styles/fonts/Lato/fonts/Lato-Light.woff2
diff --git a/src/styles/fonts/Lato/fonts/Lato-LightItalic.eot b/src/styles/fonts/Lato/fonts/Lato-LightItalic.eot
diff --git a/src/styles/fonts/Lato/fonts/Lato-LightItalic.ttf b/src/styles/fonts/Lato/fonts/Lato-LightItalic.ttf
diff --git a/src/styles/fonts/Lato/fonts/Lato-LightItalic.woff b/src/styles/fonts/Lato/fonts/Lato-LightItalic.woff
diff --git a/src/styles/fonts/Lato/fonts/Lato-LightItalic.woff2 b/src/styles/fonts/Lato/fonts/Lato-LightItalic.woff2
diff --git a/src/styles/fonts/Lato/fonts/Lato-Medium.eot b/src/styles/fonts/Lato/fonts/Lato-Medium.eot
diff --git a/src/styles/fonts/Lato/fonts/Lato-Medium.ttf b/src/styles/fonts/Lato/fonts/Lato-Medium.ttf
diff --git a/src/styles/fonts/Lato/fonts/Lato-Medium.woff b/src/styles/fonts/Lato/fonts/Lato-Medium.woff
diff --git a/src/styles/fonts/Lato/fonts/Lato-Medium.woff2 b/src/styles/fonts/Lato/fonts/Lato-Medium.woff2
diff --git a/src/styles/fonts/Lato/fonts/Lato-MediumItalic.eot b/src/styles/fonts/Lato/fonts/Lato-MediumItalic.eot
diff --git a/src/styles/fonts/Lato/fonts/Lato-MediumItalic.ttf b/src/styles/fonts/Lato/fonts/Lato-MediumItalic.ttf
diff --git a/src/styles/fonts/Lato/fonts/Lato-MediumItalic.woff b/src/styles/fonts/Lato/fonts/Lato-MediumItalic.woff
diff --git a/src/styles/fonts/Lato/fonts/Lato-MediumItalic.woff2 b/src/styles/fonts/Lato/fonts/Lato-MediumItalic.woff2
diff --git a/src/styles/fonts/Lato/fonts/Lato-Regular.eot b/src/styles/fonts/Lato/fonts/Lato-Regular.eot
diff --git a/src/styles/fonts/Lato/fonts/Lato-Regular.ttf b/src/styles/fonts/Lato/fonts/Lato-Regular.ttf
diff --git a/src/styles/fonts/Lato/fonts/Lato-Regular.woff b/src/styles/fonts/Lato/fonts/Lato-Regular.woff
diff --git a/src/styles/fonts/Lato/fonts/Lato-Regular.woff2 b/src/styles/fonts/Lato/fonts/Lato-Regular.woff2
diff --git a/src/styles/fonts/Lato/fonts/Lato-Semibold.eot b/src/styles/fonts/Lato/fonts/Lato-Semibold.eot
diff --git a/src/styles/fonts/Lato/fonts/Lato-Semibold.ttf b/src/styles/fonts/Lato/fonts/Lato-Semibold.ttf
diff --git a/src/styles/fonts/Lato/fonts/Lato-Semibold.woff b/src/styles/fonts/Lato/fonts/Lato-Semibold.woff
diff --git a/src/styles/fonts/Lato/fonts/Lato-Semibold.woff2 b/src/styles/fonts/Lato/fonts/Lato-Semibold.woff2
diff --git a/src/styles/fonts/Lato/fonts/Lato-SemiboldItalic.eot b/src/styles/fonts/Lato/fonts/Lato-SemiboldItalic.eot
diff --git a/src/styles/fonts/Lato/fonts/Lato-SemiboldItalic.ttf b/src/styles/fonts/Lato/fonts/Lato-SemiboldItalic.ttf
diff --git a/src/styles/fonts/Lato/fonts/Lato-SemiboldItalic.woff b/src/styles/fonts/Lato/fonts/Lato-SemiboldItalic.woff
diff --git a/src/styles/fonts/Lato/fonts/Lato-SemiboldItalic.woff2 b/src/styles/fonts/Lato/fonts/Lato-SemiboldItalic.woff2
diff --git a/src/styles/fonts/Lato/fonts/Lato-Thin.eot b/src/styles/fonts/Lato/fonts/Lato-Thin.eot
diff --git a/src/styles/fonts/Lato/fonts/Lato-Thin.ttf b/src/styles/fonts/Lato/fonts/Lato-Thin.ttf
diff --git a/src/styles/fonts/Lato/fonts/Lato-Thin.woff b/src/styles/fonts/Lato/fonts/Lato-Thin.woff
diff --git a/src/styles/fonts/Lato/fonts/Lato-Thin.woff2 b/src/styles/fonts/Lato/fonts/Lato-Thin.woff2
diff --git a/src/styles/fonts/Lato/fonts/Lato-ThinItalic.eot b/src/styles/fonts/Lato/fonts/Lato-ThinItalic.eot
diff --git a/src/styles/fonts/Lato/fonts/Lato-ThinItalic.ttf b/src/styles/fonts/Lato/fonts/Lato-ThinItalic.ttf
diff --git a/src/styles/fonts/Lato/fonts/Lato-ThinItalic.woff b/src/styles/fonts/Lato/fonts/Lato-ThinItalic.woff
diff --git a/src/styles/fonts/Lato/fonts/Lato-ThinItalic.woff2 b/src/styles/fonts/Lato/fonts/Lato-ThinItalic.woff2
diff --git a/src/styles/fonts/Lato/lato.html b/src/styles/fonts/Lato/lato.html
diff --git a/src/styles/fonts/Lato/latofonts.css b/src/styles/fonts/Lato/latofonts.css