From 8f1612e43cd6d4eb5603c62d1033cb137cb4a923 Mon Sep 17 00:00:00 2001 From: dragonwocky Date: Wed, 30 Sep 2020 14:25:59 +1000 Subject: [PATCH] #126 board view shadow, remove messenger emoji set, bugfix EACCES response --- CHANGELOG.md | 7 +++++++ mods/core/css/theme.css | 11 ++++++++--- mods/emoji-sets/mod.js | 21 ++++++++++----------- mods/emoji-sets/styles.css | 5 ----- pkg/apply.js | 10 +++++++--- pkg/remove.js | 10 +++++++--- 6 files changed, 39 insertions(+), 25 deletions(-) delete mode 100644 mods/emoji-sets/styles.css diff --git a/CHANGELOG.md b/CHANGELOG.md index 49a8d6d..d59057e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,13 @@ - [advanced math editor](https://github.com/Manueloccorso/NotionMathEditor_BrowserExtension) - re-orderable extensions +### v0.?.? (wip) + +- bugfix: removed messenger emoji set as the provider no longer supports it. +- bugfix: remove shadow around light mode board headers + \+ minor text colour fixes for night shift theming. +- bugfix: properly detect/respond to `EACCES` errors. + ### v0.9.1 (2020-09-26) - bugfix: font chooser will continue iterating through fonts after encountering a blank option. diff --git a/mods/core/css/theme.css b/mods/core/css/theme.css index 052c6c0..4cfc448 100644 --- a/mods/core/css/theme.css +++ b/mods/core/css/theme.css @@ -203,7 +203,9 @@ .notion-body.dark [style*='box-shadow: rgba(15, 15, 15, 0.2) 0px 0px 0px 1px, rgba(15, 15, 15, 0.2) 0px 2px 4px'], -.notion-body:not(.dark) [style*='box-shadow: white -3px 0px 0px'] { +.notion-body:not(.dark) + .notion-dark-theme + [style*='box-shadow: white -3px 0px 0px'] { box-shadow: rgba(15, 15, 15, 0.1) 0px 0px 0px 1px, rgba(15, 15, 15, 0.1) 0px 2px 4px !important; } @@ -425,8 +427,11 @@ .notion-page-content [style*='color: inherit;'], .notion-frame .notion-page-block, .notion-body.dark [style*=' color: rgba(255, 255, 255, 0.9)'], -.notion-body.dark [style*='color: rgba(255, 255, 255, 0.7)'], -.notion-body:not(.dark) [style*=' color: rgb(55, 53, 47);'] { +.notion-body.dark [style^='color: rgba(255, 255, 255, 0.9)'], +.notion-body.dark [style*=' color: rgba(255, 255, 255, 0.7)'], +.notion-body.dark [style^='color: rgba(255, 255, 255, 0.7)'], +.notion-body:not(.dark) [style*=' color: rgb(55, 53, 47);'], +.notion-body:not(.dark) [style^='color: rgb(55, 53, 47);'] { color: var(--theme--text) !important; } .notion-body.dark [style*='color: rgba(255, 255, 255, 0.6)'], diff --git a/mods/emoji-sets/mod.js b/mods/emoji-sets/mod.js index 289da8b..8ceb5b5 100644 --- a/mods/emoji-sets/mod.js +++ b/mods/emoji-sets/mod.js @@ -29,7 +29,6 @@ module.exports = { 'joypixels', 'openmoji', 'emojidex', - 'messenger', 'lg', 'htc', 'mozilla', @@ -109,6 +108,15 @@ module.exports = { el.style.display = 'none'; if (el.parentElement.getAttribute('contenteditable')) el.remove(); + } else if ( + el.previousElementSibling.matches( + 'span[role="image"][aria-label]' + ) + ) { + el.previousElementSibling.innerText = el.getAttribute( + 'alt' + ); + el.setAttribute('aria-label', el.getAttribute('alt')); } }); } else { @@ -116,11 +124,11 @@ module.exports = { el.parentElement .querySelectorAll('span[role="image"][aria-label]') .forEach((text) => text.remove()); + el.style.display = 'inline-block'; if (!el.style.background.includes(store().style)) { el.style.background = `url(https://emojicdn.elk.sh/${el.getAttribute( 'aria-label' )}?style=${store().style})`; - el.style.display = 'inline-block'; el.style.backgroundSize = 'contain'; el.style.backgroundRepeat = 'no-repeat'; el.style.opacity = 1; @@ -135,12 +143,3 @@ module.exports = { }, }, }; -// span[role="image"][aria-label] -/* */ - -//
-// 😀 -// 😀 -//
- -// ✝ diff --git a/mods/emoji-sets/styles.css b/mods/emoji-sets/styles.css deleted file mode 100644 index 600e758..0000000 --- a/mods/emoji-sets/styles.css +++ /dev/null @@ -1,5 +0,0 @@ -.notion-emoji::after { - content: attr(aria-label, ''); - width: 1em; - height: 1em; -} diff --git a/pkg/apply.js b/pkg/apply.js index 36f95ab..c49771f 100644 --- a/pkg/apply.js +++ b/pkg/apply.js @@ -112,11 +112,15 @@ module.exports = async function ({ overwrite_version, friendly_errors } = {}) { return true; } catch (err) { console.error('### ERROR ###'); - if (err.toString().includes('EACCESS') && friendly_errors) { + if (err.code === 'EACCES' && friendly_errors) { console.error( - 'file access forbidden: try again with sudo or in an elevated/admin prompt.' + `file access forbidden - ${ + process.platform === 'win32' + ? 'make sure your user has elevated permissions.' + : `try running "chown -R ${err.path}"` + }` ); - } else if (err.toString().includes('EIO') && friendly_errors) { + } else if (err.code === 'EIO' && friendly_errors) { console.error('file access failed: is notion running?'); } else console.error(err); return false; diff --git a/pkg/remove.js b/pkg/remove.js index bf28f00..16b32d1 100644 --- a/pkg/remove.js +++ b/pkg/remove.js @@ -114,11 +114,15 @@ module.exports = async function ({ return true; } catch (err) { console.error('### ERROR ###'); - if (err.toString().includes('EACCESS') && friendly_errors) { + if (err.code === 'EACCES' && friendly_errors) { console.error( - 'file access forbidden: try again with sudo or in an elevated/admin prompt.' + `file access forbidden - ${ + process.platform === 'win32' + ? 'make sure your user has elevated permissions.' + : `try running "chown -R ${err.path}"` + }` ); - } else if (err.toString().includes('EIO') && friendly_errors) { + } else if (err.code === 'EIO' && friendly_errors) { console.error('file access failed: is notion running?'); } else console.error(err); return false;