You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by sc...@apache.org on 2019/06/06 03:06:41 UTC
[nifi-fds] 01/02: [NIFI-6291] Exposing font paths as variables in SCSS.

This is an automated email from the ASF dual-hosted git repository.

scottyaslan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-fds.git

commit 41d8b26998a75d0b057100c5bc1fecb28a46f173
Author: RynoRn <ho...@gmail.com>
AuthorDate: Wed May 15 14:57:17 2019 +0200

    [NIFI-6291] Exposing font paths as variables in SCSS.
---
 platform/core/common/styles/_basicElements.scss | 16 ++++++++--------
 platform/core/common/styles/_globalVars.scss    | 14 ++++++--------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/platform/core/common/styles/_basicElements.scss b/platform/core/common/styles/_basicElements.scss
index 35d4c62..cac6aba 100644
--- a/platform/core/common/styles/_basicElements.scss
+++ b/platform/core/common/styles/_basicElements.scss
@@ -19,56 +19,56 @@
   font-family: 'Roboto';
   font-style: normal;
   font-weight: 300;
-  src: local("Roboto Light"), local("Roboto-Light"), url("../../../../../node_modules/roboto-fontface/fonts/roboto/Roboto-Light.woff2") format("woff2");
+  src: local("Roboto Light"), local("Roboto-Light"), url("#{$fdsFontPath}/roboto/Roboto-Light.woff2") format("woff2");
 }
 
 @font-face {
   font-family: 'Roboto';
   font-style: italic;
   font-weight: 300;
-  src: local("Roboto LightItalic"), local("Roboto-LightItalic"), url("../../../../../node_modules/roboto-fontface/fonts/roboto/Roboto-LightItalic.woff2") format("woff2");
+  src: local("Roboto LightItalic"), local("Roboto-LightItalic"), url("#{$fdsFontPath}/roboto/Roboto-LightItalic.woff2") format("woff2");
 }
 
 @font-face {
   font-family: 'Roboto';
   font-style: normal;
   font-weight: normal;
-  src: local("Roboto Regular"), local("Roboto-Regular"), url("../../../../../node_modules/roboto-fontface/fonts/roboto/Roboto-Regular.woff2") format("woff2");
+  src: local("Roboto Regular"), local("Roboto-Regular"), url("#{$fdsFontPath}/roboto/Roboto-Regular.woff2") format("woff2");
 }
 
 @font-face {
   font-family: 'Roboto';
   font-style: normal;
   font-weight: 500;
-  src: local("Roboto Medium"), local("Roboto-Medium"), url("../../../../../node_modules/roboto-fontface/fonts/roboto/Roboto-Medium.woff2") format("woff2");
+  src: local("Roboto Medium"), local("Roboto-Medium"), url("#{$fdsFontPath}/roboto/Roboto-Medium.woff2") format("woff2");
 }
 
 @font-face {
   font-family: 'Roboto';
   font-style: normal;
   font-weight: bold;
-  src: local("Roboto Bold"), local("Roboto-Bold"), url("../../../../../node_modules/roboto-fontface/fonts/roboto/Roboto-Bold.woff2") format("woff2");
+  src: local("Roboto Bold"), local("Roboto-Bold"), url("#{$fdsFontPath}/roboto/Roboto-Bold.woff2") format("woff2");
 }
 
 @font-face {
   font-family: 'Roboto';
   font-style: italic;
   font-weight: normal;
-  src: local("Roboto Italic"), local("Roboto-Italic"), url("../../../../../node_modules/roboto-fontface/fonts/roboto/Roboto-RegularItalic.woff2") format("woff2");
+  src: local("Roboto Italic"), local("Roboto-Italic"), url("#{$fdsFontPath}/roboto/Roboto-RegularItalic.woff2") format("woff2");
 }
 
 @font-face {
   font-family: 'Roboto Slab';
   font-style: normal;
   font-weight: normal;
-  src: local("RobotoSlab Regular"), local("RobotoSlab-Regular"), url("../../../../../node_modules/roboto-fontface/fonts/roboto-slab/Roboto-Slab-Regular.woff2") format("woff2");
+  src: local("RobotoSlab Regular"), local("RobotoSlab-Regular"), url("#{$fdsFontPath}/roboto-slab/Roboto-Slab-Regular.woff2") format("woff2");
 }
 
 @font-face {
   font-family: 'Roboto Slab';
   font-style: normal;
   font-weight: bold;
-  src: local("RobotoSlab Bold"), local("RobotoSlab-Bold"), url("../../../../../node_modules/roboto-fontface/fonts/roboto-slab/Roboto-Slab-Bold.woff2") format("woff2");
+  src: local("RobotoSlab Bold"), local("RobotoSlab-Bold"), url("#{$fdsFontPath}/roboto-slab/Roboto-Slab-Bold.woff2") format("woff2");
 }
 
 body,
diff --git a/platform/core/common/styles/_globalVars.scss b/platform/core/common/styles/_globalVars.scss
index d9b0e1f..b53a409 100644
--- a/platform/core/common/styles/_globalVars.scss
+++ b/platform/core/common/styles/_globalVars.scss
@@ -17,14 +17,12 @@
 
 /* Text */
 
-$fontPrimary: "Roboto",
-sans-serif;
-$fontSecondary: "Robot Slab",
-sans-serif;
-$fontMedium: "Roboto Medium",
-sans-serif;
-$fontLight: "Roboto Light",
-sans-serif;
+$fontPrimary: "Roboto", sans-serif;
+$fontSecondary: "Robot Slab", sans-serif;
+$fontMedium: "Roboto Medium", sans-serif;
+$fontLight: "Roboto Light", sans-serif;
+
+$fdsFontPath: '../../../../../node_modules/roboto-fontface/fonts' !default;
 
 /* Define colors */