From 2f993c36a8d5cf6e391c3c61133f515495bc1ac4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Jun 2022 22:01:55 +0000 Subject: [PATCH 1/5] build(deps): bump eventsource from 1.0.7 to 1.1.1 Bumps [eventsource](https://github.com/EventSource/eventsource) from 1.0.7 to 1.1.1. - [Release notes](https://github.com/EventSource/eventsource/releases) - [Changelog](https://github.com/EventSource/eventsource/blob/master/HISTORY.md) - [Commits](https://github.com/EventSource/eventsource/compare/v1.0.7...v1.1.1) --- updated-dependencies: - dependency-name: eventsource dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index ee2adcb4e..23437f2c9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4972,9 +4972,9 @@ events@^3.0.0: integrity sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg== eventsource@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.0.7.tgz#8fbc72c93fcd34088090bc0a4e64f4b5cee6d8d0" - integrity sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ== + version "1.1.1" + resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.1.1.tgz#4544a35a57d7120fba4fa4c86cb4023b2c09df2f" + integrity sha512-qV5ZC0h7jYIAOhArFJgSfdyz6rALJyb270714o7ZtNnw2WSJ+eexhKtE0O8LYPRsHZHf2osHKZBxGPvm3kPkCA== dependencies: original "^1.0.0" From 28897e47b57f2bc2a89333301140bce8735cc7e5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Jun 2022 23:17:26 +0000 Subject: [PATCH 2/5] build(deps-dev): bump electron from 17.0.0 to 17.2.0 Bumps [electron](https://github.com/electron/electron) from 17.0.0 to 17.2.0. - [Release notes](https://github.com/electron/electron/releases) - [Changelog](https://github.com/electron/electron/blob/main/docs/breaking-changes.md) - [Commits](https://github.com/electron/electron/compare/v17.0.0...v17.2.0) --- updated-dependencies: - dependency-name: electron dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 15 +++++---------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 01e5d8534..649408d4f 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "@vue/eslint-config-prettier": "^4.0.1", "babel-eslint": "^10.0.3", "core-js": "^3.19.1", - "electron": "^17.0.0", + "electron": "^17.2.0", "electron-builder": "^22.9.1", "electron-notarize": "^1.0.0", "eslint": "^5.16.0", diff --git a/yarn.lock b/yarn.lock index ee2adcb4e..e5f7c6c1d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1221,12 +1221,7 @@ resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== -"@types/node@*": - version "14.0.13" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.13.tgz#ee1128e881b874c371374c1f72201893616417c9" - integrity sha512-rouEWBImiRaSJsVA+ITTFM6ZxibuAlTuNOCyxVbwreu6k6+ujs7DfnU9o+PShFhET78pMBl3eH+AGSI5eOTkPA== - -"@types/node@^14.6.2": +"@types/node@*", "@types/node@^14.6.2": version "14.18.11" resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.11.tgz#9bd810a959e1728d78df0f68b5c825b8ea7156f4" integrity sha512-zCoCEMA+IPpsRkyCFBqew5vGb7r8RSiB3uwdu/map7uwLAfu1MTazW26/pUDWoNnF88vJz4W3U56i5gtXNqxGg== @@ -4521,10 +4516,10 @@ electron-updater@^4.3.1: lodash.isequal "^4.5.0" semver "^7.1.3" -electron@^17.0.0: - version "17.0.0" - resolved "https://registry.yarnpkg.com/electron/-/electron-17.0.0.tgz#60f00f3e3c657020e807a519700213943468b4d1" - integrity sha512-3UXcBQMwbMWdPvGHaSdPMluHrd+/bc+K143MyvE5zVZ+S1XCHt4sau7dj6svJHns5llN0YG/c6h/vRfadIp8Zg== +electron@^17.2.0: + version "17.2.0" + resolved "https://registry.yarnpkg.com/electron/-/electron-17.2.0.tgz#a5c42c16352ea968fcb5d1ce256bec51e7d140fe" + integrity sha512-eNXhPVEUofkgAeqRFvTizzYecoCMyS0Rar08WZHSAw9wjfZXawYMvTpjjjk9GiX9W/+Cjxua4YtGn5bOTabc0A== dependencies: "@electron/get" "^1.13.0" "@types/node" "^14.6.2" From 994ac9bfb7ec6bea8c14dcc8882338a582f31014 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Jun 2022 07:38:50 +0000 Subject: [PATCH 3/5] build(deps): bump shell-quote from 1.7.2 to 1.7.3 Bumps [shell-quote](https://github.com/substack/node-shell-quote) from 1.7.2 to 1.7.3. - [Release notes](https://github.com/substack/node-shell-quote/releases) - [Changelog](https://github.com/substack/node-shell-quote/blob/master/CHANGELOG.md) - [Commits](https://github.com/substack/node-shell-quote/compare/v1.7.2...1.7.3) --- updated-dependencies: - dependency-name: shell-quote dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index d095928ca..16b2a9f26 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11098,9 +11098,9 @@ shebang-regex@^3.0.0: integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== shell-quote@^1.6.1: - version "1.7.2" - resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.2.tgz#67a7d02c76c9da24f99d20808fcaded0e0e04be2" - integrity sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg== + version "1.7.3" + resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.3.tgz#aa40edac170445b9a431e17bb62c0b881b9c4123" + integrity sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw== shvl@^2.0.2: version "2.0.3" From 3f925146a4477ee860c2ccd31728274e6f056e1b Mon Sep 17 00:00:00 2001 From: Sam Wray Date: Mon, 4 Jul 2022 10:12:16 +0100 Subject: [PATCH 4/5] fix(global-search): fix global search styling (#739) * fix(global-search): fix global search styling apparently I broke global search styling in this commit 88c43e120eb02477bba896b08d926a7ece4f54a0. I can only assume I was high on hospital painkillers at the time * fix styling * change mouseover to mousemove --- src/App.vue | 18 +++++++++++++++++- src/components/Search.vue | 26 ++++++++++++++++---------- 2 files changed, 33 insertions(+), 11 deletions(-) diff --git a/src/App.vue b/src/App.vue index 02413b17a..169ba8c24 100644 --- a/src/App.vue +++ b/src/App.vue @@ -458,13 +458,29 @@ body { --rowGap: 8px; --displayScale: 1; --pixel: 1px; - --foreground-color-rgb: 0, 0, 0; + --foreground-color-rgb: 255, 255, 255; --foreground-color-a: 1; --foreground-color: rgba( var(--foreground-color-rgb), var(--foreground-color-a) ); + --foreground-color-1: rgba(var(--foreground-color-rgb), 0.5); + --foreground-color-2: rgba(var(--foreground-color-rgb), 0.4); + --foreground-color-3: rgba(var(--foreground-color-rgb), 0.2); + --foreground-color-4: rgba(var(--foreground-color-rgb), 0.1); + + --background-color-rgb: 17, 17, 17; + --background-color-a: 1; + --background-color: rgba( + var(--background-color-rgb), + var(--background-color-a) + ); + --background-color-1: rgba(var(--background-color-rgb), 0.8); + --background-color-2: rgba(var(--background-color-rgb), 0.7); + --background-color-3: rgba(var(--background-color-rgb), 0.5); + --background-color-4: rgba(var(--background-color-rgb), 0.4); + --focus-color-rgb: 241, 196, 16; --focus-color-a: 1; --focus-color: rgba(var(--focus-color-rgb), var(--focus-color-a)); diff --git a/src/components/Search.vue b/src/components/Search.vue index dd50b20ab..9ca28641c 100644 --- a/src/components/Search.vue +++ b/src/components/Search.vue @@ -24,7 +24,7 @@ v-for="(key, index) in resultsKeys" :key="key" @mousedown="select(results[key].id)" - @mouseover="mouseOverHandler(results[key].id, index)" + @mousemove="mouseMoveHandler(results[key].id, index)" :class="{ selected: index === keyboardSelectedIndex }" @@ -179,7 +179,11 @@ export default { } }, - mouseOverHandler(id, index) { + mouseMoveHandler(id, index) { + if (this.keyboardSelectedIndex === index) { + return; + } + this.keyboardSelectedIndex = index; this.highlight(id); }, @@ -225,7 +229,16 @@ export default { z-index: 1; } +.search .search-box-container { + background: var(--background-color-1); + border-radius: 5px; + padding: 0.5rem; + z-index: 1; +} + .search .search-box-container .search-box { + color: var(--background-color); + background: var(--foreground-color-1); border-radius: 5px; width: 100%; padding-left: var(--baseline); @@ -236,12 +249,6 @@ export default { border-radius: 5px 5px 0 0; } -.search .search-box-container { - border-radius: 5px; - padding: 0.5rem; - z-index: 1; -} - .search .search-box-container .results { margin: 0; padding: 0; @@ -256,12 +263,11 @@ export default { padding-left: var(--baseline); padding-right: var(--baseline); } - .search .search-box-container .results:last-child { border-radius: 0 0 5px 5px; } -.search .search-box-container .results.selected { +.search .search-box-container .results .selected { background: var(--foreground-color-1); } From 8e42216ad42ca67cf9b7c3f781cf4ed99a23ef86 Mon Sep 17 00:00:00 2001 From: Sam Wray Date: Mon, 4 Jul 2022 10:12:28 +0100 Subject: [PATCH 5/5] fix(input-config): fix title on input config panel and add search terms (#740) --- src/App.vue | 2 +- src/components/InputConfig.vue | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/App.vue b/src/App.vue index 169ba8c24..78e356b09 100644 --- a/src/App.vue +++ b/src/App.vue @@ -48,7 +48,7 @@ - + diff --git a/src/components/InputConfig.vue b/src/components/InputConfig.vue index c443540ef..e75b83900 100644 --- a/src/components/InputConfig.vue +++ b/src/components/InputConfig.vue @@ -2,6 +2,20 @@