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 | |
| parent | df0022a3977fb6ee7557773a03aa1c85e2c4d63f (diff) | |
| parent | 942ba2cd63ec621106f401f8ad33fdf7da1d556e (diff) | |
| download | mullvadvpn-20d458b7885ca3cfb74f8d2f1bcf4a6a128394be.tar.xz mullvadvpn-20d458b7885ca3cfb74f8d2f1bcf4a6a128394be.zip | |
Merge branch 'upgrade-electron'
| -rw-r--r-- | gui/packages/desktop/package.json | 2 | ||||
| -rw-r--r-- | gui/packages/desktop/src/renderer/components/SettingsHeader.js | 9 | ||||
| -rw-r--r-- | gui/yarn.lock | 8 |
3 files changed, 6 insertions, 13 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>; } } diff --git a/gui/yarn.lock b/gui/yarn.lock index 4df509c364..e7470f596d 100644 --- a/gui/yarn.lock +++ b/gui/yarn.lock @@ -3403,10 +3403,10 @@ electron-window@^0.8.0: dependencies: is-electron-renderer "^2.0.0" -electron@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/electron/-/electron-3.0.0.tgz#d41e671b1057aee12021c63a5db242075d6dc685" - integrity sha512-QN9X5vYa4kzJKniwhXlJwioX9qw2fDehdqxN/00KCLz/qnOz/IHLAHGikFjRwfEF2xnkmHxf61F8wn2LePPXXQ== +electron@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/electron/-/electron-3.0.4.tgz#9b45a0171ac424d4c134721c9cf2a891b99e80f2" + integrity sha512-GuZ4xCmV8wNNfkUAOdmOmgkYYaTQj5LATzc2i/b3MGhoXghnjECCgxo5yW+G2BeKM+R30cg69KA03tRzmIFxxQ== dependencies: "@types/node" "^8.0.24" electron-download "^4.1.0" |