From 1c57345b9f7ef0df3f9b80362e49c8ece2150bc4 Mon Sep 17 00:00:00 2001 From: Jordan Muir Date: Mon, 12 Oct 2020 13:06:21 -0400 Subject: [PATCH] Rollback Electron for Linux --- app/App/Panel/Main/Signer/Settings/style/index.styl | 1 + app/App/Panel/style/index.styl | 2 -- package-lock.json | 12 ++++++------ package.json | 4 ++-- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/app/App/Panel/Main/Signer/Settings/style/index.styl b/app/App/Panel/Main/Signer/Settings/style/index.styl index 1d9f69ee6..43577dc9c 100644 --- a/app/App/Panel/Main/Signer/Settings/style/index.styl +++ b/app/App/Panel/Main/Signer/Settings/style/index.styl @@ -93,6 +93,7 @@ font-size 18px font-weight 200 transform translateZ(0) + z-index 1 .signerPermissionControls display flex diff --git a/app/App/Panel/style/index.styl b/app/App/Panel/style/index.styl index 46d15866a..75ed27b3a 100644 --- a/app/App/Panel/style/index.styl +++ b/app/App/Panel/style/index.styl @@ -217,11 +217,9 @@ flex-direction column justify-content center align-items center - position relative transform translateZ(0) font-size 14px margin 24px 10px 0px 10px - z-index 20 background highlight padding 20px border-radius 16px diff --git a/package-lock.json b/package-lock.json index a61edab6f..a7479b8ad 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4670,9 +4670,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001147", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001147.tgz", - "integrity": "sha512-CPyN875geYk46eIqPl5jlmotCr5YZC2KxIVfb4z0FrNfLxPM+MyodWD2irJGDG8vUUE1fmg3De9vt8uaC6Nf6w==", + "version": "1.0.30001148", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001148.tgz", + "integrity": "sha512-E66qcd0KMKZHNJQt9hiLZGE3J4zuTqE1OnU53miEVtylFbwOEmeA5OsRu90noZful+XGSQOni1aT2tiqu/9yYw==", "dev": true }, "capture-exit": { @@ -6372,9 +6372,9 @@ } }, "electron": { - "version": "10.1.3", - "resolved": "https://registry.npmjs.org/electron/-/electron-10.1.3.tgz", - "integrity": "sha512-CR8LrlG47MdAp317SQ3vGYa2o2cIMdMSMPYH46OVitFLk35dwE9fn3VqvhUIXhCHYcNWIAPzMhkVHpkoFdKWuw==", + "version": "9.3.2", + "resolved": "https://registry.npmjs.org/electron/-/electron-9.3.2.tgz", + "integrity": "sha512-0lleEf9msAXGDi2GukAuiGdw3VDgSTlONOnJgqDEz1fuSEVsXz5RX+hNPKDsVDerLTFg/C34RuJf4LwHvkKcBA==", "dev": true, "requires": { "@electron/get": "^1.0.1", diff --git a/package.json b/package.json index a2b5a3d28..6dd675eff 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "launch:inspect": "cross-env NODE_ENV=production electron --inspect ./main", "alpha": "npm run bundle && npm run launch", "hot": "npm run bundle && npm run launch:hot", - "clean": "rimraf dist bundle .cache package-lock.json \"node_modules/!(rimraf|.bin)\" && npm install && npm audit fix", + "clean": "rimraf dist bundle .cache package-lock.json \"node_modules/!(rimraf|.bin)\" && npm cache clean --force && npm install && npm audit fix && npm run bundle", "scrub": "rimraf dist bundle .cache \"node_modules/!(rimraf|.bin)\" && npm install", "build": "electron-builder", "release": "electron-builder -c.snap.publish=github", @@ -120,7 +120,7 @@ "@babel/preset-env": "7.11.5", "@babel/preset-react": "7.10.4", "babel-eslint": "10.1.0", - "electron": "10.1.3", + "electron": "9.3.2", "electron-builder": "22.8.1", "electron-notarize": "1.0.0", "ganache-cli": "6.12.0",