summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2018-10-03 12:39:46 +0200
committerLinus Färnstrand <linus@mullvad.net>2018-10-03 12:39:46 +0200
commite61f0cf6fb0f29bda264d13dab44be8ff482c66a (patch)
tree9a9020c00a2f3f2425895cdaf441cf18bc79ef40
parente256ca4fa652a21236c8c16ec566335b50bc94cf (diff)
parent3a6389a63fcbf19ccf95c3e81356350f7721b7f7 (diff)
downloadmullvadvpn-e61f0cf6fb0f29bda264d13dab44be8ff482c66a.tar.xz
mullvadvpn-e61f0cf6fb0f29bda264d13dab44be8ff482c66a.zip
Merge branch 'shorten-update-download-text'
-rw-r--r--gui/packages/desktop/src/renderer/components/Cell.js3
-rw-r--r--gui/packages/desktop/src/renderer/components/Settings.js2
2 files changed, 3 insertions, 2 deletions
diff --git a/gui/packages/desktop/src/renderer/components/Cell.js b/gui/packages/desktop/src/renderer/components/Cell.js
index 0135004caf..95259568eb 100644
--- a/gui/packages/desktop/src/renderer/components/Cell.js
+++ b/gui/packages/desktop/src/renderer/components/Cell.js
@@ -74,8 +74,9 @@ const styles = {
fontFamily: 'Open Sans',
fontSize: 13,
fontWeight: '800',
- flex: 0,
+ flex: -1,
textAlign: 'right',
+ marginLeft: 8,
}),
};
diff --git a/gui/packages/desktop/src/renderer/components/Settings.js b/gui/packages/desktop/src/renderer/components/Settings.js
index 846d7b8519..8edeb25192 100644
--- a/gui/packages/desktop/src/renderer/components/Settings.js
+++ b/gui/packages/desktop/src/renderer/components/Settings.js
@@ -126,7 +126,7 @@ export default class Settings extends Component<Props> {
if (!this.props.consistentVersion || !this.props.upToDateVersion) {
const message = !this.props.consistentVersion
? 'Inconsistent internal version information, please restart the app.'
- : 'This is not the latest version, download the update to remain safe.';
+ : 'Update available, download to remain safe.';
icon = (
<Img source="icon-alert" tintColor={colors.red} style={styles.settings__version_warning} />