From f7b7502bfc1579dc3fc57ae849dd0031ce306dbf Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Tue, 25 May 2021 12:28:02 +0200 Subject: [PATCH] electron 13 wip --- package.json | 4 ++-- terminus-core/src/theme.ts | 2 +- terminus-electron/src/index.ts | 2 +- yarn.lock | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 955d43bb..444406df 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "core-js": "^3.12.1", "cross-env": "7.0.3", "css-loader": "5.2.6", - "electron": "12.0.9", + "electron": "13.0.0", "electron-builder": "22.10.5", "electron-download": "^4.1.1", "electron-installer-snap": "^5.1.0", @@ -62,7 +62,7 @@ "yaml-loader": "0.6.0" }, "resolutions": { - "*/node-abi": "^2.20.0", + "*/node-abi": "^2.26.0", "**/graceful-fs": "^4.2.4" }, "scripts": { diff --git a/terminus-core/src/theme.ts b/terminus-core/src/theme.ts index c55cd5a2..1a5ff2bc 100644 --- a/terminus-core/src/theme.ts +++ b/terminus-core/src/theme.ts @@ -16,7 +16,7 @@ export class StandardCompactTheme extends Theme { css = require('./theme.compact.scss') terminalBackground = '#222a33' macOSWindowButtonsInsetX = 8 - macOSWindowButtonsInsetY = 12 + macOSWindowButtonsInsetY = 6 } /** @hidden */ diff --git a/terminus-electron/src/index.ts b/terminus-electron/src/index.ts index 8ab73b32..8b9f58fb 100644 --- a/terminus-electron/src/index.ts +++ b/terminus-electron/src/index.ts @@ -41,7 +41,7 @@ export default class ElectronModule { if (hostApp.platform === Platform.macOS) { hostApp.getWindow().setTrafficLightPosition({ x: theme.macOSWindowButtonsInsetX ?? 14, - y: theme.macOSWindowButtonsInsetY ?? 22, + y: theme.macOSWindowButtonsInsetY ?? 11, }) } }) diff --git a/yarn.lock b/yarn.lock index 599264d3..55ca4719 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2649,10 +2649,10 @@ electron-to-chromium@^1.3.723: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.736.tgz#f632d900a1f788dab22fec9c62ec5c9c8f0c4052" integrity sha512-DY8dA7gR51MSo66DqitEQoUMQ0Z+A2DSXFi7tK304bdTVqczCAfUuyQw6Wdg8hIoo5zIxkU1L24RQtUce1Ioig== -electron@12.0.9: - version "12.0.9" - resolved "https://registry.yarnpkg.com/electron/-/electron-12.0.9.tgz#d582afa8f6fc0c429606f0961a4c89b376994823" - integrity sha512-p5aEt1tIh/PYjwN+6MHTc5HtW529XR9r4Qlj9PPcSb5ubkotSsS0BtWJoRPhDenSAN8sgHk3sbZLxXPJtdnRYA== +electron@13.0.0: + version "13.0.0" + resolved "https://registry.yarnpkg.com/electron/-/electron-13.0.0.tgz#b552a028e38d1122a032aaa36736b47545b98590" + integrity sha512-5SgpU7BgR4DJM1TPuZmKQ89A0AMN9vq7J7OfJebbHjsAuYP+rmJwosVna/RpLYFBuQNM90gnny5sffYGDZFQ4w== dependencies: "@electron/get" "^1.0.1" "@types/node" "^14.6.2"