Eugeny/tabby
1
1
Fork 0
mirror of https://github.com/Eugeny/tabby.git synced 2024-11-28 05:36:31 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into feature/support-multiple-windows-win10

Browse Source
This commit is contained in:
Austin Warren 2019-07-17 17:30:11 -07:00 committed by GitHub
commit 8ee7022307
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -44,6 +44,7 @@ jobs:
if: branch = master
script:
- set -e
- '[ -z "${encrypted_4e2fb4889ef8_iv}" ] && exit 0'
- openssl aes-256-cbc -K $encrypted_4e2fb4889ef8_key -iv $encrypted_4e2fb4889ef8_iv -in .travis.ssh.key.enc -out .travis.ssh.key -d
- eval "$(ssh-agent -s)"
- chmod 600 .travis.ssh.key

6
app/src/global.scss
View File

@ -16,6 +16,12 @@ body {
display: none;
}
.btn {
& > svg {
pointer-events: none;
}
}
.form-line {
display: flex;
border-top: 1px solid rgba(0, 0, 0, 0.2);

2
package.json
View File

@ -15,7 +15,7 @@
"core-js": "^3.1.4",
"cross-env": "5.2.0",
"css-loader": "3.0.0",
"electron": "^5.0.5",
"electron": "^5.0.7",
"electron-builder": "^21.0.8",
"electron-installer-snap": "^4.0.0",
"electron-notarize": "^0.1.1",

2
terminus-terminal/package.json
View File

@ -28,7 +28,7 @@
"runes": "^0.4.2",
"slug": "^1.1.0",
"uuid": "^3.3.2",
"xterm": "3.15.0-beta80",
"xterm": "3.15.0-beta81",
"xterm-addon-fit": "^0.1.0-beta3",
"xterm-addon-ligatures": "^0.1.0-beta-2",
"xterm-addon-search": "^0.2.0-beta1",

1
terminus-terminal/src/frontends/xtermFrontend.ts
View File

@ -86,7 +86,6 @@ export class XTermFrontend extends Frontend {
this.resizeHandler = () => {
try {
if (this.xtermCore.element && getComputedStyle(this.xtermCore.element).getPropertyValue('height') !== 'auto') {
let t = window.getComputedStyle(this.xtermCore.element.parentElement)
let r = parseInt(t.getPropertyValue("height"))
let n = Math.max(0, parseInt(t.getPropertyValue("width")))

8
terminus-terminal/yarn.lock
View File

@ -188,10 +188,10 @@ xterm-addon-webgl@^0.2.0-beta1:
resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.2.0-beta5.tgz#79d97c21bb09c34c6aca6f4e72afe8085f8a77dc"
integrity sha512-TR6071ZWQ2l0E/P7KedDfsGCW21BWCfemiV/swBF+X/BiRzzsZlJXpZP62jR/XV0/J7r1SMVPSIP5j8TMCoDmw==
xterm@3.15.0-beta80:
version "3.15.0-beta80"
resolved "https://registry.yarnpkg.com/xterm/-/xterm-3.15.0-beta80.tgz#6a17eea9c9d05667acdede641cfb76a7c0d0a3cd"
integrity sha512-nidVf1uDiOa5BsYR4/uK61qsVeo/gsuvgL6HeVthcLO3WkObGpsXNaZmIFmLmgsyA4RROpjSvKipTFD8mPt+Jg==
xterm@3.15.0-beta81:
version "3.15.0-beta81"
resolved "https://registry.yarnpkg.com/xterm/-/xterm-3.15.0-beta81.tgz#1a4c01467776753d1cebee8bfafb6c4ee7f9d543"
integrity sha512-tyADfzVm55CAxCIXWJzHWMCRPYcJQp8hO/85KLxRuVjCdeuVgRn/9U9VKypNd9DJkZGsf1rONkQMnG6IDZ1DEQ==
yallist@^2.1.2:
version "2.1.2"

8
yarn.lock
View File

@ -1988,10 +1988,10 @@ electron-rebuild@^1.8.5:
spawn-rx "^3.0.0"
yargs "^13.2.2"
electron@^5.0.5:
version "5.0.5"
resolved "https://registry.yarnpkg.com/electron/-/electron-5.0.5.tgz#2d04499064d3f6c89c4642e47cfe9ea151d794eb"
integrity sha512-GzVQhImBX3rSCFPyJ1u1KbxquoidAHzGeCH2FTs3lzAh1H8m4vd7xh6CNC111mT/I8pxFk5D8s3atJlJQLPAeg==
electron@^5.0.7:
version "5.0.7"
resolved "https://registry.yarnpkg.com/electron/-/electron-5.0.7.tgz#a48fcbd13d30f16f7d7887908b68e52156e90259"
integrity sha512-OMMz8DhatxLuBFbnW7KYcAUjflGYFn0IQEtKR0iZhMAm89FgNOd9SVbxXWAGNxvRR6C0gORXwhTh6BCqqqcR6Q==
dependencies:
"@types/node" "^10.12.18"
electron-download "^4.1.0"