From ebe38eae570bdf0c4e20e69bd36d6a1523a18306 Mon Sep 17 00:00:00 2001 From: Antonella Sgarlatta Date: Sat, 19 Jun 2021 13:49:21 -0300 Subject: [PATCH 1/4] fix: fix panels that can't be expanded after collapse --- app/assets/javascripts/directives/views/panelResizer.ts | 3 ++- app/assets/stylesheets/_main.scss | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/directives/views/panelResizer.ts b/app/assets/javascripts/directives/views/panelResizer.ts index 791e3fcb9..da7a60602 100644 --- a/app/assets/javascripts/directives/views/panelResizer.ts +++ b/app/assets/javascripts/directives/views/panelResizer.ts @@ -140,7 +140,7 @@ class PanelResizerCtrl implements PanelResizerScope { return; } this.resizerColumn = this.$element[0]; - this.currentMinWidth = this.minWidth || this.resizerColumn.offsetWidth; + this.currentMinWidth = this.minWidth || (this.resizerColumn.offsetWidth + 2); this.pressed = false; this.startWidth = this.panel.scrollWidth; this.lastDownX = 0; @@ -194,6 +194,7 @@ class PanelResizerCtrl implements PanelResizerScope { this.setWidth(this.widthBeforeLastDblClick || this.defaultWidth); } else { this.widthBeforeLastDblClick = this.lastWidth; + console.log(this.currentMinWidth); this.setWidth(this.currentMinWidth); } this.finishSettingWidth(); diff --git a/app/assets/stylesheets/_main.scss b/app/assets/stylesheets/_main.scss index 6ab0cf0bb..a173d667c 100644 --- a/app/assets/stylesheets/_main.scss +++ b/app/assets/stylesheets/_main.scss @@ -136,7 +136,7 @@ $footer-height: 32px; top: 0; right: 0; z-index: $z-index-panel-resizer; - width: 2px; + width: 4px; height: 100%; position: absolute; cursor: col-resize; From 436a4c4bbbe6c80b9b441b31700561bca481ebf7 Mon Sep 17 00:00:00 2001 From: Antonella Sgarlatta Date: Sat, 19 Jun 2021 13:49:55 -0300 Subject: [PATCH 2/4] chore(version): 3.8.6 --- package.json | 4 ++-- yarn.lock | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 88dd40bfa..4609881f5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "standard-notes-web", - "version": "3.8.5", + "version": "3.8.6", "license": "AGPL-3.0-or-later", "repository": { "type": "git", @@ -71,7 +71,7 @@ "@reach/checkbox": "^0.13.2", "@reach/dialog": "^0.13.0", "@standardnotes/sncrypto-web": "1.2.10", - "@standardnotes/snjs": "2.7.3", + "@standardnotes/snjs": "file:../snjs/packages/snjs", "mobx": "^6.1.6", "mobx-react-lite": "^3.2.0", "preact": "^10.5.12" diff --git a/yarn.lock b/yarn.lock index 95a454fb4..3d33cf431 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1936,10 +1936,8 @@ "@standardnotes/sncrypto-common" "^1.2.7" libsodium-wrappers "^0.7.8" -"@standardnotes/snjs@2.7.3": +"@standardnotes/snjs@file:../snjs/packages/snjs": version "2.7.3" - resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.7.3.tgz#3b8d4bbcb0d841e02726193c4540d1b11d772249" - integrity sha512-YzD9/lxUS4nn922gR03/UHL9shqsyqikx+4Ud9v4IqtGEwKpusny4ecKPtvdbot/nedqEKpMZzrqT7xeNiRKqQ== dependencies: "@standardnotes/auth" "^2.0.0" "@standardnotes/sncrypto-common" "^1.2.9" From b587986a918e2ec01ee20d3305e6545eaacbc8bf Mon Sep 17 00:00:00 2001 From: Antonella Sgarlatta Date: Sat, 19 Jun 2021 13:51:35 -0300 Subject: [PATCH 3/4] fix: fix snjs version on package.json --- package.json | 2 +- yarn.lock | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 4609881f5..fe305149b 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "@reach/checkbox": "^0.13.2", "@reach/dialog": "^0.13.0", "@standardnotes/sncrypto-web": "1.2.10", - "@standardnotes/snjs": "file:../snjs/packages/snjs", + "@standardnotes/snjs": "2.7.3", "mobx": "^6.1.6", "mobx-react-lite": "^3.2.0", "preact": "^10.5.12" diff --git a/yarn.lock b/yarn.lock index 3d33cf431..95a454fb4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1936,8 +1936,10 @@ "@standardnotes/sncrypto-common" "^1.2.7" libsodium-wrappers "^0.7.8" -"@standardnotes/snjs@file:../snjs/packages/snjs": +"@standardnotes/snjs@2.7.3": version "2.7.3" + resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.7.3.tgz#3b8d4bbcb0d841e02726193c4540d1b11d772249" + integrity sha512-YzD9/lxUS4nn922gR03/UHL9shqsyqikx+4Ud9v4IqtGEwKpusny4ecKPtvdbot/nedqEKpMZzrqT7xeNiRKqQ== dependencies: "@standardnotes/auth" "^2.0.0" "@standardnotes/sncrypto-common" "^1.2.9" From 5e83493633e30350159874d8c5b4aab25349dc67 Mon Sep 17 00:00:00 2001 From: Antonella Sgarlatta Date: Sat, 19 Jun 2021 14:58:13 -0300 Subject: [PATCH 4/4] fix: remove log --- app/assets/javascripts/directives/views/panelResizer.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/app/assets/javascripts/directives/views/panelResizer.ts b/app/assets/javascripts/directives/views/panelResizer.ts index da7a60602..99d054ea5 100644 --- a/app/assets/javascripts/directives/views/panelResizer.ts +++ b/app/assets/javascripts/directives/views/panelResizer.ts @@ -194,7 +194,6 @@ class PanelResizerCtrl implements PanelResizerScope { this.setWidth(this.widthBeforeLastDblClick || this.defaultWidth); } else { this.widthBeforeLastDblClick = this.lastWidth; - console.log(this.currentMinWidth); this.setWidth(this.currentMinWidth); } this.finishSettingWidth();