From 240ad3857c399ab1633947d914ddccbf53109798 Mon Sep 17 00:00:00 2001
From: Mattermost Build <build@mattermost.com>
Date: Thu, 18 Jun 2020 03:20:47 +0200
Subject: [PATCH] Automated cherry pick of #4354 (#4437)

* Remove border to login option buttons

* Remove email login option color for O365

Co-authored-by: Elias Nahum <nahumhbl@gmail.com>
---
 app/screens/login_options/login_options.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/screens/login_options/login_options.js b/app/screens/login_options/login_options.js
index 13428c314..d4fccd769 100644
--- a/app/screens/login_options/login_options.js
+++ b/app/screens/login_options/login_options.js
@@ -109,6 +109,8 @@ export default class LoginOptions extends PureComponent {
             const backgroundColor = config.LDAPLoginButtonColor || '#2389d7';
             const additionalStyle = {
                 backgroundColor,
+                borderColor: 'transparent',
+                borderWidth: 0,
             };
 
             if (config.LDAPLoginButtonBorderColor) {
@@ -158,7 +160,7 @@ export default class LoginOptions extends PureComponent {
                 <Button
                     key='gitlab'
                     onPress={preventDoubleTap(() => this.goToSSO(ViewTypes.GITLAB))}
-                    containerStyle={[GlobalStyles.signupButton, {backgroundColor: '#548'}]}
+                    containerStyle={[GlobalStyles.signupButton, {backgroundColor: '#548', borderColor: 'transparent', borderWidth: 0}]}
                 >
                     <Image
                         source={gitlab}
@@ -182,16 +184,14 @@ export default class LoginOptions extends PureComponent {
         const o365Enabled = config.EnableSignUpWithOffice365 === 'true' && license.IsLicensed === 'true' && license.Office365OAuth === 'true';
 
         if (!forceHideFromLocal && o365Enabled) {
-            const backgroundColor = config.EmailLoginButtonColor || '#2389d7';
+            const backgroundColor = '#2389d7';
             const additionalStyle = {
                 backgroundColor,
+                borderColor: 'transparent',
+                borderWidth: 0,
             };
 
-            if (config.EmailLoginButtonBorderColor) {
-                additionalStyle.borderColor = config.EmailLoginButtonBorderColor;
-            }
-
-            const textColor = config.EmailLoginButtonTextColor || 'white';
+            const textColor = 'white';
 
             return (
                 <Button
@@ -220,6 +220,8 @@ export default class LoginOptions extends PureComponent {
 
             const additionalStyle = {
                 backgroundColor,
+                borderColor: 'transparent',
+                borderWidth: 0,
             };
 
             if (config.SamlLoginButtonBorderColor) {