summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authoranderklander <anderklander@gmail.com>2018-02-06 13:13:35 +0100
committeranderklander <anderklander@gmail.com>2018-02-15 15:58:38 +0100
commit51efc53a054fba6e77980088ce3be06323d67b2b (patch)
tree65a309e903e0574417f5a942bcc4e3aa1e1d3920
parent6efe0f6a44512c2a1ac51109ea498f1df7960ee5 (diff)
downloadmullvadvpn-51efc53a054fba6e77980088ce3be06323d67b2b.tar.xz
mullvadvpn-51efc53a054fba6e77980088ce3be06323d67b2b.zip
Style cleaning
-rw-r--r--app/components/Settings.js3
-rw-r--r--app/components/SettingsStyles.js23
2 files changed, 1 insertions, 25 deletions
diff --git a/app/components/Settings.js b/app/components/Settings.js
index 7d27371ad4..8e7e8717bb 100644
--- a/app/components/Settings.js
+++ b/app/components/Settings.js
@@ -81,7 +81,7 @@ export default class Settings extends Component {
return <View>
<View style={styles.settings_account} testName='settings__account'>
- {isOutOfTime ? (
+ {!isOutOfTime ? (
<CellButton onPress={ this.props.onViewAccount }
text='Account'
testName='settings__account_paid_until_label'
@@ -95,7 +95,6 @@ export default class Settings extends Component {
text='Account'
testName='settings__account_paid_until_label'
subtext={ formattedExpiry }
- subtextStyle={ styles.settings__account_paid_until_label }
icon='icon-chevron'
iconStyle={styles.settings__icon_chevron}
tintColor='currentColor'/>
diff --git a/app/components/SettingsStyles.js b/app/components/SettingsStyles.js
index 734d73ad90..5585b7b273 100644
--- a/app/components/SettingsStyles.js
+++ b/app/components/SettingsStyles.js
@@ -77,16 +77,6 @@ export default Object.assign(createViewStyles({
lineHeight: 40,
color: '#FFFFFF'
},
- settings__cell_label:{
- fontFamily: 'DINPro',
- fontSize: 20,
- fontWeight: '900',
- lineHeight: 26,
- color: '#FFFFFF',
- flexGrow: 1,
- flexShrink: 0,
- flexBasis: 'auto',
- },
settings__footer_button_label:{
fontFamily: 'DINPro',
fontSize: 20,
@@ -94,20 +84,7 @@ export default Object.assign(createViewStyles({
lineHeight: 26,
color: 'rgba(255,255,255,0.8)'
},
- settings__cell_subtext:{
- fontFamily: 'Open Sans',
- fontSize: 13,
- fontWeight: '800',
- color: 'rgba(255, 255, 255, 0.8)',
- flexGrow: 0,
- textAlign: 'right',
- },
settings__account_paid_until_label__error:{
- fontFamily: 'Open Sans',
- fontSize: 13,
- fontWeight: '800',
- flexGrow: 0,
- textAlign: 'right',
color: '#d0021b',
},
}));