From b75a2fcaf8b92aa820f5151fa77e897f9e34839d Mon Sep 17 00:00:00 2001 From: Anand Pandurangi Date: Wed, 17 May 2017 16:24:03 +0530 Subject: [PATCH] Fixes #401 - adjusted the problem with font face definition and fix the momentary issue of hiding the labels/texts in UI because of it --- .../components/diagram.component.less | 29 +++---------------- src/client/assets/main.less | 23 +++++++++++++++ 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/src/client/app/flogo.flows.detail.diagram/components/diagram.component.less b/src/client/app/flogo.flows.detail.diagram/components/diagram.component.less index 7afb38da5..91cdf1a00 100644 --- a/src/client/app/flogo.flows.detail.diagram/components/diagram.component.less +++ b/src/client/app/flogo.flows.detail.diagram/components/diagram.component.less @@ -2,27 +2,6 @@ @color-error: @color-danger; @color-error--selected: #a23746; -@font-face{ - font-family: SourceSansPro-Regular; - src: url('/assets/fonts/SourceSansPro-Regular.ttf'), - url('/assets/fonts/SourceSansPro-Regular.eot'); - font-weight: normal; - font-style: normal; -} -@font-face{ - font-family: SourceSansPro-Bold; - src: url('/assets/fonts/SourceSansPro-Bold.ttf'), - url('/assets/fonts/SourceSansPro-Bold.eot'); - font-weight: normal; - font-style: normal; -} -@font-face{ - font-family: SourceSansPro-Semibold; - src: url('/assets/fonts/SourceSansPro-Semibold.ttf'); - font-weight: normal; - font-style: normal; -} - @diagram-node-height: 112px; @diagram-placeholder-node-height: 70px; @diagram-row-height: 140px; @@ -79,7 +58,7 @@ white-space: normal; - font-family: SourceSansPro-Regular; + font-family: 'SourceSansPro-Regular'; font-size: @diagram-node-font-size-large; line-height: 1; letter-spacing: 1px; @@ -135,7 +114,7 @@ &.flogo-flows-detail-diagram-node-has-warn { .flogo-flows-detail-diagram-node-detail-description { - font-family: SourceSansPro-Regular; + font-family: 'SourceSansPro-Regular'; font-size: @diagram-node-font-size-small; color: #fff; } @@ -351,7 +330,7 @@ } .flogo-flows-detail-diagram-node-detail-title{ - font-family: SourceSansPro-Bold; + font-family: 'SourceSansPro-Bold'; font-weight: 600; padding-bottom: 10px; letter-spacing: .4px; @@ -372,7 +351,7 @@ } &.flogo-flows-detail-diagram-node-has-warn { .flogo-flows-detail-diagram-node-detail-description { - font-family: SourceSansPro-Semibold; + font-family: 'SourceSansPro-Semibold'; font-size: 11px; color: #ff9f00; } diff --git a/src/client/assets/main.less b/src/client/assets/main.less index d53874a30..13274cb39 100755 --- a/src/client/assets/main.less +++ b/src/client/assets/main.less @@ -55,6 +55,29 @@ body { font-weight: 300; } +@font-face{ + font-family: 'SourceSansPro-Regular'; + src: url('fonts/SourceSansPro-Regular.eot'); + src: url('fonts/SourceSansPro-Regular.ttf') format('truetype'); + font-weight: normal; + font-style: normal; +} + +@font-face{ + font-family: 'SourceSansPro-Bold'; + src: url('fonts/SourceSansPro-Bold.eot'); + src: url('fonts/SourceSansPro-Bold.ttf') format('truetype'); + font-weight: normal; + font-style: normal; +} + +@font-face{ + font-family: 'SourceSansPro-Semibold'; + src: url('fonts/SourceSansPro-Semibold.ttf') format('truetype'); + font-weight: normal; + font-style: normal; +} + /* Set up a default font and some padding to provide breathing room */ body { font-family: 'Source Sans Pro', sans-serif;