From 10c74ee2fbccabd7a109c91ed47c8e11d61d411e Mon Sep 17 00:00:00 2001 From: svishnev Date: Mon, 22 Jan 2018 08:43:04 +0200 Subject: dox-sequence webpack version upgrade Issue-ID: SDC-944 Change-Id: I3a23ac40a83835ee73addc9812f6634f49cc3553 Signed-off-by: svishnev --- .../webapp/res/ecomp/asdc/common/_typography.scss | 8 ++++---- .../ecomp/asdc/sequencer/sequencer-development.scss | 21 +-------------------- 2 files changed, 5 insertions(+), 24 deletions(-) (limited to 'dox-sequence-diagram-ui/src/main/webapp') diff --git a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/common/_typography.scss b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/common/_typography.scss index c2a924edc7..d6bd3f671b 100644 --- a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/common/_typography.scss +++ b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/common/_typography.scss @@ -1,6 +1,6 @@ /* Fonts */ -$base-font-regular: omnes-regular, Arial, sans-serif; -$base-font-light: omnes-light, Arial, sans-serif; -$base-font-medium: omnes-medium, Arial, sans-serif; -$base-font-bold: omnes-bold, Arial, sans-serif; +$base-font-regular: OpenSans, OpenSans-Regular, 'Open Sans',omnes-regular, Arial, sans-serif; +$base-font-light: OpenSans-Light, 'Open Sans', omnes-light, Arial, sans-serif; +$base-font-medium: OpenSans-Semibold, 'Open Sans', omnes-medium, Arial, sans-serif; +$base-font-bold: OpenSans-Bold, 'Open Sans', omnes-bold, Arial, sans-serif; diff --git a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sequencer-development.scss b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sequencer-development.scss index 0d9eef54d2..4a6fd3647d 100644 --- a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sequencer-development.scss +++ b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sequencer-development.scss @@ -4,26 +4,7 @@ html,body { height: 100%; width: 100%; } -@font-face { - font-family: Omnes-Light; - src: url('../common/fonts/omnes-att-light.otf'); -} - -@font-face { - font-family: Omnes-Regular; - src: url('../common/fonts/omnes-att-regular.otf'); -} - -@font-face { - font-family: Omnes-Medium; - src: url('../common/fonts/omnes-att-medium.otf'); -} - -@font-face { - font-family: Omnes-Bold; - src: url('../common/fonts/omnes-att-bold.otf'); -} * { - font-family: "Omnes-Regular", "Helvetiva Neue", Helvetica, Arial, SansSerif; + font-family: OpenSans, OpenSans-Regular, 'Open Sans', Arial, sans-serif; } -- cgit 1.2.3-korg