From 1ba09999155ae1327c56fa2a841ee5e429c5f4aa Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 2 Feb 2021 17:19:18 +0000
Subject: [PATCH 1/3] Update SSO Facebook social branding to match guidelines
---
res/css/views/elements/_SSOButtons.scss | 5 -----
res/img/element-icons/brands/facebook.svg | 9 +++++++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/res/css/views/elements/_SSOButtons.scss b/res/css/views/elements/_SSOButtons.scss
index add048efb0..e223a0a70f 100644
--- a/res/css/views/elements/_SSOButtons.scss
+++ b/res/css/views/elements/_SSOButtons.scss
@@ -73,11 +73,6 @@ limitations under the License.
}
}
-.mx_SSOButton.mx_SSOButton_brand_facebook {
- background-color: #3c5a99;
- border-color: #3c5a99;
- color: #ffffff;
-}
.mx_SSOButton.mx_SSOButton_brand_twitter {
background-color: #47acdf;
border-color: #47acdf;
diff --git a/res/img/element-icons/brands/facebook.svg b/res/img/element-icons/brands/facebook.svg
index 087ddacdff..2742785424 100644
--- a/res/img/element-icons/brands/facebook.svg
+++ b/res/img/element-icons/brands/facebook.svg
@@ -1,4 +1,9 @@
From 3e3a88116d61f40550a36e5cf319cdf6a90997d2 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 2 Feb 2021 17:28:52 +0000
Subject: [PATCH 2/3] Fix register exploding if the server is down or we just
don't have flows
---
src/components/structures/auth/Login.tsx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/components/structures/auth/Login.tsx b/src/components/structures/auth/Login.tsx
index 606aeb44ab..a217f1b4d9 100644
--- a/src/components/structures/auth/Login.tsx
+++ b/src/components/structures/auth/Login.tsx
@@ -340,8 +340,8 @@ export default class LoginComponent extends React.PureComponent
};
onTryRegisterClick = ev => {
- const hasPasswordFlow = this.state.flows.find(flow => flow.type === "m.login.password");
- const ssoFlow = this.state.flows.find(flow => flow.type === "m.login.sso" || flow.type === "m.login.cas");
+ const hasPasswordFlow = this.state.flows?.find(flow => flow.type === "m.login.password");
+ const ssoFlow = this.state.flows?.find(flow => flow.type === "m.login.sso" || flow.type === "m.login.cas");
// If has no password flow but an SSO flow guess that the user wants to register with SSO.
// TODO: instead hide the Register button if registration is disabled by checking with the server,
// has no specific errCode currently and uses M_FORBIDDEN.
From 0e94d08d9a0be06da45c93db8f941b304c841386 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 2 Feb 2021 17:29:19 +0000
Subject: [PATCH 3/3] Update SSO Twitter social branding to match guidelines
---
res/css/views/elements/_SSOButtons.scss | 6 ------
res/img/element-icons/brands/twitter.svg | 2 +-
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/res/css/views/elements/_SSOButtons.scss b/res/css/views/elements/_SSOButtons.scss
index e223a0a70f..e02816780f 100644
--- a/res/css/views/elements/_SSOButtons.scss
+++ b/res/css/views/elements/_SSOButtons.scss
@@ -72,9 +72,3 @@ limitations under the License.
}
}
}
-
-.mx_SSOButton.mx_SSOButton_brand_twitter {
- background-color: #47acdf;
- border-color: #47acdf;
- color: #ffffff;
-}
diff --git a/res/img/element-icons/brands/twitter.svg b/res/img/element-icons/brands/twitter.svg
index 4fc3d2f2a2..43eb825a59 100644
--- a/res/img/element-icons/brands/twitter.svg
+++ b/res/img/element-icons/brands/twitter.svg
@@ -1,3 +1,3 @@