From d7dbd40d8a04c7dc151d821fe36fc20be69f1780 Mon Sep 17 00:00:00 2001
From: Michael Hartung <michi@Michaels-MacBook-Pro.local>
Date: Tue, 27 Jul 2021 12:48:47 +0200
Subject: [PATCH] default font for nodes because vis js to overwrite fonts that
might be set by seed highlighting or selection
---
.../components/network-legend/network-legend.component.scss | 1 +
src/app/network-settings.ts | 4 ++--
src/app/pages/explorer-page/explorer-page.component.ts | 3 +++
src/variables.scss | 1 +
4 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/app/components/network-legend/network-legend.component.scss b/src/app/components/network-legend/network-legend.component.scss
index c627ce78..ab78e5e8 100644
--- a/src/app/components/network-legend/network-legend.component.scss
+++ b/src/app/components/network-legend/network-legend.component.scss
@@ -56,6 +56,7 @@ div.legend {
height: $legend-circle-size;
display: inline-block;
text-align: center;
+ line-height: $legend-circle-line-height;
}
.triangle{
width: 0;
diff --git a/src/app/network-settings.ts b/src/app/network-settings.ts
index 46dfcf39..649d1d94 100644
--- a/src/app/network-settings.ts
+++ b/src/app/network-settings.ts
@@ -148,8 +148,8 @@ export class NetworkSettings {
node = merge(node, config.nodeGroups.selectedNode);
}
- // show image if image url is given
- if (node.image) {
+ // show image if image url is given. If seed nodes are highlighted, ignore image property
+ if (node.image && !isSeed) {
node.shape = 'image';
}
diff --git a/src/app/pages/explorer-page/explorer-page.component.ts b/src/app/pages/explorer-page/explorer-page.component.ts
index 98bbfcf6..1d415f1a 100644
--- a/src/app/pages/explorer-page/explorer-page.component.ts
+++ b/src/app/pages/explorer-page/explorer-page.component.ts
@@ -506,6 +506,9 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit {
if (!group.borderWidthSelected) {
group.borderWidthSelected = 0;
}
+ if (!group.font) {
+ group.font = defaultConfig.nodeGroups.default.font;
+ }
// if color is set as string, add detail settings
if (typeof group.color === 'string') {
group.color = {
diff --git a/src/variables.scss b/src/variables.scss
index 0af86f91..ec9d882b 100644
--- a/src/variables.scss
+++ b/src/variables.scss
@@ -18,6 +18,7 @@ $analysis-tab-header-padding: 1.5rem;
$legend-default-background-color: #143d1f;
$legend-row-height: 35px;
$legend-circle-size: $legend-row-height;
+$legend-circle-line-height: 28px; // for '...' in middle of circle
$legend-star-size: 20px;
$legend-square-width: $legend-row-height;
$legend-edge-width: 20px;
--
GitLab