From f94c7fd60704889d8c63a5194ed97bf474c724b9 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Thu, 6 Jun 2019 05:21:12 +0000 Subject: [PATCH 1/6] Bump url-loader from 1.1.2 to 2.0.0 Bumps [url-loader](https://github.com/webpack-contrib/url-loader) from 1.1.2 to 2.0.0. - [Release notes](https://github.com/webpack-contrib/url-loader/releases) - [Changelog](https://github.com/webpack-contrib/url-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/url-loader/compare/v1.1.2...v2.0.0) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- yarn.lock | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 2bd9fdc8..03c4a394 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "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", diff --git a/yarn.lock b/yarn.lock index 54025361..a064e6b8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3628,11 +3628,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" @@ -6359,9 +6355,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" From 522ce2d8a6c5d0b39d2b3aaceb8421abe89a009d Mon Sep 17 00:00:00 2001 From: Jonathan Date: Sun, 9 Jun 2019 11:02:51 +0200 Subject: [PATCH 2/6] Set overflow on content instead of screen in settings --- .../src/components/settingsTab.component.scss | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/terminus-settings/src/components/settingsTab.component.scss b/terminus-settings/src/components/settingsTab.component.scss index 8779fc17..32851128 100644 --- a/terminus-settings/src/components/settingsTab.component.scss +++ b/terminus-settings/src/components/settingsTab.component.scss @@ -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; From e8538a970b9fddeac4bf11859e6327dbc447bb65 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" Date: Sun, 9 Jun 2019 17:35:34 +0000 Subject: [PATCH 3/6] docs: update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fc506bad..8ad43baa 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d -
Russell Myers
Russell Myers
πŸ’»		Austin Warren
Austin Warren
πŸ’»		Felicia Hummel
Felicia Hummel
πŸ’»		Mike MacCana
Mike MacCana
⚠️ 🎨		Yacine Kanzari
Yacine Kanzari
πŸ’»		BBJip
BBJip
πŸ’»		Futagirl
Futagirl
🎨
Levin Rickert
Levin Rickert
πŸ’»		OJ Kwon
OJ Kwon
πŸ’»		domain
domain
πŸ”Œ πŸ’»		James Brumond
James Brumond
πŸ”Œ		Daniel Imms
Daniel Imms
πŸ’» πŸ”Œ ⚠️		Florian Bachmann
Florian Bachmann
πŸ’»		Michael KΓΌhnel
Michael KΓΌhnel
πŸ’» 🎨
Tilmann Meyer
Tilmann Meyer
πŸ’»		PM Extra
PM Extra
πŸ›
+
Russell Myers
Russell Myers
πŸ’»		Austin Warren
Austin Warren
πŸ’»		Felicia Hummel
Felicia Hummel
πŸ’»		Mike MacCana
Mike MacCana
⚠️ 🎨		Yacine Kanzari
Yacine Kanzari
πŸ’»		BBJip
BBJip
πŸ’»		Futagirl
Futagirl
🎨
Levin Rickert
Levin Rickert
πŸ’»		OJ Kwon
OJ Kwon
πŸ’»		domain
domain
πŸ”Œ πŸ’»		James Brumond
James Brumond
πŸ”Œ		Daniel Imms
Daniel Imms
πŸ’» πŸ”Œ ⚠️		Florian Bachmann
Florian Bachmann
πŸ’»		Michael KΓΌhnel
Michael KΓΌhnel
πŸ’» 🎨
Tilmann Meyer
Tilmann Meyer
πŸ’»		PM Extra
PM Extra
πŸ›		Jonathan
Jonathan
πŸ’»
From f706034efb1b04b88a7911ee53f19e99df105412 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" Date: Sun, 9 Jun 2019 17:35:35 +0000 Subject: [PATCH 4/6] docs: update .all-contributorsrc --- .all-contributorsrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 5f12c19c..ea603f0e 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -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, From aac6d024ae8aba34483b53baa008c21328e9b4fb Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Mon, 10 Jun 2019 05:36:07 +0000 Subject: [PATCH 5/6] Bump webpack-cli from 3.3.2 to 3.3.3 Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.3.2 to 3.3.3. - [Release notes](https://github.com/webpack/webpack-cli/releases) - [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack/webpack-cli/compare/v3.3.2...3.3.3) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- yarn.lock | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 64296be0..fd0866d7 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "url-loader": "^1.1.1", "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": { diff --git a/yarn.lock b/yarn.lock index 09657e3e..8305153c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4674,6 +4674,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" @@ -6475,9 +6480,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 +6493,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" From 15d959e871183adf88d0a691b5ffd13e21e05314 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Mon, 10 Jun 2019 05:36:42 +0000 Subject: [PATCH 6/6] Bump electron from 5.0.2 to 5.0.3 Bumps [electron](https://github.com/electron/electron) from 5.0.2 to 5.0.3. - [Release notes](https://github.com/electron/electron/releases) - [Commits](https://github.com/electron/electron/compare/v5.0.2...v5.0.3) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 64296be0..97f762ed 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/yarn.lock b/yarn.lock index 09657e3e..9ac103c7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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"