diff options
| author | anderklander <anderklander@gmail.com> | 2018-04-11 11:04:29 +0200 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2018-04-16 12:01:12 +0200 |
| commit | 84280854f7dde02e917635d22d874b6e57bf1676 (patch) | |
| tree | 5a0832a45d6c44bd0d8de431720ccbc3b1185cbe | |
| parent | f400e025eedc9323fe8c14f8c813c45bdaedc85b (diff) | |
| download | mullvadvpn-84280854f7dde02e917635d22d874b6e57bf1676.tar.xz mullvadvpn-84280854f7dde02e917635d22d874b6e57bf1676.zip | |
Rename Login styles to remove warning
| -rw-r--r-- | app/components/Login.js | 10 | ||||
| -rw-r--r-- | app/components/LoginStyles.js | 19 |
2 files changed, 20 insertions, 9 deletions
diff --git a/app/components/Login.js b/app/components/Login.js index c59db65b1a..fb2930e35f 100644 --- a/app/components/Login.js +++ b/app/components/Login.js @@ -215,10 +215,10 @@ export default class Login extends Component<LoginPropTypes, State> { _accountInputButtonStyles(): Array<Object> { const { status } = this.props.account; - const classes = [styles.account_input_button]; + const classes = [styles.input_button]; if(status === 'logging in') { - classes.push(styles.account_input_button__invisible); + classes.push(styles.input_button__invisible); } classes.push(this.state.loginButtonAnimationStyle); @@ -228,14 +228,14 @@ export default class Login extends Component<LoginPropTypes, State> { _accountInputArrowStyles(): Array<Object> { const { accountToken, status } = this.props.account; - const classes = [styles.account_input_button]; + const classes = [styles.input_arrow]; if(accountToken && accountToken.length > 0) { - classes.push(styles.account_input_button__active); + classes.push(styles.input_arrow__active); } if(status === 'logging in') { - classes.push(styles.account_input_button__invisible); + classes.push(styles.input_arrow__invisible); } return classes; diff --git a/app/components/LoginStyles.js b/app/components/LoginStyles.js index 47d7467f7d..21c3aa4429 100644 --- a/app/components/LoginStyles.js +++ b/app/components/LoginStyles.js @@ -55,7 +55,18 @@ export default { account_input_textfield__inactive: { backgroundColor: colors.white60, }, - account_input_button: { + input_button: { + flex: 0, + borderWidth: 0, + width: 48, + alignItems: 'center', + justifyContent: 'center', + }, + input_button__invisible: { + backgroundColor: colors.white, + opacity: 0, + }, + input_arrow: { flex: 0, borderWidth: 0, width: 48, @@ -63,14 +74,14 @@ export default { justifyContent: 'center', color: colors.blue20, }, - account_input_button__active: { + input_arrow__active: { color: colors.white, }, - account_input_button__invisible: { + input_arrow__invisible: { color: colors.white, - backgroundColor: colors.white, opacity: 0, }, + account_dropdown__spacer: { height: 1, backgroundColor: colors.darkBlue, |