GuanM/tabby
1
0
Fork 0
mirror of https://github.com/Eugeny/tabby.git synced 2025-06-24 13:29:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Eugeny/terminus

Browse Source
This commit is contained in:
Eugene Pankov 2019-06-10 21:56:46 +02:00
commit 2fad5b741e
5 changed files with 37 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.all-contributorsrc
View File

@ -153,6 +153,15 @@
"contributions": [
"bug"
]
},
{
"login": "IgnusG",
"name": "Jonathan",
"avatar_url": "https://avatars1.githubusercontent.com/u/6438760?v=4",
"profile": "https://jjuhas.keybase.pub//",
"contributions": [
"code"
]
}
],
"contributorsPerLine": 7,

2
README.md
View File

File diff suppressed because one or more lines are too long

6
package.json
View File

@ -13,7 +13,7 @@
"core-js": "^3.1.3",
"cross-env": "5.2.0",
"css-loader": "2.1.1",
"electron": "^5.0.2",
"electron": "^5.0.3",
"electron-builder": "^20.43.0",
"electron-installer-snap": "^3.2.0",
"electron-rebuild": "^1.8.5",
@ -45,10 +45,10 @@
"tslint-eslint-rules": "^5.4.0",
"typedoc": "^0.14.2",
"typescript": "^3.5.1",
"url-loader": "^1.1.1",
"url-loader": "^2.0.0",
"val-loader": "1.1.1",
"webpack": "^4.33.0",
"webpack-cli": "^3.3.2",
"webpack-cli": "^3.3.3",
"yaml-loader": "0.5.0"
},
"resolutions": {

7
terminus-settings/src/components/settingsTab.component.scss
View File

@ -2,8 +2,6 @@
display: flex;
flex-direction: column;
flex: auto;
overflow: auto;
height: 100%;
>.btn-block {
margin: 20px;
@ -12,6 +10,11 @@
}
}
.tab-content {
overflow: auto;
height: 100%;
}
.hotkeys-table {
margin-top: 30px;

34
yarn.lock
View File

@ -1888,10 +1888,10 @@ electron-rebuild@^1.8.5:
spawn-rx "^3.0.0"
yargs "^13.2.2"
electron@^5.0.2:
version "5.0.2"
resolved "https://registry.yarnpkg.com/electron/-/electron-5.0.2.tgz#0f6b38ae7e344b94f433d9171e50568f56962fc7"
integrity sha512-bUHKQhyuOen/q8iHTkrnzqB9CAwBDI+vHbeu21kpq2bqAD+t25yfrmUEcYHaPL4fZOAhk6nnRqskF6/Xd+aZxg==
electron@^5.0.3:
version "5.0.3"
resolved "https://registry.yarnpkg.com/electron/-/electron-5.0.3.tgz#919818962caffbd909af15bc8a3034be972fa76e"
integrity sha512-kgnxPQoTNzu0lKC8ToAktt93mTimgqHZGFCVmTaFjs1G2Bk9VqKHljbQemH+REKAaw1aEgIRn2JCrTe0Dy7fVQ==
dependencies:
"@types/node" "^10.12.18"
electron-download "^4.1.0"
@ -3629,11 +3629,7 @@ mime-types@~2.1.7:
dependencies:
mime-db "~1.36.0"
mime@^2.0.3:
version "2.3.1"
resolved "https://registry.yarnpkg.com/mime/-/mime-2.3.1.tgz#b1621c54d63b97c47d3cfe7f7215f7d64517c369"
mime@^2.4.3:
mime@^2.0.3, mime@^2.4.3:
version "2.4.3"
resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.3.tgz#229687331e86f68924e6cb59e1cdd937f18275fe"
@ -4674,6 +4670,11 @@ prepend-http@^2.0.0:
resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
prettier@^1.17.0:
version "1.18.2"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz#6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea"
integrity sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw==
pretty-bytes@^1.0.2:
version "1.0.4"
resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-1.0.4.tgz#0a22e8210609ad35542f8c8d5d2159aff0751c84"
@ -6360,9 +6361,10 @@ urix@^0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
url-loader@^1.1.1:
version "1.1.2"
resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-1.1.2.tgz#b971d191b83af693c5e3fea4064be9e1f2d7f8d8"
url-loader@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-2.0.0.tgz#600ef36f463e21bd673ad70156d850619d9cd092"
integrity sha512-RT3cz+Lw+kFMCKLabMyogFrc/aRoAMJHmY5os1VDBlav+4t5vxUxKDn47zCSFAYAl+hM8YLg4TZwG4TkJaafkg==
dependencies:
loader-utils "^1.1.0"
mime "^2.0.3"
@ -6475,9 +6477,10 @@ wcwidth@^1.0.0, wcwidth@^1.0.1:
dependencies:
defaults "^1.0.3"
webpack-cli@^3.3.2:
version "3.3.2"
resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.2.tgz#aed2437b0db0a7faa2ad28484e166a5360014a91"
webpack-cli@^3.3.3:
version "3.3.3"
resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.3.tgz#8b7587dee369a838eb4722f6cfa711c779011e5f"
integrity sha512-/qBxTvsxZ7bIFQtSa08QRY5BZuiJb27cbJM/nzmgXg9NEaudP20D7BruKKIuWfABqWoMEJQcNYYq/OxxSbPHlg==
dependencies:
chalk "^2.4.1"
cross-spawn "^6.0.5"
@ -6487,6 +6490,7 @@ webpack-cli@^3.3.2:
import-local "^2.0.0"
interpret "^1.1.0"
loader-utils "^1.1.0"
prettier "^1.17.0"
supports-color "^5.5.0"
v8-compile-cache "^2.0.2"
yargs "^12.0.5"