From de95b92f908a85b9f8993f5dc1b72f33a8f5a414 Mon Sep 17 00:00:00 2001 From: zadam Date: Fri, 30 Aug 2019 20:15:59 +0200 Subject: [PATCH] link map tweaks --- package-lock.json | 12 ++++++------ package.json | 4 ++-- src/public/javascripts/dialogs/options/sidebar.js | 3 +++ src/public/javascripts/services/link_map.js | 2 +- src/public/javascripts/widgets/link_map.js | 4 ++-- src/public/stylesheets/desktop.css | 2 +- src/public/stylesheets/link_map.css | 11 ++++++++++- 7 files changed, 25 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index c8d8701ff..e322ed832 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3122,9 +3122,9 @@ "integrity": "sha512-PcW2a0tyTuPHz3tWyYqtK6r1fZ3gp+3Sop8Ph+ZYN81Ob5rwmbHEzaqs10N3BEsaGTkh/ooniXK+WwszGlc2+Q==" }, "electron": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/electron/-/electron-6.0.5.tgz", - "integrity": "sha512-B3gjUvvXxVH4QnmGEMYne83lG2XJNbNe0FPwVDhzA9FkapnBgvrsE/Fz6NFXTaZm6zSdC2ut1j38rfSTFvUtDA==", + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/electron/-/electron-6.0.6.tgz", + "integrity": "sha512-sh5PfAHpKk+J/LpLK+Q2P2mCfTA7WDs0kImQ05uPuwmKjpCB3T8nMYCDuStS+opDoma19XPTh4049897GmPXmw==", "dev": true, "requires": { "@types/node": "^10.12.18", @@ -3671,9 +3671,9 @@ } }, "electron-context-menu": { - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/electron-context-menu/-/electron-context-menu-0.14.0.tgz", - "integrity": "sha512-7PuDz0Z3Eebhg/OS3JfPqHrQYl5ApokT/05PPUbNELk0EHBfFZwVcVneOJ05SlaGagK1bfQIXf75WSZt/K23VA==", + "version": "0.15.0", + "resolved": "https://registry.npmjs.org/electron-context-menu/-/electron-context-menu-0.15.0.tgz", + "integrity": "sha512-XLdtbX90NPkWycG3IzwtCmfX4ggu+lofNOW1nVRStb+ScFs49WTourW1k77Z4DTyThR3gUHg3UPXVBMbW1gNsg==", "requires": { "cli-truncate": "^2.0.0", "electron-dl": "^1.2.0", diff --git a/package.json b/package.json index 5890cc63e..de84fb312 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "dayjs": "1.8.16", "debug": "4.1.1", "ejs": "2.6.2", - "electron-context-menu": "0.14.0", + "electron-context-menu": "0.15.0", "electron-debug": "3.0.1", "electron-dl": "1.14.0", "electron-find": "1.0.6", @@ -77,7 +77,7 @@ "xml2js": "0.4.19" }, "devDependencies": { - "electron": "6.0.5", + "electron": "6.0.6", "electron-builder": "21.2.0", "electron-compile": "6.4.4", "electron-installer-debian": "2.0.0", diff --git a/src/public/javascripts/dialogs/options/sidebar.js b/src/public/javascripts/dialogs/options/sidebar.js index 5acd41139..ff0f73e7a 100644 --- a/src/public/javascripts/dialogs/options/sidebar.js +++ b/src/public/javascripts/dialogs/options/sidebar.js @@ -33,6 +33,9 @@ export default class SidebarOptions { } async optionsLoaded(options) { + this.$widgetsEnabled.empty(); + this.$widgetsDisabled.empty(); + this.$sidebarMinWidth.val(options.sidebarMinWidth); this.$sidebarWidthPercent.val(options.sidebarWidthPercent); diff --git a/src/public/javascripts/services/link_map.js b/src/public/javascripts/services/link_map.js index 5eec78c7f..bacf44490 100644 --- a/src/public/javascripts/services/link_map.js +++ b/src/public/javascripts/services/link_map.js @@ -65,7 +65,7 @@ export default class LinkMap { graph, // param explanation here: https://github.com/dhotson/springy/issues/58 400.0, // Spring stiffness - 200.0, // Node repulsion + 400.0, // Node repulsion 0.15 // Damping ); diff --git a/src/public/javascripts/widgets/link_map.js b/src/public/javascripts/widgets/link_map.js index 2897fc1cb..d3c785347 100644 --- a/src/public/javascripts/widgets/link_map.js +++ b/src/public/javascripts/widgets/link_map.js @@ -3,7 +3,7 @@ import StandardWidget from "./standard_widget.js"; let linkMapContainerIdCtr = 1; const TPL = ` -
+ `; @@ -32,7 +32,7 @@ class LinkMapWidget extends StandardWidget { this.linkMapService = new LinkMapServiceClass(this.ctx.note, $linkMapContainer, { maxDepth: 1, - zoom: 0.8 + zoom: 0.6 }); await this.linkMapService.render(); diff --git a/src/public/stylesheets/desktop.css b/src/public/stylesheets/desktop.css index 23957a9b4..bbf898591 100644 --- a/src/public/stylesheets/desktop.css +++ b/src/public/stylesheets/desktop.css @@ -366,7 +366,7 @@ body { width: 99%; /* to give minimal right margin */ background-color: var(--button-background-color); border-color: var(--button-border-color); - border-width: 1px 0 1px 0; + border-width: 1px; border-radius: 4px; border-style: solid; display: flex; diff --git a/src/public/stylesheets/link_map.css b/src/public/stylesheets/link_map.css index 737f378e0..f2c3311fc 100644 --- a/src/public/stylesheets/link_map.css +++ b/src/public/stylesheets/link_map.css @@ -16,7 +16,7 @@ font-size: 11px; width: auto; height: auto; - max-width: 150px; + max-width: 200px; min-width: 120px; max-height: 100px; overflow: hidden; @@ -43,4 +43,13 @@ .link-map-container .jsplumb-connection-hover path { stroke-width: 2 !important; stroke: var(--main-text-color); +} + +.link-map-widget { + outline: none; + overflow: hidden; +} + +.link-map-widget .note-box .title { + font-size: 16px !important; } \ No newline at end of file