diff --git a/app/main.js b/app/main.js index c506e11132a17bcdc14eeda13bf54eacd8cb7ab0..bcadcf6dd2564433b35929acbf8a4f777e28072d 100644 --- a/app/main.js +++ b/app/main.js @@ -225,7 +225,7 @@ start = () => { options.frame = true } else { if (process.platform == 'darwin') { - options.titleBarStyle = 'hidden-inset' + options.titleBarStyle = 'hiddenInset' } } diff --git a/app/src/plugins.ts b/app/src/plugins.ts index 57c2f28f9d9fca013d9e5fc571e3bfc7ee712758..cc3ebddb4a7cd66208657885aefd2b3c6234ea89 100644 --- a/app/src/plugins.ts +++ b/app/src/plugins.ts @@ -61,6 +61,7 @@ const builtinModules = [ '@ng-bootstrap/ng-bootstrap', 'ngx-toastr', 'rxjs', + 'rxjs/operators', 'terminus-core', 'terminus-settings', 'terminus-terminal', diff --git a/package.json b/package.json index 32be17916693e2db37f5d548e7da9b02174a3692..a485c40c16898dcbb8ec6da4e12b3105afcc9dc8 100644 --- a/package.json +++ b/package.json @@ -107,8 +107,8 @@ "scripts": { "build": "webpack --color --config app/webpack.config.js && webpack --color --config terminus-core/webpack.config.js && webpack --color --config terminus-settings/webpack.config.js && webpack --color --config terminus-terminal/webpack.config.js && webpack --color --config terminus-settings/webpack.config.js && webpack --color --config terminus-plugin-manager/webpack.config.js && webpack --color --config terminus-community-color-schemes/webpack.config.js && webpack --color --config terminus-ssh/webpack.config.js", "watch": "webpack --progress --color --watch", - "start": "cross-env DEV=1 electron --js-flags='--ignition' app --debug", - "prod": "cross-env DEV=1 electron --js-flags='--ignition' app", + "start": "cross-env DEV=1 electron app --debug", + "prod": "cross-env DEV=1 electron app", "lint": "tslint -c tslint.json -t stylish terminus-*/src/**/*.ts terminus-*/src/*.ts app/src/*.ts", "postinstall": "install-app-deps" }, diff --git a/terminus-core/src/components/tabBody.component.scss b/terminus-core/src/components/tabBody.component.scss index 84ea44ff75ae6d8fac95f3c9b619633867c6b26a..8af4f6b01ecfdefa872be79320e384f6c7ffa585 100644 --- a/terminus-core/src/components/tabBody.component.scss +++ b/terminus-core/src/components/tabBody.component.scss @@ -15,4 +15,9 @@ flex: auto; } } + + > perfect-scrollbar { + width: auto; + height: auto; + } } diff --git a/terminus-terminal/yarn.lock b/terminus-terminal/yarn.lock index 637ae4c26b6516269e13d304ed05152a6c088af7..5fc835cff44ac98e5197961b83ff16a8b0826e76 100644 --- a/terminus-terminal/yarn.lock +++ b/terminus-terminal/yarn.lock @@ -62,11 +62,11 @@ file-loader@^0.11.2: dependencies: loader-utils "^1.0.2" -font-manager-nan-fix@0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/font-manager-nan-fix/-/font-manager-nan-fix-0.2.2.tgz#387eb95799317ab4da2fb660a8b3e8b1ad58f59b" +font-manager@0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/font-manager/-/font-manager-0.3.0.tgz#9efdc13e521a3d8752e7ab56c3938818043a311f" dependencies: - nan "~2.2.0" + nan ">=2.10.0" hterm-umdjs@1.1.3: version "1.1.3" @@ -92,14 +92,14 @@ mz@^2.6.0: object-assign "^4.0.1" thenify-all "^1.0.0" +nan@>=2.10.0: + version "2.10.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f" + nan@^2.6.2: version "2.7.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.7.0.tgz#d95bf721ec877e08db276ed3fc6eb78f9083ad46" -nan@~2.2.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.2.1.tgz#d68693f6b34bb41d66bc68b3a4f9defc79d7149b" - node-pty-tmp@0.7.1: version "0.7.1" resolved "https://registry.yarnpkg.com/node-pty-tmp/-/node-pty-tmp-0.7.1.tgz#0a81179f9087b21f968206c886e543db20650d7a"