diff options
| author | anderklander <anderklander@gmail.com> | 2018-04-07 10:25:16 +0200 |
|---|---|---|
| committer | anderklander <anderklander@gmail.com> | 2018-04-11 13:45:42 +0200 |
| commit | 5b2efbd2664209f671f30cebf22fd633a92544d1 (patch) | |
| tree | 4004b87feea5fbed3987cf5a4350d02226c93ccb /app | |
| parent | a8d982bc47872e5e734abd97f9e6b56ceec59557 (diff) | |
| download | mullvadvpn-5b2efbd2664209f671f30cebf22fd633a92544d1.tar.xz mullvadvpn-5b2efbd2664209f671f30cebf22fd633a92544d1.zip | |
Corrected styles and combinded imgs
Diffstat (limited to 'app')
| -rw-r--r-- | app/components/SelectLocation.js | 13 | ||||
| -rw-r--r-- | app/components/SelectLocationStyles.js | 7 |
2 files changed, 11 insertions, 9 deletions
diff --git a/app/components/SelectLocation.js b/app/components/SelectLocation.js index f938adbfe3..5a0b8c1101 100644 --- a/app/components/SelectLocation.js +++ b/app/components/SelectLocation.js @@ -128,8 +128,8 @@ export default class SelectLocation extends React.Component<SelectLocationProps, const statusClass = active ? styles.relay_status__active : styles.relay_status__inactive; return ( isSelected ? - <Img style={ styles.tick_icon } source='icon-tick' height='24' width='24' /> : - <View style={[ styles.relay_status, statusClass ]}></View>); + <Img style={ styles.tick_icon } source='icon-tick' height={24} width={24} /> : + <View style={[ styles.relay_status, statusClass ]}></View>); } _renderCountry(relayCountry: RelayLocationRedux) { @@ -163,9 +163,12 @@ export default class SelectLocation extends React.Component<SelectLocationProps, </Label> { relayCountry.cities.length > 1 ? - isExpanded ? - <Img style={styles.collapse_button} hoverStyle={styles.expand_chevron_hover} onPress={ handleCollapse } source='icon-chevron-up' height='24' width='24' /> : - <Img style={styles.collapse_button} hoverStyle={styles.expand_chevron_hover} onPress={ handleCollapse } source='icon-chevron-down' height='24' width='24' /> + <Img style={styles.collapse_button} + hoverStyle={styles.expand_chevron_hover} + onPress={ handleCollapse } + source={isExpanded ? 'icon-chevron-up' : 'icon-chevron-down'} + height={24} + width={24} /> : null } </CellButton> diff --git a/app/components/SelectLocationStyles.js b/app/components/SelectLocationStyles.js index 7063833be1..09f7005de8 100644 --- a/app/components/SelectLocationStyles.js +++ b/app/components/SelectLocationStyles.js @@ -55,16 +55,15 @@ export default { }, collapse_button: { flex: 0, - alignSelf: 'flex-end', - paddingTop: 14, - paddingBottom: 14, + alignSelf: 'stretch', + justifyContent: 'center', paddingRight: 16, paddingLeft: 16, }, cell: { paddingTop: 0, paddingBottom: 0, - paddingLeft: 24, + paddingLeft: 20, paddingRight: 0, }, sub_cell: { |