Skip to content
Snippets Groups Projects
Commit f82f58fe authored by Maiykol's avatar Maiykol
Browse files

Merge branch 'master' of https://gitlab.lrz.de/netex/frontend

parents ed9b8568 b5048312
No related branches found
No related tags found
No related merge requests found
Pipeline #11034 failed
Stage: setup
Stage: check
Stage: build
Stage: deploy
Show whitespace changes
Inline Side-by-side
drugsTone-build/drugsTone.js
+ 1
− 1
View file @ f82f58fe
Source diff could not be displayed: it is too large. Options to address this: view the blob.
drugsTone-build/styles.css
+ 2
− 2
View file @ f82f58fe
Source diff could not be displayed: it is too large. Options to address this: view the blob.
drugstone-test.html
+ 7
− 15
View file @ f82f58fe
......@@ -8,8 +8,8 @@
<link rel="icon" type="image/x-icon" href="favicon.ico">
<!-- <script type = "text/javascript" src="/home/andimajore/projects/drugstOne/frontend/drugsTone-build/drugsTone.js"></script>-->
<!-- <link rel="/home/andimajore/projects/drugstOne/frontend/drugsTone-build/drugsTone.css">-->
<script src="https://cdn.jsdelivr.net/gh/AndiMajore/drugstone-releases@0.5.7/remote/drugsTone.js"></script>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/AndiMajore/drugstone-releases@0.5.7/remote/styles.css">
<script src="https://cdn.jsdelivr.net/gh/AndiMajore/drugstone-releases@0.6.1/remote/drugsTone.js"></script>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/AndiMajore/drugstone-releases@0.6.1/remote/styles.css">
<script src="https://kit.fontawesome.com/3ad4fe992f.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.7.2/highlight.min.js"></script>
<!-- <script>-->
......@@ -25,19 +25,11 @@
<body style="background-color: var(--surface-b)">
<div style="height: 700px; width: 1300px;">
<network-expander id="netexp1"
config='{
"nodeGroups": {"0.5": {"type": "gene", "color": "rgb(204, 255, 51)", "name": "0.5", "shape": "circle"}, "patient_group": {"type": "patient", "color": "red", "name": "patient group", "shape": "circle"}, "2.0": {"type": "gene", "color": "rgb(51, 204, 51)", "name": "2.0", "shape": "circle"}, "-2.0": {"type": "gene", "color": "rgb(255, 0, 0)", "name": "-2.0", "shape": "circle"}},
"edgeGroups": {"custom": {"color": "black", "name": "Custom Group"}},
"identifier": "symbol",
"legendUrl": "https://exbio.wzw.tum.de/covex/assets/leg1.png"
}'
network='{
"nodes": [{"id": "TP53", "group": "0.5"}, {"id": "C5", "group": "0.5"}, {"id": "Patient", "group": "patient_group"}, {"label": "PTEN", "id": "PTEN", "group": 0.5}],
"edges": []
}'
style="height: 100%; width: 100vw; display: block;"
></network-expander>
<network-expander
id='drugstone-panel-1'
config='{"nodeGroups":{"0.5":{"type":"gene","color":"#CCFF33FF","name":"0.5","shape":"image","image":"http://simpleicon.com/wp-content/uploads/icon2.png"},"patient_group":{"type":"gene","color":"#66FF33FF","name":"1.5","shape":"circle"},"2.0":{"type":"gene","color":"#33CC33FF","name":"2.0","shape":"circle"},"-2.0":{"type":"gene","color":"#FF0000FF","name":"-2.0","shape":"circle"}},"edgeGroups":{"custom":{"color":"black","name":"Custom Group"}},"identifier":"symbol","legendUrl":"https://exbio.wzw.tum.de/covex/assets/leg1.png"}'
network='{"nodes":[{"id":"TP53","group":"0.5"},{"id":"C5","group":"0.5"},{"id":"Patient","group":"patient_group"},{"label":"PTEN","id":"PTEN","group":0.5}],"edges":[]}'>
</network-expander>
</div>
</body>
</html>
package.json
+ 1
− 0
View file @ f82f58fe
......@@ -5,6 +5,7 @@
"ng": "ng",
"start:local": "ng serve --configuration=local",
"start:remote": "ng serve --configuration=remote",
"start:prod": "ng serve --configuration=production",
"build": "ng build",
"test": "ng test",
"lint": "ng lint && htmlhint",
......
releases/delete_tag.sh
+ 1
− 1
View file @ f82f58fe
......@@ -10,7 +10,7 @@ VERSION=v$1
cd ../../
echo "Cloning Release Repo..."
git clone git@github.com:AndiMajore/drugstone-releases.git
git clone git@gitlab.lrz.de:netex/drugstone-website.git
echo "Deleting Release Version..."
cd drugstone-releases || echo "Error!" exit
git push --delete origin "$VERSION"
......
releases/release_tag.sh
+ 1
− 1
View file @ f82f58fe
......@@ -18,7 +18,7 @@ MESSAGE=$2
cd ../../
echo "Cloning Release Repo..."
git clone git@github.com:AndiMajore/drugstone-releases.git
git clone git@gitlab.lrz.de:netex/drugstone-website.git
echo "Updating Repo..."
echo "Building release..."
......
src/styles.scss
+ 18
− 19
View file @ f82f58fe
......@@ -5,13 +5,7 @@
@import url('https://fonts.googleapis.com/css?family=Varela+Round');
@import "~@ng-select/ng-select/themes/default.theme.css";
$family-sans-serif: "Varela Round", sans-serif;
$primary: #48C774;
$success: #3070B3;
$danger: #EF476F;
$link: $primary;
$info: $primary;
@import "./theme.scss";
//@import "src/theme";
@import "~bulma/bulma.sass";
@import '~bulma-tooltip';
@import "~primeng/resources/primeng.min.css";
......@@ -91,6 +85,7 @@ div.covex.bar-right {
&::-webkit-scrollbar {
display: none;
}
/* Hide scrollbar for IE, Edge and Firefox */
-ms-overflow-style: none; /* IE and Edge */
scrollbar-width: none; /* Firefox */
......@@ -128,12 +123,15 @@ div.covex.network {
.center-panel {
width: $main-width;
&.leftgone {
width: calc(#{$main-width} + max(#{$sidebar-left-width},#{$sidebar-left-min-width}));
}
&.rightgone {
width: calc(#{$main-width} + max(#{$sidebar-right-width},#{$sidebar-right-min-width}));
}
&.rightgone.leftgone {
width: calc(#{$main-width} + max(#{$sidebar-left-width},#{$sidebar-left-min-width}) + max(#{$sidebar-right-width},#{$sidebar-right-min-width}));
}
......@@ -212,6 +210,7 @@ div.field.has-addons.add-remove-toggle {
.field {
margin-bottom: 0;
.control {
margin-bottom: 0;
}
......
src/theme.scss
+ 6
− 1
View file @ f82f58fe
$primary: #fd2020;
$primary: #48C774;
$success: #3070B3;
$danger: #EF476F;
$background: 'white';
$link: $primary;
$info: $primary;
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment