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

Merge branch 'stable' into next

Browse Source 
# Conflicts:
#	package.json
This commit is contained in:
zadam 2021-05-18 21:07:29 +02:00
commit 731051154b
5 changed files with 26 additions and 43 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",
"version": "0.47.2",
"version": "0.47.3",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@ -2957,9 +2957,9 @@
}
},
"electron": {
"version": "13.0.0-beta.26",
"resolved": "https://registry.npmjs.org/electron/-/electron-13.0.0-beta.26.tgz",
"integrity": "sha512-glDAQjSzV26JvmB9pbdd1dLkjqUvBv9X0B8FrRvIK0BAhEmMzzZ3gKD6VPsxg2omDYMI35oThQ+92D4RxRcb+g==",
"version": "13.0.0-beta.27",
"resolved": "https://registry.npmjs.org/electron/-/electron-13.0.0-beta.27.tgz",
"integrity": "sha512-Co5143QQBiUHLY8qKPbe4axGnFxFLIPbdBuKh0pMvhmsGsVbTK3mEihmhl/lBKQe36cu+gnODpvtZZ0uGsqlxA==",
"dev": true,
"requires": {
"@electron/get": "^1.0.1",

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() {
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.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() {

28
src/public/stylesheets/style.css
View File

@ -103,26 +103,6 @@ span.fancytree-node.muted { opacity: 0.6; }
display: none;
}
.note-tab-content-template {
display: none !important;
}
.note-tab-content {
display: flex;
flex-direction: row;
height: 100%;
width: 100%;
}
/** we disable shield background when in zen mode because I couldn't get it to stay static
(it kept growing with content) */
#root-widget:not(.zen-mode) .note-tab-content.protected {
/* DON'T COLLAPSE THE RULES INTO SINGLE ONE, BACKGROUND WON'T DISPLAY */
background: url('../images/shield.svg') no-repeat;
background-size: contain;
background-position: center;
}
.zen-mode #center-pane {
width: 100% !important;
/* limit max width to improve readability */
@ -131,6 +111,10 @@ span.fancytree-node.muted { opacity: 0.6; }
margin-right: auto;
}
.zen-mode .hide-in-zen-mode, .zen-mode .gutter {
display: none !important;
}
.ui-autocomplete {
max-height: 300px;
overflow-y: auto;
@ -775,10 +759,6 @@ body {
font-size: var(--main-font-size);
}
.hidden-by-zen-mode {
display: none !important;
}
.gutter {
background: linear-gradient(to bottom, transparent, var(--accented-background-color), transparent);
}

2
src/services/build.js
View File

@ -1 +1 @@
module.exports = { buildDate:"2021-04-26T22:32:54+02:00", buildRevision: "6f1b0b92fe8dcea736c15217c69512c7fee769cb" };
module.exports = { buildDate:"2021-05-15T23:05:20+02:00", buildRevision: "f6dd1110e842a8b84f2bbdaadad315763045c152" };