From fa15339efc8a3ba50bb30dec48eeb1061aca8354 Mon Sep 17 00:00:00 2001 From: Baptiste Grob <60621355+baptiste-grob@users.noreply.github.com> Date: Fri, 1 Jan 2021 15:08:38 +0100 Subject: [PATCH 1/6] fix: remove outline on tags input --- app/assets/stylesheets/_editor.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/assets/stylesheets/_editor.scss b/app/assets/stylesheets/_editor.scss index 24763bf01..5ae221361 100644 --- a/app/assets/stylesheets/_editor.scss +++ b/app/assets/stylesheets/_editor.scss @@ -114,6 +114,10 @@ $heading-height: 75px; color: var(--sn-stylekit-foreground-color); width: 100%; border: none; + + &:focus { + outline: 0; + } } } } From 7f99148fc49ca152669b11b2fa3a7d8d66a16821 Mon Sep 17 00:00:00 2001 From: Baptiste Grob <60621355+baptiste-grob@users.noreply.github.com> Date: Fri, 1 Jan 2021 15:13:44 +0100 Subject: [PATCH 2/6] fix: outline style --- app/assets/stylesheets/_stylekit-sub.scss | 4 ++++ app/assets/stylesheets/_tags.scss | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/app/assets/stylesheets/_stylekit-sub.scss b/app/assets/stylesheets/_stylekit-sub.scss index 8ccf6d2ed..70dc79d8f 100644 --- a/app/assets/stylesheets/_stylekit-sub.scss +++ b/app/assets/stylesheets/_stylekit-sub.scss @@ -86,3 +86,7 @@ a, .sk-a { button.sk-a { min-height: 24px; } + +*:focus { + outline: solid var(--sn-stylekit-info-color) 2px; +} diff --git a/app/assets/stylesheets/_tags.scss b/app/assets/stylesheets/_tags.scss index 8085796a4..d0669405f 100644 --- a/app/assets/stylesheets/_tags.scss +++ b/app/assets/stylesheets/_tags.scss @@ -89,6 +89,10 @@ -webkit-user-select: text !important; } + &:focus { + outline: 0; + } + pointer-events: none; } From 02ad4b8197b0b6c653493d573ef136aa4d12e843 Mon Sep 17 00:00:00 2001 From: Baptiste Grob <60621355+baptiste-grob@users.noreply.github.com> Date: Fri, 1 Jan 2021 15:51:14 +0100 Subject: [PATCH 3/6] feat: show data upgrade when available --- app/assets/javascripts/views/footer/footer-view.pug | 1 - 1 file changed, 1 deletion(-) diff --git a/app/assets/javascripts/views/footer/footer-view.pug b/app/assets/javascripts/views/footer/footer-view.pug index 2eb196935..3d994e2d2 100644 --- a/app/assets/javascripts/views/footer/footer-view.pug +++ b/app/assets/javascripts/views/footer/footer-view.pug @@ -47,7 +47,6 @@ .right .sk-app-bar-item( ng-click='ctrl.openSecurityUpdate()', - ng-if='false' ) span.success.sk-label Encryption upgrade available. .sk-app-bar-item( From 70a6ff1f4b3e0b6e6c8699b17703068655738b0e Mon Sep 17 00:00:00 2001 From: Baptiste Grob <60621355+baptiste-grob@users.noreply.github.com> Date: Mon, 4 Jan 2021 12:40:48 +0100 Subject: [PATCH 4/6] chore(deps): upgrade snjs --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index f7806e0e1..3f9d60102 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "@reach/alert-dialog": "^0.12.1", "@reach/dialog": "^0.12.1", "@standardnotes/sncrypto-web": "^1.2.9", - "@standardnotes/snjs": "^2.0.30", + "@standardnotes/snjs": "^2.0.32", "babel-loader": "^8.2.2", "mobx": "^6.0.4", "preact": "^10.5.7" diff --git a/yarn.lock b/yarn.lock index e0fe028fb..6046c273c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1045,10 +1045,10 @@ "@standardnotes/sncrypto-common" "^1.2.7" libsodium-wrappers "^0.7.8" -"@standardnotes/snjs@^2.0.30": - version "2.0.30" - resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.0.30.tgz#767be04c0a40850f759b58be7615fbfaa7af9a50" - integrity sha512-60vMyyKED7WUgQcQRzYfCA7LjiJbzpnheQkdfELKdNW3bb5LoihdDPnai8hmDSY5ul4IkcD7dtkdQPBIEvFXSw== +"@standardnotes/snjs@^2.0.32": + version "2.0.32" + resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.0.32.tgz#7742e3cb08ee560b5b7cf06e526ebc19ff2a81ba" + integrity sha512-SnbOqGwx5H59HjFSzBKT/1Wh2zAAcx+QSQeYDyKjZKNYN0g8JvirzL0FpoLTxa15BRTl2mG073eIyFsEtx8LFA== dependencies: "@standardnotes/sncrypto-common" "^1.2.9" From 491c9c01e2b835d7a46d2eff8d2ccb6cab1f5fa8 Mon Sep 17 00:00:00 2001 From: Baptiste Grob <60621355+baptiste-grob@users.noreply.github.com> Date: Mon, 4 Jan 2021 13:02:05 +0100 Subject: [PATCH 5/6] fix: hide data upgrade when not applicable --- app/assets/javascripts/views/footer/footer-view.pug | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/views/footer/footer-view.pug b/app/assets/javascripts/views/footer/footer-view.pug index 3d994e2d2..0630cbdb3 100644 --- a/app/assets/javascripts/views/footer/footer-view.pug +++ b/app/assets/javascripts/views/footer/footer-view.pug @@ -46,7 +46,8 @@ span.neutral.sk-label {{ctrl.arbitraryStatusMessage}} .right .sk-app-bar-item( - ng-click='ctrl.openSecurityUpdate()', + ng-click='ctrl.openSecurityUpdate()' + ng-if='ctrl.state.dataUpgradeAvailable' ) span.success.sk-label Encryption upgrade available. .sk-app-bar-item( From fec84b7269da86f7da8a4c513d334b079bb2dc2b Mon Sep 17 00:00:00 2001 From: Baptiste Grob <60621355+baptiste-grob@users.noreply.github.com> Date: Mon, 4 Jan 2021 14:46:49 +0100 Subject: [PATCH 6/6] chore(version): 3.5.14 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3f9d60102..6584bf7b5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "standard-notes-web", - "version": "3.5.13", + "version": "3.5.14", "license": "AGPL-3.0-or-later", "repository": { "type": "git",