From d3d3b4007f5ecd9298ee3b2ac18dc19f7fe6ba39 Mon Sep 17 00:00:00 2001 From: dragonwocky Date: Wed, 1 Jul 2020 19:12:57 +1000 Subject: [PATCH] app no longer crashes when sidebar toggled --- CHANGELOG.md | 5 +---- README.md | 4 ++-- docs/changelog.html | 20 +++++++++++++---- docs/index.html | 4 ++-- resources/preload.js | 38 +++++++++++++++----------------- resources/user.css | 52 ++++++++++++++++++++------------------------ 6 files changed, 61 insertions(+), 62 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 42bd047..c7d7c0c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,10 +8,7 @@ but can still easily be enabled by following instructions in the [docs](README.m - new: semi-mac support? installs, but can't confirm changes have taken effect. - bugfix: `cleaner.py` patched for linux. - bugfix: odd mix of `\\` and `/` being used for windows filepaths. - -//todo - -- bugfix: app crashes when sidebar is toggled +- bugfix: app no longer crashes when sidebar is toggled. ### v0.6.0 (2020-06-30) diff --git a/README.md b/README.md index d68a07c..b13725c 100644 --- a/README.md +++ b/README.md @@ -69,7 +69,7 @@ symbolised with an arrow (4th from the right). when toggled to point up, notion will remain the top visible window even if not focused. to customise which characters are used for these buttons, open in the `resources/preload.js` file, -find the relevant button icon (lines 80 - 111) and replace it with your chosen unicode character (e.g. +find the relevant button icon (lines 69 - 82) and replace it with your chosen unicode character (e.g. replacing `return '⨉';` with `return '🙄';`). ### nicer scrollbars @@ -77,7 +77,7 @@ replacing `return '⨉';` with `return '🙄';`). i mean, yeah. get rid of those ugly default scrollbars and use nice inconspicuous ones that actually look as if they're part of notion. -to add these to the web version, copy lines 44 - 75 from `user.css` into your css customiser. +to add these to the web version, copy lines 74 - 105 from `user.css` into your css customiser. ![](screenshots/app-unenhanced.jpg) _image: before enhancement_ diff --git a/docs/changelog.html b/docs/changelog.html index 4c262ef..a51ba9d 100644 --- a/docs/changelog.html +++ b/docs/changelog.html @@ -1,4 +1,4 @@ -changelog | notion enhancer

notion enhancer

+changelog | notion enhancer

notion enhancer

@@ -7,6 +7,18 @@

if something is crossed out, then it is no longer a feature included by default, but can still easily be enabled by following instructions in the docs.

+

+
+

+ v0.6.1 (wip) +

+
    +
  • new: semi-mac support? installs, but can't confirm changes have taken effect.
    • +
  • bugfix: cleaner.py patched for linux.
    • +
  • bugfix: odd mix of \\ and / being used for windows filepaths.
    • +
  • bugfix: app no longer crashes when sidebar is toggled.
    • +
+

@@ -15,13 +27,13 @@ but can still easily be enabled by following instructions in the u/Roosmaryn) +
  • style: hide discussions (thanks to u/Roosmaryn).
  • new: custom colour theming, demonstrated via the dark+ theme.
    • -
  • new: linux support (thanks for @Blacksuan19).
    • +
  • new: linux support (thanks to @Blacksuan19).
  • improved: if hotkey is pressed while notion is unfocused, it will bring it to the front rather than hiding it.
  • improved: stop window buttons breaking at smaller widths.
  • improved: more obviously visible drag area.
    • -
  • bugfix: specify UTF-8 encoding to prevent multibyte/gbk codec errors (thanks to @etnperlong)
    • +
  • bugfix: specify UTF-8 encoding to prevent multibyte/gbk codec errors (thanks to @etnperlong).

    • 📥 notion-enhancer.v0.6.0.zip

    diff --git a/docs/index.html b/docs/index.html index c42ed92..dbeb143 100644 --- a/docs/index.html +++ b/docs/index.html @@ -73,7 +73,7 @@ additionally, if you ever need to change or reset your notion build, the c symbolised with an arrow (4th from the right). when toggled to point up, notion will remain the top visible window even if not focused.

    to customise which characters are used for these buttons, open in the resources/preload.js file, -find the relevant button icon (lines 80 - 111) and replace it with your chosen unicode character (e.g. +find the relevant button icon (lines 69 - 82) and replace it with your chosen unicode character (e.g. replacing return '⨉'; with return '🙄';).

    @@ -83,7 +83,7 @@ replacing return '⨉'; with return '🙄';

    i mean, yeah. get rid of those ugly default scrollbars and use nice inconspicuous ones that actually look as if they're part of notion.

    -

    to add these to the web version, copy lines 44 - 75 from user.css into your css customiser.

    +

    to add these to the web version, copy lines 74 - 105 from user.css into your css customiser.

    image: before enhancement

    diff --git a/resources/preload.js b/resources/preload.js index b61245e..2ccf629 100644 --- a/resources/preload.js +++ b/resources/preload.js @@ -44,31 +44,27 @@ require('electron').remote.getGlobal('setTimeout')(() => { const appwindow = require('electron').remote.getCurrentWindow(); - /* window control buttons */ - const buttons = document.createElement('div'), + /* titlebar */ + const buttons = document.createElement('span'), dragarea = document.createElement('div'); dragarea.className = 'window-dragarea'; - document - .querySelector('.notion-topbar') - .parentElement.appendChild(dragarea); - buttons.className = 'window-topbar-container'; + document.querySelector('.notion-topbar').prepend(dragarea); + buttons.className = 'window-buttons-area'; buttons.innerHTML = ` -

    - - - - -
    - `; - document.querySelector('.notion-topbar').parentElement.appendChild(buttons); + + + + + `; document - .querySelector('.window-topbar-container') - .appendChild(document.querySelector('.notion-topbar')); + .querySelector('.notion-topbar > div[style*="display: flex"]') + .appendChild(buttons); document - .querySelector('.window-topbar-container') - .appendChild( - document.querySelector('.notion-history-back-button').parentElement - ); + .querySelector('.notion-history-back-button') + .parentElement.nextSibling.classList.add('notion-topbar-breadcrumb'); + document + .querySelector('.notion-topbar-share-menu') + .parentElement.classList.add('notion-topbar-actions'); const button_icons = { alwaysontop() { @@ -131,7 +127,7 @@ require('electron').remote.getGlobal('setTimeout')(() => { button_elements.close.innerHTML = button_icons.close(); button_elements.close.onclick = button_actions.close; - /* reload window */ + /* hotkey: reload window */ document.defaultView.addEventListener( 'keyup', (ev) => void (ev.code === 'F5' ? appwindow.reload() : 0), diff --git a/resources/user.css b/resources/user.css index 6baed09..4b6b028 100644 --- a/resources/user.css +++ b/resources/user.css @@ -5,7 +5,10 @@ * (https://dragonwocky.me/) under the MIT license */ -/* window control buttons */ +/* titlebar */ +.notion-topbar { + height: 55px !important; +} .window-dragarea { height: 10px; width: 100%; @@ -16,42 +19,33 @@ .notion-dark-theme .window-dragarea { background: #272d2f; } -.window-topbar-container { - display: flex; - flex-direction: row-reverse; - user-select: none; - -webkit-app-region: drag; -} -.window-topbar-container > :last-child, .window-buttons-area { display: flex; align-items: center; - height: 45px; -} -.window-topbar-container > :last-child { - padding-left: 12px; -} -.window-buttons-area { - justify-content: flex-end; - padding-right: 12px; font-size: 14px; } @media (max-width: 760px) { - .window-topbar-container { - display: grid; - grid-template-columns: 1fr 1fr; - } - .titlebar-draggable-area { - top: 10px; - } - .window-topbar-container > :last-child { - grid-row: 1; - } .notion-topbar { - grid-column-start: span 2; + height: 95px !important; } - .notion-topbar > div { - padding-right: 12px !important; + .notion-topbar > :nth-child(2) { + display: grid !important; + height: 85px !important; + grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr; + } + .window-buttons-area { + grid-row: 1; + grid-column: 9 / span end; + justify-content: flex-end; + } + .notion-topbar-breadcrumb { + grid-row: 2; + grid-column: 1 / span 8; + } + .notion-topbar-actions { + grid-row: 2; + grid-column: 9 / span end; + justify-content: flex-end; } } /* window control buttons */