diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f03387..ce9607d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,9 @@ but can still easily be enabled by following instructions in the [docs](README.m - new: running from the wsl. - new: reload window with f5. - improved: code has been refactored and cleaned up, - inc. file renaming. + inc. file renaming and a `customiser.py` that doesn't require + a run of `cleaner.py` to build updates. + improved: scrollbar colours that fit better with notion's theming. - bugfix: un-break having multiple notion windows open. _(forked by [@dragonwocky](https://github.com/dragonwocky).)_ diff --git a/README.md b/README.md index c422178..74b6b71 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ 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 (read the comments) and replace its icon with your chosen unicode character (e.g. -replacing `element.innerHTML = '▢';` -> `element.innerHTML = '🙄';`). +replacing `element.innerHTML = '▢';` with `element.innerHTML = '🙄';`). ### nicer scrollbars @@ -58,13 +58,14 @@ ones that actually look as if they're part of notion. to add these to the web version, copy lines 43 - 87 from `user.css` into your css customiser. -### hotkey +### hotkeys -- **toggle all notion windows to/from the tray**: `CmdOrCtrl+Shift+A` by default. - to set your own, open `customiser.py` and change line 16 (`hotkey = 'ctrl+shift+a'`) - to your preference. you will need to run or re-run `customiser.py` afterwards. - **reload window**: in addition to the built-in `CmdOrCtrl+R` reload, you can now reload a window with `F5`. +- **toggle all notion windows to/from the tray**: `CmdOrCtrl+Shift+A` by default. + + to set your own toggle hotkey, open `customiser.py` and change line 16 (`hotkey = 'CmdOrCtrl+Shift+A'`) + to your preference. you will need to run or re-run `customiser.py` afterwards. ### tray @@ -73,7 +74,8 @@ to add these to the web version, copy lines 43 - 87 from `user.css` into your cs - **run on startup**: run notion on boot/startup. (default: true) - **hide on open**: hide the launch of notion to the tray. (default: false) - **open maximised**: maximise the app on open. (default: false) -- **close to tray**: app will close to the tray when the `⨉` button is pressed rather than closing outright. (default: false) +- **close to tray**: close window to tray rather than closing outright + on click of `⨉`. does not apply if multiple notion windows are open. (default: false) ## styling diff --git a/customiser.py b/customiser.py index 2826e2e..de7a030 100644 --- a/customiser.py +++ b/customiser.py @@ -12,7 +12,6 @@ import subprocess from shutil import copyfile from time import sleep - # for toggling notion visibility hotkey = 'CmdOrCtrl+Shift+A' @@ -157,7 +156,8 @@ try: '___hotkey___', hotkey)) print( f' ...copying tray icon ./resources/notion.ico to {filepath}/app/main/') - copyfile('./resources/notion.ico', filepath + '/app/main/notion.ico') + copyfile('./resources/notion.ico', + filepath + '/app/main/notion.ico') print( f' ...copying datastore wrapper ./resources/store.js to {filepath}/app/') copyfile('./resources/store.js', filepath + '/app/store.js') diff --git a/docs.json b/docs.json index ea918d4..9c68417 100644 --- a/docs.json +++ b/docs.json @@ -8,18 +8,10 @@ "url": "https://dragonwocky.me/notion-enhancer/" }, "icon": { - "light": "resources/notion.ico" + "light": "web-logo.svg" }, "overwrite": true, - "exclude": [ - "cleaner.py", - "customiser.py", - "resources/hotkey.js", - "resources/preload.js", - "resources/store.js", - "resources/user.css", - ".gitignore" - ], + "exclude": ["cleaner.py", "customiser.py", "resources/*", ".gitignore"], "nav": [ ["index.html", "README.md"], "resources", diff --git a/docs/changelog.html b/docs/changelog.html index d59983e..13c4fa0 100644 --- a/docs/changelog.html +++ b/docs/changelog.html @@ -1,4 +1,4 @@ -changelog | notion enhancer

notion enhancer

+changelog | notion enhancer

notion enhancer

@@ -16,7 +16,9 @@ but can still easily be enabled by following instructions in the @dragonwocky.)

diff --git a/docs/index.html b/docs/index.html index c4cc928..73c5939 100644 --- a/docs/index.html +++ b/docs/index.html @@ -1,4 +1,4 @@ -notion enhancer

notion enhancer

+notion enhancer

notion enhancer

@@ -62,7 +62,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 (read the comments) and replace its icon with your chosen unicode character (e.g. -replacing element.innerHTML = '▢'; -> element.innerHTML = '🙄';).

+replacing element.innerHTML = '▢'; with element.innerHTML = '🙄';).

@@ -75,15 +75,17 @@ ones that actually look as if they're part of notion.

-

- hotkey +

+ hotkeys

    -
  • toggle all notion windows to/from the tray: CmdOrCtrl+Shift+A by default. -to set your own, open customiser.py and change line 16 (hotkey = 'ctrl+shift+a') -to your preference. you will need to run or re-run customiser.py afterwards.
    • -
  • reload window: in addition to the built-in CmdOrCtrl+R reload, -you can now reload a window with F5.
    • +

  • reload window: in addition to the built-in CmdOrCtrl+R reload, +you can now reload a window with F5.

    +
    • +

  • toggle all notion windows to/from the tray: CmdOrCtrl+Shift+A by default.

    +

    to set your own toggle hotkey, open customiser.py and change line 16 (hotkey = 'CmdOrCtrl+Shift+A') +to your preference. you will need to run or re-run customiser.py afterwards.

    +
@@ -97,7 +99,8 @@ you can now reload a window with F5.
  • run on startup: run notion on boot/startup. (default: true)
  • hide on open: hide the launch of notion to the tray. (default: false)
  • open maximised: maximise the app on open. (default: false)
    • -
  • close to tray: app will close to the tray when the ⨉ button is pressed rather than closing outright. (default: false)
    • +
  • close to tray: close window to tray rather than closing outright +on click of ⨉. does not apply if multiple notion windows are open. (default: false)

    • diff --git a/docs/resources/notion.ico b/docs/resources/notion.ico deleted file mode 100644 index b46f68c..0000000 Binary files a/docs/resources/notion.ico and /dev/null differ diff --git a/docs/web-logo.svg b/docs/web-logo.svg new file mode 100644 index 0000000..201f7bb --- /dev/null +++ b/docs/web-logo.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/resources/user.css b/resources/user.css index 770c458..a28300e 100644 --- a/resources/user.css +++ b/resources/user.css @@ -51,37 +51,24 @@ } /* scrollbar: light theme */ .notion-light-theme ::-webkit-scrollbar-corner { - background-color: #afafaf; /* for overlap */ + background-color: transparent; /* for overlap */ } .notion-light-theme ::-webkit-scrollbar-thumb { - background-color: #afafaf; -} -.notion-light-theme ::-webkit-scrollbar-track { - background-color: #e4e4e4; + border-radius: 5px; + background-color: #d9d8d6; + border: 1px solid #cacac8; } .notion-light-theme ::-webkit-scrollbar-thumb:hover { - background: #969696; + background: #cacac8; } /* scrollbar: dark theme */ .notion-dark-theme ::-webkit-scrollbar-corner { - background-color: #3d3d42; /* for overlap */ -} -.notion-dark-theme ::-webkit-scrollbar-track { - background-color: #3d3d42; + background-color: transparent; /* for overlap */ } .notion-dark-theme ::-webkit-scrollbar-thumb { border-radius: 5px; - background-color: #5d5d5d; + background-color: #505457; } .notion-dark-theme ::-webkit-scrollbar-thumb:hover { - background: #868686; -} -/* rounded borders */ -.notion-dark-theme ::-webkit-scrollbar-track:vertical, -.notion-light-theme ::-webkit-scrollbar-track:vertical { - border-radius: 5px 5px 0 0; -} -.notion-dark-theme ::-webkit-scrollbar-track:horizontal, -.notion-light-theme ::-webkit-scrollbar-track:horizontal { - border-radius: 5px 0 0 5px; + background: #696d6f; } diff --git a/web-logo.svg b/web-logo.svg new file mode 100644 index 0000000..201f7bb --- /dev/null +++ b/web-logo.svg @@ -0,0 +1,9 @@ + + + + + + + + +