summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorErik Larkö <erik@mullvad.net>2017-12-22 09:01:13 +0100
committerErik Larkö <erik@mullvad.net>2017-12-22 13:55:24 +0100
commit5a3f3a6624482d44416ba285b119c312eb8a5d41 (patch)
tree103471d9ad4a966fd376487a18b2718f0a103d72
parenta06f2b6dc540f2d370da2aa0c1113d73f7a40edb (diff)
downloadmullvadvpn-5a3f3a6624482d44416ba285b119c312eb8a5d41.tar.xz
mullvadvpn-5a3f3a6624482d44416ba285b119c312eb8a5d41.zip
Rebase fixes
-rw-r--r--app/components/Settings.js1
-rw-r--r--app/components/SettingsStyles.js6
2 files changed, 4 insertions, 3 deletions
diff --git a/app/components/Settings.js b/app/components/Settings.js
index 6e48bf613a..effd366ba7 100644
--- a/app/components/Settings.js
+++ b/app/components/Settings.js
@@ -67,6 +67,7 @@ export default class Settings extends Component {
<Text style={styles.settings__account_paid_until_label} testName='settings__account_paid_until_label'>{formattedExpiry}</Text>
)}
</View>
+ {/* HERE */}
<Img style={styles.settings__cell_disclosure} source='icon-chevron'/>
</View>
</Button>
diff --git a/app/components/SettingsStyles.js b/app/components/SettingsStyles.js
index bdcccd5c81..574116416d 100644
--- a/app/components/SettingsStyles.js
+++ b/app/components/SettingsStyles.js
@@ -51,7 +51,8 @@ export default Object.assign(createViewStyles({
justifyContent: 'space-between'
},
settings__cell_disclosure:{
- marginLeft: 8
+ marginLeft: 8,
+ color: rgba(255, 255, 255, 0.8),
},
settings__cell_spacer:{
height: 24,
@@ -64,8 +65,7 @@ export default Object.assign(createViewStyles({
width: 16,
height: 16,
flex: 0,
- marginRight: 8,
- opacity: 0.8
+ color: rgba(255, 255, 255, 0.8),
},
settings__account_paid_until_label__error:{
color: '#d0021b'