1
1
mirror of https://github.com/Eugeny/tabby.git synced 2024-11-23 21:34:13 +03:00

Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	yarn.lock
This commit is contained in:
Eugene Pankov 2018-08-21 14:43:05 +02:00
commit 57e313d9de
6 changed files with 1181 additions and 1148 deletions

View File

@ -220,8 +220,6 @@ start = () => {
minWidth: 400,
minHeight: 300,
webPreferences: {webSecurity: false},
//- background to avoid the flash of unstyled window
backgroundColor: '#131d27',
frame: false,
show: false,
}
@ -235,9 +233,8 @@ start = () => {
}
}
if (['darwin', 'win32'].includes(process.platform)) {
options.transparent = true
delete options.backgroundColor
if (process.platform == 'linux') {
options.backgroundColor = '#131d27'
}
app.commandLine.appendSwitch('disable-http-cache')

View File

@ -12,6 +12,7 @@
"electron": "3.0.0-beta.5",
"electron-builder": "^20.27.1",
"electron-builder-squirrel-windows": "17.0.1",
"electron-installer-snap": "^3.0.0",
"electron-rebuild": "^1.8.2",
"file-loader": "^1.1.11",
"font-awesome": "4.7.0",

View File

@ -4,7 +4,7 @@ const vars = require('./vars')
builder({
dir: true,
linux: ['deb', 'rpm', 'tar.gz'],
linux: ['snap', 'deb', 'rpm', 'tar.gz'],
config: {
extraMetadata: {
version: vars.version,

View File

@ -18,7 +18,7 @@ $tabs-height: 36px;
flex: none;
font-weight: bold;
-webkit-app-region: no-drag;
cursor: grab;
cursor: -webkit-grab;
margin-left: 10px;
width: 20px;
@ -71,6 +71,6 @@ $tabs-height: 36px;
}
&.fully-draggable {
cursor: grab;
cursor: -webkit-grab;
}
}

View File

@ -71,7 +71,7 @@ export class TabHeaderComponent {
}
ngOnInit () {
if (this.hostApp.platform !== Platform.macOS) {
if (this.hostApp.platform === Platform.macOS) {
this.parentDraggable.setDragHandle(this.handle.nativeElement)
}
}

2313
yarn.lock

File diff suppressed because it is too large Load Diff