Mirrors/tabby
2
0
Fork 0
mirror of https://github.com/Eugeny/tabby synced 2024-11-15 01:17:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'electron13'

Browse source
This commit is contained in:
Eugene Pankov 2021-05-28 19:18:08 +02:00
commit d324b5e665
No known key found for this signature in database
GPG key ID: 5896FCBBDD1CF4F4
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
package.json
View file

@ -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": {

2
terminus-core/src/theme.ts
View file

@ -16,7 +16,7 @@ export class StandardCompactTheme extends Theme {
css = require('./theme.compact.scss')
terminalBackground = '#222a33'
macOSWindowButtonsInsetX = 8
macOSWindowButtonsInsetY = 12
macOSWindowButtonsInsetY = 6
}
/** @hidden */

2
terminus-electron/src/index.ts
View file

@ -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,
})
}
})

8
yarn.lock
View file

@ -2651,10 +2651,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"