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

MM-21605 Remove border to login option buttons (#4354)

Browse source 
* Remove border to login option buttons

* Remove email login option color for O365
This commit is contained in:
Elias Nahum 2020-05-28 11:58:35 -04:00 committed by GitHub
parent 0a411e820d
commit 81a4bb39ca
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

@ -106,6 +106,8 @@ export default class LoginOptions extends PureComponent {
const backgroundColor = config.LDAPLoginButtonColor || '#2389d7';
const additionalStyle = {
backgroundColor,
borderColor: 'transparent',
borderWidth: 0,
};
if (config.LDAPLoginButtonBorderColor) {
@ -155,7 +157,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}
@ -179,16 +181,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
@ -217,6 +217,8 @@ export default class LoginOptions extends PureComponent {
const additionalStyle = {
backgroundColor,
borderColor: 'transparent',
borderWidth: 0,
};
if (config.SamlLoginButtonBorderColor) {