diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2018-10-17 12:49:19 +0200 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2018-10-17 12:49:19 +0200 |
| commit | 20d458b7885ca3cfb74f8d2f1bcf4a6a128394be (patch) | |
| tree | 364922ee91775ade5fdbbad1c5eaddd32eb9420b /gui/packages | |
| parent | df0022a3977fb6ee7557773a03aa1c85e2c4d63f (diff) | |
| parent | 942ba2cd63ec621106f401f8ad33fdf7da1d556e (diff) | |
| download | mullvadvpn-20d458b7885ca3cfb74f8d2f1bcf4a6a128394be.tar.xz mullvadvpn-20d458b7885ca3cfb74f8d2f1bcf4a6a128394be.zip | |
Merge branch 'upgrade-electron'
Diffstat (limited to 'gui/packages')
| -rw-r--r-- | gui/packages/desktop/package.json | 2 | ||||
| -rw-r--r-- | gui/packages/desktop/src/renderer/components/SettingsHeader.js | 9 |
2 files changed, 2 insertions, 9 deletions
diff --git a/gui/packages/desktop/package.json b/gui/packages/desktop/package.json index bd2e205f44..6983abc51d 100644 --- a/gui/packages/desktop/package.json +++ b/gui/packages/desktop/package.json @@ -49,7 +49,7 @@ "chai-as-promised": "^7.1.1", "chai-spies": "^1.0.0", "cross-env": "^5.1.3", - "electron": "^3.0.0", + "electron": "^3.0.4", "electron-builder": "^20.28", "electron-devtools-installer": "^2.2.1", "electron-mocha": "^6.0.4", diff --git a/gui/packages/desktop/src/renderer/components/SettingsHeader.js b/gui/packages/desktop/src/renderer/components/SettingsHeader.js index 1e5412b03d..b5e54e9468 100644 --- a/gui/packages/desktop/src/renderer/components/SettingsHeader.js +++ b/gui/packages/desktop/src/renderer/components/SettingsHeader.js @@ -15,9 +15,6 @@ const styles = { paddingLeft: 24, paddingBottom: 24, }), - linux: Styles.createViewStyle({ - WebkitAppRegion: 'drag', - }), }, title: Styles.createTextStyle({ fontFamily: 'DINPro', @@ -40,11 +37,7 @@ const styles = { export default class SettingsHeader extends Component { render() { - return ( - <View style={[styles.header.default, styles.header[process.platform], this.props.style]}> - {this.props.children} - </View> - ); + return <View style={[styles.header.default, this.props.style]}>{this.props.children}</View>; } } |