summaryrefslogtreecommitdiffhomepage
path: root/app/components/SelectLocation.js
diff options
context:
space:
mode:
authoranderklander <anderklander@gmail.com>2018-04-07 10:25:16 +0200
committeranderklander <anderklander@gmail.com>2018-04-11 13:45:42 +0200
commit5b2efbd2664209f671f30cebf22fd633a92544d1 (patch)
tree4004b87feea5fbed3987cf5a4350d02226c93ccb /app/components/SelectLocation.js
parenta8d982bc47872e5e734abd97f9e6b56ceec59557 (diff)
downloadmullvadvpn-5b2efbd2664209f671f30cebf22fd633a92544d1.tar.xz
mullvadvpn-5b2efbd2664209f671f30cebf22fd633a92544d1.zip
Corrected styles and combinded imgs
Diffstat (limited to 'app/components/SelectLocation.js')
-rw-r--r--app/components/SelectLocation.js13
1 files changed, 8 insertions, 5 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>