diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2018-10-01 12:56:10 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2018-10-01 17:20:04 -0300 |
| commit | 4479fedb51985fb7f848328f22ee8c8c5f7c479f (patch) | |
| tree | 810b4494ea91a915129cec34cd297d07726723a7 | |
| parent | 3c279027f0615b17b3b7f0d9a4c61f5e5e55459c (diff) | |
| download | mullvadvpn-4479fedb51985fb7f848328f22ee8c8c5f7c479f.tar.xz mullvadvpn-4479fedb51985fb7f848328f22ee8c8c5f7c479f.zip | |
Restore usage of `Cell.Label` in `Login`
| -rw-r--r-- | gui/packages/desktop/src/renderer/components/Login.js | 9 | ||||
| -rw-r--r-- | gui/packages/desktop/src/renderer/components/LoginStyles.js | 14 |
2 files changed, 10 insertions, 13 deletions
diff --git a/gui/packages/desktop/src/renderer/components/Login.js b/gui/packages/desktop/src/renderer/components/Login.js index dfbac93ea1..2cedb93f51 100644 --- a/gui/packages/desktop/src/renderer/components/Login.js +++ b/gui/packages/desktop/src/renderer/components/Login.js @@ -447,12 +447,13 @@ class AccountDropdownItem extends React.Component<AccountDropdownItemProps> { <Cell.CellButton style={styles.account_dropdown__item} cellHoverStyle={styles.account_dropdown__item_hover}> - <Text - style={styles.account_dropdown__label} - cellHoverStyle={styles.account_dropdown__label_hover} + <Cell.Label + textStyle={styles.account_dropdown__label} + containerStyle={styles.account_dropdown__label_container} + cellHoverTextStyle={styles.account_dropdown__label_hover} onPress={() => this.props.onSelect(this.props.value)}> {this.props.label} - </Text> + </Cell.Label> <Img style={styles.account_dropdown__remove} cellHoverStyle={styles.account_dropdown__remove_cell_hover} diff --git a/gui/packages/desktop/src/renderer/components/LoginStyles.js b/gui/packages/desktop/src/renderer/components/LoginStyles.js index 55db4ebd13..79b5c89e62 100644 --- a/gui/packages/desktop/src/renderer/components/LoginStyles.js +++ b/gui/packages/desktop/src/renderer/components/LoginStyles.js @@ -113,6 +113,11 @@ export default { account_dropdown__label_hover: Styles.createViewStyle({ color: colors.blue, }), + account_dropdown__label_container: Styles.createViewStyle({ + marginLeft: 12, + marginTop: 11, + marginBottom: 11, + }), login_footer__prompt: Styles.createTextStyle({ color: colors.white80, @@ -157,19 +162,10 @@ export default { flex: 1, }), account_dropdown__label: Styles.createTextStyle({ - flex: 1, - fontFamily: 'DINPro', - fontSize: 20, - fontWeight: '900', - lineHeight: 26, color: colors.blue80, borderWidth: 0, textAlign: 'left', marginLeft: 0, - paddingTop: 10, - paddingRight: 0, - paddingLeft: 12, - paddingBottom: 12, cursor: 'default', }), }; |
