toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Automated cherry pick of #4354 (#4437)

Browse source 
* Remove border to login option buttons

* Remove email login option color for O365

Co-authored-by: Elias Nahum <nahumhbl@gmail.com>
This commit is contained in:
Mattermost Build 2020-06-18 03:20:47 +02:00 committed by GitHub
parent 5c54186c8d
commit 240ad3857c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/screens/login_options/login_options.js
View file

@ -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) {