summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authoranderklander <anderklander@gmail.com>2017-11-14 19:00:02 +0100
committerErik Larkö <erik@mullvad.net>2017-12-14 09:16:50 +0100
commit7f2938805fc0d10599381dfa9775ec3831af0a1e (patch)
treedbbe7677ad4ec5192365035c069f4206bf1dc631
parented657f7892eb9263e15a0cf2ffb0caa60b32491c (diff)
downloadmullvadvpn-7f2938805fc0d10599381dfa9775ec3831af0a1e.tar.xz
mullvadvpn-7f2938805fc0d10599381dfa9775ec3831af0a1e.zip
cosmetics
-rw-r--r--app/components/HeaderBar.js2
-rw-r--r--app/components/HeaderBarStyles.js90
-rw-r--r--app/components/Img.android.js2
-rw-r--r--app/components/Img.js2
4 files changed, 56 insertions, 40 deletions
diff --git a/app/components/HeaderBar.js b/app/components/HeaderBar.js
index 0960954d58..ad0a3ba323 100644
--- a/app/components/HeaderBar.js
+++ b/app/components/HeaderBar.js
@@ -49,7 +49,7 @@ export default class HeaderBar extends Component {
</View>
: null}
- {!!this.props.showSettings ?
+ {this.props.showSettings ?
<View style={styles.headerbar__settings}>
<Button onPress={ this.props.onSettings }>
<Img style={ styles.headerbar__settings } source='icon-settings'/>
diff --git a/app/components/HeaderBarStyles.js b/app/components/HeaderBarStyles.js
index 6823d48de6..cb803e4308 100644
--- a/app/components/HeaderBarStyles.js
+++ b/app/components/HeaderBarStyles.js
@@ -2,46 +2,62 @@
import { Styles } from 'reactxp';
const styles = {
- headerbar:Styles.createViewStyle({
- padding: 12,
- backgroundColor: '#294D73',
- flexDirection: 'row',
- justifyContent: 'space-between',
- alignItems: 'center',
-}),headerbar__hidden: Styles.createViewStyle({
- paddingTop: 0,
- paddingBottom: 0,
- paddingLeft: 0,
- paddingRight: 0,
-}),headerbar__style_defaultDark: Styles.createViewStyle({
- backgroundColor: '#192E45',
-}),headerbar__style_error: Styles.createViewStyle({
- backgroundColor: '#D0021B',
-}),headerbar__style_success: Styles.createViewStyle({
- backgroundColor: '#44AD4D',
-}),headerbar__container: Styles.createViewStyle({
- display: 'flex',
- flexDirection: 'row',
- alignItems: 'center',
-}),headerbar__title: Styles.createTextStyle({
- fontFamily: 'DINPro',
- fontSize: 24,
- fontWeight: '900',
- lineHeight: 30,
- letterSpacing: -0.5,
- color: 'rgba(255,255,255,0.6)',
- marginLeft: 8,
-}),headerbar__logo: Styles.createViewStyle({
- height: 50,
- width: 50,
-}),headerbar__settings: Styles.createViewStyle({
- width: 24,
- height: 24,
- backgroundColor: 'transparent',
+ headerbar:
+ Styles.createViewStyle({
+ padding: 12,
+ backgroundColor: '#294D73',
+ flexDirection: 'row',
+ justifyContent: 'space-between',
+ alignItems: 'center',
+ }),
+ headerbar__hidden:
+ Styles.createViewStyle({
+ paddingTop: 0,
+ paddingBottom: 0,
+ paddingLeft: 0,
+ paddingRight: 0,
+ }),
+ headerbar__style_defaultDark:
+ Styles.createViewStyle({
+ backgroundColor: '#192E45',
+ }),
+ headerbar__style_error:
+ Styles.createViewStyle({
+ backgroundColor: '#D0021B',
+ }),
+ headerbar__style_success:
+ Styles.createViewStyle({
+ backgroundColor: '#44AD4D',
+ }),
+ headerbar__container:
+ Styles.createViewStyle({
+ display: 'flex',
+ flexDirection: 'row',
+ alignItems: 'center',
+ }),
+ headerbar__title:
+ Styles.createTextStyle({
+ fontFamily: 'DINPro',
+ fontSize: 24,
+ fontWeight: '900',
+ lineHeight: 30,
+ letterSpacing: -0.5,
+ color: 'rgba(255,255,255,0.6)',
+ marginLeft: 8,
+ }),
+ headerbar__logo:
+ Styles.createViewStyle({
+ height: 50,
+ width: 50,
+ }),
+ headerbar__settings:
+ Styles.createViewStyle({
+ width: 24,
+ height: 24,
+ backgroundColor: 'transparent',
marginLeft: -6, //Because of button.css, when removed remove this
marginTop: -1, //Because of button.css, when removed remove this
})
};
-
module.exports = styles; \ No newline at end of file
diff --git a/app/components/Img.android.js b/app/components/Img.android.js
index 012aa01419..d468ba037d 100644
--- a/app/components/Img.android.js
+++ b/app/components/Img.android.js
@@ -3,7 +3,7 @@ import React from 'react';
import { Image, Component } from 'reactxp';
export default class Img extends Component {
- render(): React.Element<*> {
+ render(){
return (<Image style={ this.props.style } source={ this.props.source }/>);
}
} \ No newline at end of file
diff --git a/app/components/Img.js b/app/components/Img.js
index f4b000957f..280d072a29 100644
--- a/app/components/Img.js
+++ b/app/components/Img.js
@@ -3,7 +3,7 @@ import React from 'react';
import { View, Component } from 'reactxp';
export default class Img extends Component {
- render(): React.Element<*> {
+ render(){
const url = "./assets/images/" + this.props.source + ".svg";