diff --git a/package-lock.json b/package-lock.json index 1e105ed2f928b1efefda50e6f8723b3314f438a1..36a6a2118d849fda70d9cbd49bb9b679ddf521c8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "netex", - "version": "1.0.6", + "version": "1.0.8", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "netex", - "version": "1.0.6", + "version": "1.0.8", "dependencies": { "@angular/animations": "^12.2.16", "@angular/cdk": "^12.2.13", diff --git a/package.json b/package.json index f56352624c7d69942164a777f85be6daaff5860b..05e2bea55492ad0e6af308b7e8f8de5c61302336 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "netex", - "version": "1.0.6", + "version": "1.0.8", "scripts": { "ng": "ng", "start:dev": "ng serve --configuration=dev", diff --git a/releases/latest b/releases/latest index af0b7ddbffd5d5a877581ba8ba10deed158da14d..b0f3d96f877256ed9ae03858ecc5185a989b1d1b 100644 --- a/releases/latest +++ b/releases/latest @@ -1 +1 @@ -1.0.6 +1.0.8 diff --git a/src/index.html b/src/index.html index c6a928f336ca52e3cd40c0b0c09b0a43d2538490..e77521a3735c631d67bd90b6c47c44e49f80e0b6 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: 500px"> <drugst-one id="netexp1" pluginId="2" diff --git a/src/stylesheets/bulma.scss b/src/stylesheets/bulma.scss index 0cbf1198fb7feeaa8203731ff38bcb4fb4564e03..b807f7db91c198bf76848062815e005ff55a32f7 100644 --- a/src/stylesheets/bulma.scss +++ b/src/stylesheets/bulma.scss @@ -6,9 +6,9 @@ // bulma variables $dropdown-content-radius: 20px; - 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 cf1c9163acb9a460e7f30de2cccc46747baf96e4..fc88a9a6582d4ee8447891daa632c840b6d72bdf 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 5af1000fe9feb4d3a1ff7f6783cf9348c4ac4c5a..ec4782dc61b7d700e0577bdecf0efbaa344ce34a 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 e87b019eb20bd6a5f06cf100ec7ca8b5d3870b23..1acb530f787a809aaf875a81357d6266d6272277 100644 --- a/src/stylesheets/styles.scss +++ b/src/stylesheets/styles.scss @@ -6,6 +6,10 @@ @import "variables"; #appWindow { + font-family: var(--drgstn-font-family) !important; + height: var(--drgstn-height, 500px) !important; + display: block !important; + all: initial; position: relative; @import "~@ng-select/ng-select/themes/default.theme"; @@ -161,8 +165,6 @@ div.drugstone.explorer { height: $height; - margin-left: 10px; - margin-right: 10px; overflow: hidden; }