From 6e1e1ec7542359853a5d2ca47c8425e576d44a5f Mon Sep 17 00:00:00 2001
From: AndiMajore <andi.majore@googlemail.com>
Date: Tue, 13 Sep 2022 19:16:23 +0200
Subject: [PATCH] added font-family variable drgstn-font-family; disable
inherit for drugstone plugin
---
src/index.html | 2 +-
src/stylesheets/bulma.scss | 2 +-
src/stylesheets/default-theme.css | 1 +
src/stylesheets/primeng.scss | 2 +-
src/stylesheets/styles.scss | 2 ++
src/stylesheets/toast.scss | 1 -
6 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/index.html b/src/index.html
index c6a928f3..0b2980f2 100644
--- a/src/index.html
+++ b/src/index.html
@@ -88,7 +88,7 @@
<button onclick="setNetwork('netexp1')">Add nodes</button>
-<div style="max-width: 80vw; width: 1276px; height: 600px">
+<div style="max-width: 80vw; width: 1276px; height: 600px; text-align: center">
<drugst-one id="netexp1"
pluginId="2"
diff --git a/src/stylesheets/bulma.scss b/src/stylesheets/bulma.scss
index 1047cdd4..fccdbad9 100644
--- a/src/stylesheets/bulma.scss
+++ b/src/stylesheets/bulma.scss
@@ -10,7 +10,7 @@
height: var(--drgstn-height, 500px);
margin: 0;
- font-family: Roboto, "Helvetica Neue", sans-serif;
+ font-family: var(--drgstn-font-family);
p {
margin-bottom: .4rem !important;
diff --git a/src/stylesheets/default-theme.css b/src/stylesheets/default-theme.css
index cf1c9163..fc88a9a6 100644
--- a/src/stylesheets/default-theme.css
+++ b/src/stylesheets/default-theme.css
@@ -13,4 +13,5 @@
--drgstn-tooltip: rgba(74, 74, 74, 0.9);
--drgstn-panel-secondary: #FFFFFF;
--drgstn-height: 600px;
+ --drgstn-font-family: Helvetica Neue, Helvetica, Ubuntu, BlinkMacSystemFont, -apple-system, Segoe UI, Roboto, Oxygen, Cantarell, Fira Sans, Droid Sans, Arial, sans-serif
}
diff --git a/src/stylesheets/primeng.scss b/src/stylesheets/primeng.scss
index 5af1000f..ec4782dc 100644
--- a/src/stylesheets/primeng.scss
+++ b/src/stylesheets/primeng.scss
@@ -73,7 +73,7 @@
border-radius: 4px !important;
padding: .5rem 1rem .5rem 1rem !important;
color: var(--drgstn-text-secondary) !important;
- font-family: Roboto, Helvetica Neue, sans-serif !important;
+ font-family: var(--drgstn-font-family) !important;
font-size: .75rem !important;
}
diff --git a/src/stylesheets/styles.scss b/src/stylesheets/styles.scss
index e87b019e..1c9b569f 100644
--- a/src/stylesheets/styles.scss
+++ b/src/stylesheets/styles.scss
@@ -6,6 +6,8 @@
@import "variables";
#appWindow {
+ font-family: var(--drgstn-font-family) !important;
+ all: initial;
position: relative;
@import "~@ng-select/ng-select/themes/default.theme";
diff --git a/src/stylesheets/toast.scss b/src/stylesheets/toast.scss
index 5b40b1a8..88d4267a 100644
--- a/src/stylesheets/toast.scss
+++ b/src/stylesheets/toast.scss
@@ -3,7 +3,6 @@
border-radius: 4px;
position: relative;
padding: 1.25rem 2.5rem 1.25rem 1.5rem;
- font-family: BlinkMacSystemFont,-apple-system,Segoe UI,Roboto,Oxygen,Ubuntu,Cantarell,Fira Sans,Droid Sans,Helvetica Neue,Helvetica,Arial,sans-serif;
font-weight: 400;
font-size: 1em;
line-height: 1.5;
--
GitLab