gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

link map tweaks

Browse Source
This commit is contained in:
zadam 2019-08-30 20:15:59 +02:00
parent 89ed9027da
commit de95b92f90
7 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
package-lock.json generated
View File

@ -3122,9 +3122,9 @@
"integrity": "sha512-PcW2a0tyTuPHz3tWyYqtK6r1fZ3gp+3Sop8Ph+ZYN81Ob5rwmbHEzaqs10N3BEsaGTkh/ooniXK+WwszGlc2+Q==" "integrity": "sha512-PcW2a0tyTuPHz3tWyYqtK6r1fZ3gp+3Sop8Ph+ZYN81Ob5rwmbHEzaqs10N3BEsaGTkh/ooniXK+WwszGlc2+Q=="
}, },
"electron": { "electron": {
"version": "6.0.5", "version": "6.0.6",
"resolved": "https://registry.npmjs.org/electron/-/electron-6.0.5.tgz", "resolved": "https://registry.npmjs.org/electron/-/electron-6.0.6.tgz",
"integrity": "sha512-B3gjUvvXxVH4QnmGEMYne83lG2XJNbNe0FPwVDhzA9FkapnBgvrsE/Fz6NFXTaZm6zSdC2ut1j38rfSTFvUtDA==", "integrity": "sha512-sh5PfAHpKk+J/LpLK+Q2P2mCfTA7WDs0kImQ05uPuwmKjpCB3T8nMYCDuStS+opDoma19XPTh4049897GmPXmw==",
"dev": true, "dev": true,
"requires": { "requires": {
"@types/node": "^10.12.18", "@types/node": "^10.12.18",
@ -3671,9 +3671,9 @@
} }
}, },
"electron-context-menu": { "electron-context-menu": {
"version": "0.14.0", "version": "0.15.0",
"resolved": "https://registry.npmjs.org/electron-context-menu/-/electron-context-menu-0.14.0.tgz", "resolved": "https://registry.npmjs.org/electron-context-menu/-/electron-context-menu-0.15.0.tgz",
"integrity": "sha512-7PuDz0Z3Eebhg/OS3JfPqHrQYl5ApokT/05PPUbNELk0EHBfFZwVcVneOJ05SlaGagK1bfQIXf75WSZt/K23VA==", "integrity": "sha512-XLdtbX90NPkWycG3IzwtCmfX4ggu+lofNOW1nVRStb+ScFs49WTourW1k77Z4DTyThR3gUHg3UPXVBMbW1gNsg==",
"requires": { "requires": {
"cli-truncate": "^2.0.0", "cli-truncate": "^2.0.0",
"electron-dl": "^1.2.0", "electron-dl": "^1.2.0",

4
package.json
View File

@ -31,7 +31,7 @@
"dayjs": "1.8.16", "dayjs": "1.8.16",
"debug": "4.1.1", "debug": "4.1.1",
"ejs": "2.6.2", "ejs": "2.6.2",
"electron-context-menu": "0.14.0", "electron-context-menu": "0.15.0",
"electron-debug": "3.0.1", "electron-debug": "3.0.1",
"electron-dl": "1.14.0", "electron-dl": "1.14.0",
"electron-find": "1.0.6", "electron-find": "1.0.6",
@ -77,7 +77,7 @@
"xml2js": "0.4.19" "xml2js": "0.4.19"
}, },
"devDependencies": { "devDependencies": {
"electron": "6.0.5", "electron": "6.0.6",
"electron-builder": "21.2.0", "electron-builder": "21.2.0",
"electron-compile": "6.4.4", "electron-compile": "6.4.4",
"electron-installer-debian": "2.0.0", "electron-installer-debian": "2.0.0",

3
src/public/javascripts/dialogs/options/sidebar.js
View File

@ -33,6 +33,9 @@ export default class SidebarOptions {
} }
async optionsLoaded(options) { async optionsLoaded(options) {
this.$widgetsEnabled.empty();
this.$widgetsDisabled.empty();
this.$sidebarMinWidth.val(options.sidebarMinWidth); this.$sidebarMinWidth.val(options.sidebarMinWidth);
this.$sidebarWidthPercent.val(options.sidebarWidthPercent); this.$sidebarWidthPercent.val(options.sidebarWidthPercent);

2
src/public/javascripts/services/link_map.js
View File

@ -65,7 +65,7 @@ export default class LinkMap {
graph, graph,
// param explanation here: https://github.com/dhotson/springy/issues/58 // param explanation here: https://github.com/dhotson/springy/issues/58
400.0, // Spring stiffness 400.0, // Spring stiffness
200.0, // Node repulsion 400.0, // Node repulsion
0.15 // Damping 0.15 // Damping
); );

4
src/public/javascripts/widgets/link_map.js
View File

@ -3,7 +3,7 @@ import StandardWidget from "./standard_widget.js";
let linkMapContainerIdCtr = 1; let linkMapContainerIdCtr = 1;
const TPL = ` const TPL = `
<div style="outline: none; overflow: hidden;"> <div class="link-map-widget">
<div class="link-map-container"></div> <div class="link-map-container"></div>
</div> </div>
`; `;
@ -32,7 +32,7 @@ class LinkMapWidget extends StandardWidget {
this.linkMapService = new LinkMapServiceClass(this.ctx.note, $linkMapContainer, { this.linkMapService = new LinkMapServiceClass(this.ctx.note, $linkMapContainer, {
maxDepth: 1, maxDepth: 1,
zoom: 0.8 zoom: 0.6
}); });
await this.linkMapService.render(); await this.linkMapService.render();

2
src/public/stylesheets/desktop.css
View File

@ -366,7 +366,7 @@ body {
width: 99%; /* to give minimal right margin */ width: 99%; /* to give minimal right margin */
background-color: var(--button-background-color); background-color: var(--button-background-color);
border-color: var(--button-border-color); border-color: var(--button-border-color);
border-width: 1px 0 1px 0; border-width: 1px;
border-radius: 4px; border-radius: 4px;
border-style: solid; border-style: solid;
display: flex; display: flex;

11
src/public/stylesheets/link_map.css
View File

@ -16,7 +16,7 @@
font-size: 11px; font-size: 11px;
width: auto; width: auto;
height: auto; height: auto;
max-width: 150px; max-width: 200px;
min-width: 120px; min-width: 120px;
max-height: 100px; max-height: 100px;
overflow: hidden; overflow: hidden;
@ -43,4 +43,13 @@
.link-map-container .jsplumb-connection-hover path { .link-map-container .jsplumb-connection-hover path {
stroke-width: 2 !important; stroke-width: 2 !important;
stroke: var(--main-text-color); stroke: var(--main-text-color);
}
.link-map-widget {
outline: none;
overflow: hidden;
}
.link-map-widget .note-box .title {
font-size: 16px !important;
} }