From a29487625eef9adaba8ca2653a8a82cc81f47ad1 Mon Sep 17 00:00:00 2001 From: Andrew Ferrazzutti Date: Thu, 9 Sep 2021 02:11:47 -0400 Subject: [PATCH 1/7] Set dark theme colors for auth components Fixes https://github.com/vector-im/element-web/issues/18865 Signed-off-by: Andrew Ferrazzutti --- res/themes/dark/css/_dark.scss | 3 +++ res/themes/light-custom/css/_custom.scss | 2 ++ 2 files changed, 5 insertions(+) diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss index 4a6db5dd55..f323fb8087 100644 --- a/res/themes/dark/css/_dark.scss +++ b/res/themes/dark/css/_dark.scss @@ -184,6 +184,9 @@ $visual-bell-bg-color: #800; $room-warning-bg-color: $header-panel-bg-color; +$authpage-body-bg-color: $background; +$authpage-primary-color: $text-primary-color; + $dark-panel-bg-color: $header-panel-bg-color; $panel-gradient: rgba(34, 38, 46, 0), rgba(34, 38, 46, 1); diff --git a/res/themes/light-custom/css/_custom.scss b/res/themes/light-custom/css/_custom.scss index f4685fe8fa..455798a556 100644 --- a/res/themes/light-custom/css/_custom.scss +++ b/res/themes/light-custom/css/_custom.scss @@ -82,6 +82,8 @@ $tab-label-fg-color: var(--timeline-text-color); // was #4e5054 $authpage-lang-color: var(--timeline-text-color); $roomheader-color: var(--timeline-text-color); +// was #232f32 +$authpage-primary-color: var(--timeline-text-color); // --roomlist-text-secondary-color $roomtile-preview-color: var(--roomlist-text-secondary-color); $roomlist-header-color: var(--roomlist-text-secondary-color); From 09ef07a3b06206c075eaed87aacb01b692669acc Mon Sep 17 00:00:00 2001 From: Andrew Ferrazzutti Date: Fri, 10 Sep 2021 01:21:53 -0400 Subject: [PATCH 2/7] Replace dark theme's $authpage-primary-color Use `$primary-content` instead of `$text-primary-color`. Signed-off-by: Andrew Ferrazzutti --- res/themes/dark/css/_dark.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss index f323fb8087..0bc61d438d 100644 --- a/res/themes/dark/css/_dark.scss +++ b/res/themes/dark/css/_dark.scss @@ -185,7 +185,7 @@ $visual-bell-bg-color: #800; $room-warning-bg-color: $header-panel-bg-color; $authpage-body-bg-color: $background; -$authpage-primary-color: $text-primary-color; +$authpage-primary-color: $primary-content; $dark-panel-bg-color: $header-panel-bg-color; $panel-gradient: rgba(34, 38, 46, 0), rgba(34, 38, 46, 1); From 049040b67d0ac71c679e79b384b97a31db0f62c5 Mon Sep 17 00:00:00 2001 From: Eric Eastwood Date: Sat, 11 Sep 2021 02:03:55 -0500 Subject: [PATCH 3/7] Optimize input label transition on focus Fix https://github.com/vector-im/element-web/issues/12876 --- res/css/views/elements/_Field.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/res/css/views/elements/_Field.scss b/res/css/views/elements/_Field.scss index d74c985d4c..71d37a015d 100644 --- a/res/css/views/elements/_Field.scss +++ b/res/css/views/elements/_Field.scss @@ -98,14 +98,14 @@ limitations under the License. transition: font-size 0.25s ease-out 0.1s, color 0.25s ease-out 0.1s, - top 0.25s ease-out 0.1s, + transform 0.25s ease-out 0.1s, background-color 0.25s ease-out 0.1s; color: $primary-content; background-color: transparent; font-size: $font-14px; + transform: translateY(0); position: absolute; left: 0px; - top: 0px; margin: 7px 8px; padding: 2px; pointer-events: none; // Allow clicks to fall through to the input @@ -124,10 +124,10 @@ limitations under the License. transition: font-size 0.25s ease-out 0s, color 0.25s ease-out 0s, - top 0.25s ease-out 0s, + transform 0.25s ease-out 0s, background-color 0.25s ease-out 0s; font-size: $font-10px; - top: -13px; + transform: translateY(-13px); padding: 0 2px; background-color: $field-focused-label-bg-color; pointer-events: initial; From 354d0cfba45b45b048aad1c1040644bd7977f342 Mon Sep 17 00:00:00 2001 From: Aaron Raimist Date: Sat, 11 Sep 2021 10:52:30 -0500 Subject: [PATCH 4/7] Redirect from /#/welcome to /#/home if already logged in Signed-off-by: Aaron Raimist --- src/components/structures/MatrixChat.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx index 531dc9fbe9..14a9e54259 100644 --- a/src/components/structures/MatrixChat.tsx +++ b/src/components/structures/MatrixChat.tsx @@ -143,7 +143,7 @@ export enum Views { SOFT_LOGOUT, } -const AUTH_SCREENS = ["register", "login", "forgot_password", "start_sso", "start_cas"]; +const AUTH_SCREENS = ["register", "login", "forgot_password", "start_sso", "start_cas", "welcome"]; // Actions that are redirected through the onboarding process prior to being // re-dispatched. NOTE: some actions are non-trivial and would require From bfd563e564517ee1e780fdc67f02cb8c303dd82f Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 13 Sep 2021 12:53:15 +0100 Subject: [PATCH 5/7] Changelog --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 42e186220f..3fcf11e37e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +Changes in [3.29.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.29.1) (2021-09-13) +=================================================================================================== + +## 🔒 SECURITY FIXES + * Fix a security issue with message key sharing. See https://matrix.org/blog/2021/09/13/vulnerability-disclosure-key-sharing + for details. + Changes in [3.29.0](https://github.com/vector-im/element-desktop/releases/tag/v3.29.0) (2021-08-31) =================================================================================================== From 2a2c2c19cf1d172d42c263acc765dcaba9708bca Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 13 Sep 2021 12:54:01 +0100 Subject: [PATCH 6/7] Upgrade matrix-js-sdk to 12.4.1 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 08c057b35d..d004afd99a 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "katex": "^0.12.0", "linkifyjs": "^2.1.9", "lodash": "^4.17.20", - "matrix-js-sdk": "12.4.0", + "matrix-js-sdk": "12.4.1", "matrix-widget-api": "^0.1.0-beta.15", "minimist": "^1.2.5", "opus-recorder": "^8.0.3", diff --git a/yarn.lock b/yarn.lock index 7fe5e3c143..b157a70403 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5801,10 +5801,10 @@ mathml-tag-names@^2.1.3: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== -matrix-js-sdk@12.4.0: - version "12.4.0" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-12.4.0.tgz#ff60306f9a9e39fd1ae6c7e501001f80eb779dd7" - integrity sha512-KamHmvNle4mkdErmNgVsGIL3n8/zgPe60DLVaEA2t4aSNwQLEmRS+oVpIgsO3ZrUivBvn4oc9sBqxP0OIl6kUg== +matrix-js-sdk@12.4.1: + version "12.4.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-12.4.1.tgz#966f506b4146e4fafffa5bbe80f5c53515e1bc78" + integrity sha512-C9aSGX9e4GoCm0Rli+iGBXmcnRxnwETw7MvgNcSBfPaLHOMZi/wz4YOV7HEZK8R+OXuDrDYyglncWSJkkoDpAQ== dependencies: "@babel/runtime" "^7.12.5" another-json "^0.2.0" From df20960ee88b2290ee5fc5bd5ba76faa69033601 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 13 Sep 2021 12:54:45 +0100 Subject: [PATCH 7/7] v3.29.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d004afd99a..2bba17397f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-react-sdk", - "version": "3.29.0", + "version": "3.29.1", "description": "SDK for matrix.org using React", "author": "matrix.org", "repository": {