zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-01-27 01:18:40 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix width in zen mode, closes #1965

Browse source
This commit is contained in:
zadam 2021-05-18 20:30:06 +02:00
parent cb8e551ee0
commit a4aaa49774
5 changed files with 26 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
package-lock.json generated
View file

@ -1,6 +1,6 @@
{ {
"name": "trilium", "name": "trilium",
"version": "0.47.2", "version": "0.47.3",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
@ -2797,9 +2797,9 @@
} }
}, },
"electron": { "electron": {
"version": "13.0.0-beta.26", "version": "13.0.0-beta.27",
"resolved": "https://registry.npmjs.org/electron/-/electron-13.0.0-beta.26.tgz", "resolved": "https://registry.npmjs.org/electron/-/electron-13.0.0-beta.27.tgz",
"integrity": "sha512-glDAQjSzV26JvmB9pbdd1dLkjqUvBv9X0B8FrRvIK0BAhEmMzzZ3gKD6VPsxg2omDYMI35oThQ+92D4RxRcb+g==", "integrity": "sha512-Co5143QQBiUHLY8qKPbe4axGnFxFLIPbdBuKh0pMvhmsGsVbTK3mEihmhl/lBKQe36cu+gnODpvtZZ0uGsqlxA==",
"dev": true, "dev": true,
"requires": { "requires": {
"@electron/get": "^1.0.1", "@electron/get": "^1.0.1",

2
package.json
View file

@ -80,7 +80,7 @@
}, },
"devDependencies": { "devDependencies": {
"cross-env": "7.0.3", "cross-env": "7.0.3",
"electron": "13.0.0-beta.26", "electron": "13.0.0-beta.27",
"electron-builder": "22.11.1", "electron-builder": "22.11.1",
"electron-packager": "15.2.0", "electron-packager": "15.2.0",
"electron-rebuild": "2.3.5", "electron-rebuild": "2.3.5",

14
src/public/app/services/entrypoints.js
View file

@ -128,20 +128,6 @@ export default class Entrypoints extends Component {
} }
} }
toggleZenModeCommand() {
if (!this.zenModeActive) {
$(".hide-in-zen-mode,.gutter").addClass("hidden-by-zen-mode");
$("#root-widget").addClass("zen-mode");
this.zenModeActive = true;
}
else {
// not hiding / showing explicitly since element might be hidden also for other reasons
$(".hide-in-zen-mode,.gutter").removeClass("hidden-by-zen-mode");
$("#root-widget").removeClass("zen-mode");
this.zenModeActive = false;
}
}
reloadFrontendAppCommand() { reloadFrontendAppCommand() {
utils.reloadApp(); utils.reloadApp();
} }

17
src/public/app/widgets/containers/root_container.js
View file

@ -22,6 +22,23 @@ export default class RootContainer extends FlexContainer {
this.$widget.toggleClass("protected", note.isProtected); this.$widget.toggleClass("protected", note.isProtected);
} }
this.setZenMode(this.isZenModeActive);
}
setZenMode(active) {
this.isZenModeActive = active;
if (this.isZenModeActive) {
$("#root-widget").addClass("zen-mode");
}
else {
$("#root-widget").removeClass("zen-mode");
}
}
toggleZenModeEvent() {
this.setZenMode(!this.isZenModeActive);
} }
tabNoteSwitchedEvent() { tabNoteSwitchedEvent() {

8
src/public/stylesheets/style.css
View file

@ -131,6 +131,10 @@ span.fancytree-node.muted { opacity: 0.6; }
margin-right: auto; margin-right: auto;
} }
.zen-mode .hide-in-zen-mode, .zen-mode .gutter {
display: none !important;
}
.ui-autocomplete { .ui-autocomplete {
max-height: 300px; max-height: 300px;
overflow-y: auto; overflow-y: auto;
@ -775,10 +779,6 @@ body {
font-size: var(--main-font-size); font-size: var(--main-font-size);
} }
.hidden-by-zen-mode {
display: none !important;
}
.gutter { .gutter {
background: linear-gradient(to bottom, transparent, var(--accented-background-color), transparent); background: linear-gradient(to bottom, transparent, var(--accented-background-color), transparent);
} }