Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Core 2022-02-04 04:14:44 +00:00
commit 6352c3009d
No known key found for this signature in database
GPG key ID: FE9BF1B547F8F3C6
2 changed files with 15 additions and 6 deletions

View file

@ -46,8 +46,8 @@ export class BrowserWindow {
hasShadow: false, hasShadow: false,
show: false, show: false,
backgroundColor: "#1E1E1E", backgroundColor: "#1E1E1E",
titleBarStyle: 'customButtonsOnHover', titleBarStyle: 'hidden',
trafficLightPosition: {x: 960, y: 20}, trafficLightPosition: {x: 15, y: 20},
webPreferences: { webPreferences: {
nodeIntegration: true, nodeIntegration: true,
sandbox: true, sandbox: true,

View file

@ -68,10 +68,6 @@ body[loading] {
} }
} }
body[platform='linux'] {
background: #222;
}
body.notransparency::before { body.notransparency::before {
content: ""; content: "";
position: absolute; position: absolute;
@ -880,6 +876,7 @@ input[type=range].web-slider::-webkit-slider-runnable-track {
.app-chrome .app-chrome--left { .app-chrome .app-chrome--left {
width: 30%; width: 30%;
justify-content: left; justify-content: left;
-webkit-app-region: drag;
} }
.app-chrome .app-chrome--center { .app-chrome .app-chrome--center {
@ -5957,5 +5954,17 @@ body.no-gpu {
} }
} }
body[platform='darwin'] {
#window-controls-container {
display: none;
}
.app-chrome .app-chrome-item > .app-mainmenu {
opacity: 0;
pointer-events: none;
-webkit-app-region: drag;
}
}
@import url("less/compact.less"); @import url("less/compact.less");