Skip to content
Snippets Groups Projects
Commit 479caef8 authored by Hartung, Michael's avatar Hartung, Michael
Browse files

merge

parents 724cede2 3df95582
No related branches found
No related tags found
No related merge requests found
{ {
"name": "netex", "name": "netex",
"version": "1.0.6", "version": "1.0.8",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "netex", "name": "netex",
"version": "1.0.6", "version": "1.0.8",
"dependencies": { "dependencies": {
"@angular/animations": "^12.2.16", "@angular/animations": "^12.2.16",
"@angular/cdk": "^12.2.13", "@angular/cdk": "^12.2.13",
{ {
"name": "netex", "name": "netex",
"version": "1.0.6", "version": "1.0.8",
"scripts": { "scripts": {
"ng": "ng", "ng": "ng",
"start:dev": "ng serve --configuration=dev", "start:dev": "ng serve --configuration=dev",
......
1.0.6 1.0.8
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
<button onclick="setNetwork('netexp1')">Add nodes</button> <button onclick="setNetwork('netexp1')">Add nodes</button>
<div style="max-width: 80vw; width: 1276px; height: 600px"> <div style="max-width: 80vw; width: 1276px; height: 500px">
<drugst-one id="netexp1" <drugst-one id="netexp1"
pluginId="2" pluginId="2"
......
...@@ -6,9 +6,9 @@ ...@@ -6,9 +6,9 @@
// bulma variables // bulma variables
$dropdown-content-radius: 20px; $dropdown-content-radius: 20px;
height: var(--drgstn-height, 500px);
margin: 0; margin: 0;
font-family: Roboto, "Helvetica Neue", sans-serif; font-family: var(--drgstn-font-family);
p { p {
margin-bottom: .4rem !important; margin-bottom: .4rem !important;
......
...@@ -13,4 +13,5 @@ ...@@ -13,4 +13,5 @@
--drgstn-tooltip: rgba(74, 74, 74, 0.9); --drgstn-tooltip: rgba(74, 74, 74, 0.9);
--drgstn-panel-secondary: #FFFFFF; --drgstn-panel-secondary: #FFFFFF;
--drgstn-height: 600px; --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
} }
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
border-radius: 4px !important; border-radius: 4px !important;
padding: .5rem 1rem .5rem 1rem !important; padding: .5rem 1rem .5rem 1rem !important;
color: var(--drgstn-text-secondary) !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; font-size: .75rem !important;
} }
......
...@@ -6,6 +6,10 @@ ...@@ -6,6 +6,10 @@
@import "variables"; @import "variables";
#appWindow { #appWindow {
font-family: var(--drgstn-font-family) !important;
height: var(--drgstn-height, 500px) !important;
display: block !important;
all: initial;
position: relative; position: relative;
@import "~@ng-select/ng-select/themes/default.theme"; @import "~@ng-select/ng-select/themes/default.theme";
...@@ -161,8 +165,6 @@ ...@@ -161,8 +165,6 @@
div.drugstone.explorer { div.drugstone.explorer {
height: $height; height: $height;
margin-left: 10px;
margin-right: 10px;
overflow: hidden; overflow: hidden;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment