From b4709e8ee5ca212ca1f9b52bb2ad85ea5da0a469 Mon Sep 17 00:00:00 2001 From: zadam Date: Mon, 18 Nov 2019 19:32:27 +0100 Subject: [PATCH] "distraction free mode" renamed to more standard "zen mode" --- package-lock.json | 19 ++++++++++--------- package.json | 2 +- .../javascripts/services/entrypoints.js | 6 +++--- src/public/stylesheets/desktop.css | 2 +- src/public/stylesheets/style.css | 4 ++-- src/views/desktop.ejs | 4 ++-- src/views/dialogs/help.ejs | 2 +- src/views/sidebar.ejs | 2 +- src/views/tabs.ejs | 2 +- src/views/title.ejs | 6 +++--- 10 files changed, 25 insertions(+), 24 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5dc48fd44..506e6c846 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5990,9 +5990,9 @@ }, "dependencies": { "glob": { - "version": "7.1.4", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz", - "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==", + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", "requires": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -6546,12 +6546,13 @@ } }, "imagemin": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/imagemin/-/imagemin-7.0.0.tgz", - "integrity": "sha512-TXvCSSIYl4KQUASur9S0+E4olVECzvxvZABU9rNqsza7vzIrUQMRTjyczGf8OmtcgvZ9jOYyinXW3epOpd/04A==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/imagemin/-/imagemin-7.0.1.tgz", + "integrity": "sha512-33AmZ+xjZhg2JMCe+vDf6a9mzWukE7l+wAtesjE7KyteqqKjzxv7aVQeWnul1Ve26mWvEQqyPwl0OctNBfSR9w==", "requires": { "file-type": "^12.0.0", "globby": "^10.0.0", + "graceful-fs": "^4.2.2", "junk": "^3.1.0", "make-dir": "^3.0.0", "p-pipe": "^3.0.0", @@ -9903,9 +9904,9 @@ "integrity": "sha512-CzFr90qM24ju5f88quFC/6qohjC144rehe5n6DH900lgXmUe86+xCKc10ev56gRKC4/BkHUoG4uSiQgBiIXwDA==" }, "picomatch": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.0.7.tgz", - "integrity": "sha512-oLHIdio3tZ0qH76NybpeneBhYVj0QFTfXEFTc/B3zKQspYfYYkWYgFsmzo+4kvId/bQRcNkVeguI3y+CD22BtA==" + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.1.1.tgz", + "integrity": "sha512-OYMyqkKzK7blWO/+XZYP6w8hH0LDvkBvdvKukti+7kqYFCiEAk+gI3DWnryapc0Dau05ugGTy0foQ6mqn4AHYA==" }, "pify": { "version": "4.0.1", diff --git a/package.json b/package.json index e762d8c37..e69cb2386 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "http-proxy-agent": "2.1.0", "https-proxy-agent": "3.0.1", "image-type": "4.1.0", - "imagemin": "7.0.0", + "imagemin": "7.0.1", "imagemin-giflossy": "5.1.10", "imagemin-mozjpeg": "8.0.0", "imagemin-pngquant": "8.0.0", diff --git a/src/public/javascripts/services/entrypoints.js b/src/public/javascripts/services/entrypoints.js index 8256ae96c..d0142e55d 100644 --- a/src/public/javascripts/services/entrypoints.js +++ b/src/public/javascripts/services/entrypoints.js @@ -92,12 +92,12 @@ function registerEntrypoints() { } } + // hide (toggle) everything except for the note content for zen mode utils.bindGlobalShortcut('alt+m', e => { - $(".hide-toggle").toggle(); - $("#container").toggleClass("distraction-free-mode"); + $(".hide-in-zen-mode").toggle(); + $("#container").toggleClass("zen-mode"); }); - // hide (toggle) everything except for the note content for distraction free writing utils.bindGlobalShortcut('alt+t', e => { const date = new Date(); const dateString = utils.formatDateTime(date); diff --git a/src/public/stylesheets/desktop.css b/src/public/stylesheets/desktop.css index eada71e04..206be72b1 100644 --- a/src/public/stylesheets/desktop.css +++ b/src/public/stylesheets/desktop.css @@ -18,7 +18,7 @@ body { grid-gap: 0; } -#container.distraction-free-mode { +#container.zen-mode { grid-template-areas: "tab-container" !important; grid-template-rows: auto diff --git a/src/public/stylesheets/style.css b/src/public/stylesheets/style.css index a2b87e2cb..00d4d2be6 100644 --- a/src/public/stylesheets/style.css +++ b/src/public/stylesheets/style.css @@ -144,9 +144,9 @@ ul.fancytree-container { margin-top: 0; } -/** we disable shield background when in distraction free mode because I couldn't get it to stay static +/** we disable shield background when in zen mode because I couldn't get it to stay static (it kept growing with content) */ -#container:not(.distraction-free-mode) .note-tab-content.protected { +#container: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; diff --git a/src/views/desktop.ejs b/src/views/desktop.ejs index 3b92481b0..09b1527dd 100644 --- a/src/views/desktop.ejs +++ b/src/views/desktop.ejs @@ -10,7 +10,7 @@