From bb09ee3dfb666746a7f22d4b46f3ccfbbe550c0e Mon Sep 17 00:00:00 2001
From: AndiMajore <andi.majore@googlemail.com>
Date: Tue, 24 Aug 2021 10:47:51 +0200
Subject: [PATCH] idk what i changed
---
drugstone-test.html | 6 +++---
src/app/pages/explorer-page/explorer-page.component.html | 3 +--
src/app/pages/explorer-page/explorer-page.component.ts | 3 ---
src/index.html | 4 ++--
src/stylesheets/styles.scss | 2 +-
src/stylesheets/theme.css | 1 +
6 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/drugstone-test.html b/drugstone-test.html
index 520fdfe8..d98985f8 100644
--- a/drugstone-test.html
+++ b/drugstone-test.html
@@ -1,9 +1,9 @@
<html lang="en">
<head>
<link rel="stylesheet" type="text/css" href="src/stylesheets/theme.css">
- <script src="https://cdn.jsdelivr.net/gh/AndiMajore/drugstone-releases@0.7.9-rc3/uhh/drugsTone.js"></script>
-<!-- <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/AndiMajore/drugstone-releases@0.7.9-rc3/uhh/styles.css">-->
- <link rel="stylesheet" type="text/css" href="./drugsTone-build/styles.css">
+ <script src="https://cdn.jsdelivr.net/gh/AndiMajore/drugstone-releases/uhh/drugsTone.js"></script>
+ <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/AndiMajore/drugstone-releases@0.8.1-rc3/uhh/styles.css">
+<!-- <link rel="stylesheet" type="text/css" href="./drugsTone-build/styles.css">-->
</head>
<body>
<div style="height: 700px; width: 1300px;">
diff --git a/src/app/pages/explorer-page/explorer-page.component.html b/src/app/pages/explorer-page/explorer-page.component.html
index cb503e69..e671ec4e 100644
--- a/src/app/pages/explorer-page/explorer-page.component.html
+++ b/src/app/pages/explorer-page/explorer-page.component.html
@@ -1,9 +1,8 @@
<div
id="appWindow"
- [style.color]="textColor"
(window:resize)="onResize($event)"
>
- <div class="is-hidden-mobile fullheight">
+ <div class="is-hidden-mobile fullheight" id="appContainer">
<app-launch-analysis
[(show)]="showAnalysisDialog"
[target]="analysisDialogTarget"
diff --git a/src/app/pages/explorer-page/explorer-page.component.ts b/src/app/pages/explorer-page/explorer-page.component.ts
index 3aed5904..7a39c3eb 100644
--- a/src/app/pages/explorer-page/explorer-page.component.ts
+++ b/src/app/pages/explorer-page/explorer-page.component.ts
@@ -174,9 +174,6 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit {
// keys are node netexIds
public expressionMap: NodeAttributeMap = undefined;
- @Input()
- public textColor = 'red';
-
@ViewChild('network', {static: false}) networkEl: ElementRef;
@ViewChild('networkWithLegend', {static: false}) networkWithLegendEl: ElementRef;
diff --git a/src/index.html b/src/index.html
index 01498710..22f9f43f 100644
--- a/src/index.html
+++ b/src/index.html
@@ -6,6 +6,7 @@
<base href="/">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<script type="text/javascript" src="https://unpkg.com/vis-network/standalone/umd/vis-network.min.js"></script>
+<!-- <link rel="stylesheet" type="text/css" href="./stylesheets/theme.css">-->
</head>
<body>
@@ -31,7 +32,7 @@
<button onclick="setNetwork('netexp1')">Add nodes</button>
-<div style="height: 700px; width: 1300px">
+<div style="width: 1300px">
<network-expander id="netexp1"
config='{
@@ -48,7 +49,6 @@
{"from": "Patient No. 5","to": "C5","label": "w/o group"}
]
}'
- style="height: 100%; width: 100vw; display: block;"
></network-expander>
</div>
diff --git a/src/stylesheets/styles.scss b/src/stylesheets/styles.scss
index a765fbd0..851c4673 100644
--- a/src/stylesheets/styles.scss
+++ b/src/stylesheets/styles.scss
@@ -7,7 +7,7 @@
@import "primeng";
#appWindow {
- height: 100%;
+ height: var(--drgstn-height, 500px);
margin: 0;
font-family: Roboto, "Helvetica Neue", sans-serif;
diff --git a/src/stylesheets/theme.css b/src/stylesheets/theme.css
index e939fdc9..5c01968a 100644
--- a/src/stylesheets/theme.css
+++ b/src/stylesheets/theme.css
@@ -12,4 +12,5 @@
--drgstn-border: rgba(0, 0, 0, 0.2);
--drgstn-tooltip: rgba(74, 74, 74, 0.9);
--drgstn-panel-secondary: #ffffff;
+ --drgstn-height: 400px;
}
--
GitLab