From 6adfe9c6e9268bf9da8c00915b909e97a6acccdd Mon Sep 17 00:00:00 2001 From: Hakadao Date: Thu, 29 Feb 2024 00:09:57 -0300 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E6=90=9C=E7=B4=A2=E6=A1=86=E7=94=A8?= =?UTF-8?q?=E4=B8=AD=E6=96=87=E8=BE=93=E5=85=A5=E6=B3=95=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E5=8D=95=E8=AF=8D=E5=9B=9E=E8=BD=A6=E4=B8=8D=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E8=A7=A6=E5=8F=91=E6=90=9C=E7=B4=A2=20#334?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/SearchBar/SearchBar.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/components/SearchBar/SearchBar.vue b/src/components/SearchBar/SearchBar.vue index 7286d5dd..fe9ade03 100644 --- a/src/components/SearchBar/SearchBar.vue +++ b/src/components/SearchBar/SearchBar.vue @@ -128,6 +128,13 @@ function handleKeyDown() { }) } +function handleKeyEnter(e: KeyboardEvent) { + if (!e.shiftKey && e.key === 'Enter' && !e.isComposing) { + e.preventDefault() + navigateToSearchResultPage(keyword.value) + } +} + async function handleClearSearchHistory() { await clearAllSearchHistory() searchHistory.value = [] @@ -175,7 +182,7 @@ async function handleClearSearchHistory() { type="text" @focus="isFocus = true" @input="handleInput" - @keyup.enter.stop.passive="navigateToSearchResultPage(keyword)" + @keydown.enter.stop.passive="handleKeyEnter" @keyup.up.stop.passive="handleKeyUp" @keyup.down.stop.passive="handleKeyDown" @keydown.stop="() => {}" From 858e3813ef6916d69bf2709fec54fdc18ebcd696 Mon Sep 17 00:00:00 2001 From: Hakadao Date: Thu, 29 Feb 2024 00:17:12 -0300 Subject: [PATCH 2/5] fix(TopBar): center the right side items --- src/components/TopBar/TopBar.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/TopBar/TopBar.vue b/src/components/TopBar/TopBar.vue index 00463954..c83cc340 100644 --- a/src/components/TopBar/TopBar.vue +++ b/src/components/TopBar/TopBar.vue @@ -554,7 +554,7 @@ defineExpose({
@@ -676,7 +676,7 @@ defineExpose({ } .right-side-item { - --at-apply: relative text-$bew-text-1; + --at-apply: relative text-$bew-text-1 flex items-center; &:not(.avatar) { a { From 9a6ecebde5d8a36e75282fd272b286e2d7a5bd89 Mon Sep 17 00:00:00 2001 From: Stephen Zhou Date: Thu, 29 Feb 2024 13:05:09 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=E6=B7=B1=E8=89=B2=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E9=80=82=E9=85=8D=20(#341)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: 深色模式下合集和列表为空时的背景色 part of #330 * fix: 深色模式下特别关注推送视频卡片背景色与文字色 * Update userSpacePage.scss --------- Co-authored-by: Hakadao --- src/styles/adaptedStyles/notificationsPage.scss | 4 +++- src/styles/adaptedStyles/userSpacePage.scss | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/styles/adaptedStyles/notificationsPage.scss b/src/styles/adaptedStyles/notificationsPage.scss index e8faeb02..740878de 100644 --- a/src/styles/adaptedStyles/notificationsPage.scss +++ b/src/styles/adaptedStyles/notificationsPage.scss @@ -172,7 +172,8 @@ .follow-btn.active, .bp-emoji-box .emoji.kaomoji, .bp-emoji-box2 .emoji.kaomoji, - .reply-textarea { + .reply-textarea, + .ar-recommend-item__info--title { color: var(--bew-text-1); } @@ -243,6 +244,7 @@ .bili-im .left, .bili-im .msg-notify, + .bili-im .msg-push-new, .bili-im .message .message-content:not(.is-img), .bili-im .send-box, .follow-btn.inactive, diff --git a/src/styles/adaptedStyles/userSpacePage.scss b/src/styles/adaptedStyles/userSpacePage.scss index de6ac38a..842c6791 100644 --- a/src/styles/adaptedStyles/userSpacePage.scss +++ b/src/styles/adaptedStyles/userSpacePage.scss @@ -511,7 +511,8 @@ .search-page, .card, .feed-dynamic-content .bb-comment, - #page-dynamic .bili-dyn-item { + #page-dynamic .bili-dyn-item, + #page-series-index .channel-option.no-channel { background-color: var(--bew-content-solid-1); } From 6fca37245bc2f4138a1aab467021ad35ea0dc5e3 Mon Sep 17 00:00:00 2001 From: Stephen Zhou Date: Sat, 2 Mar 2024 18:52:39 +0800 Subject: [PATCH 4/5] docs: update chrome web store link (#352) --- README-cmn_CN.md | 6 +++--- README-cmn_TW.md | 6 +++--- README-jyut.md | 6 +++--- README.md | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README-cmn_CN.md b/README-cmn_CN.md index f696f5fe..b13318e2 100644 --- a/README-cmn_CN.md +++ b/README-cmn_CN.md @@ -26,7 +26,7 @@ 即使在 Edge 浏览器中，我们也强烈建议您使用 Chrome 应用商店进行安装。在审核速度上，Chrome 应用商店的审核速度比 Edge 应用商店快得多。 -- Chrome: +- Chrome: - Edge: - Firefox: **我需要一些帮助!!!!!!!!!!!!!!!!!! ( ；∀；)** @@ -77,7 +77,7 @@ pnpm dev ``` 然后**在浏览器中使用 `加载已解压的拓展程序` 加载 `extension` 文件夹**。 -每次修改后，您需要单击 [重新加载](https://chrome.google.com/webstore/detail/fimgfedafeadlieiabdeeaodndnlbhid) 按钮并刷新页面以确保应用更改。 +每次修改后，您需要单击 [重新加载](https://chromewebstore.google.com/detail/extensions-reloader/fimgfedafeadlieiabdeeaodndnlbhid) 按钮并刷新页面以确保应用更改。 #### 构建 (Chrome or Edge) @@ -105,7 +105,7 @@ pnpm dev-firefox ``` 然后**在浏览器中使用 `加载已解压的拓展程序` 加载 `extension-firefox/` 文件夹**。 -每次修改后，您需要单击 [Extensions Reloader](https://chrome.google.com/webstore/detail/fimgfedafeadlieiabdeeaodndnlbhid) 按钮并刷新页面以确保应用更改。 +每次修改后，您需要单击 [Extensions Reloader](https://chromewebstore.google.com/detail/extensions-reloader/fimgfedafeadlieiabdeeaodndnlbhid) 按钮并刷新页面以确保应用更改。 #### 构建 (Firefox) diff --git a/README-cmn_TW.md b/README-cmn_TW.md index a2022407..ed5e2252 100644 --- a/README-cmn_TW.md +++ b/README-cmn_TW.md @@ -26,7 +26,7 @@ 即使您使用的是 Edge 瀏覽器，我們仍然強烈建議您從 Chrome 線上應用程式商店安裝。在審核速度上，Chrome 線上應用程式商店通常比 Edge 的附加元件來得快一些。 -- Chrome: +- Chrome: - Edge: - Firefox: **我需要幫助!!!!!!!!!!!!!!!!!! ( ；∀；)** @@ -77,7 +77,7 @@ pnpm dev ``` 然後在瀏覽器中使用 `extension/` 資料夾載入此擴充功能。 -每次修改後，您需要點選 [Extensions Reloader](https://chrome.google.com/webstore/detail/fimgfedafeadlieiabdeeaodndnlbhid) 按鈕，然後重新整理頁面，以確保更改生效。 +每次修改後，您需要點選 [Extensions Reloader](https://chromewebstore.google.com/detail/extensions-reloader/fimgfedafeadlieiabdeeaodndnlbhid) 按鈕，然後重新整理頁面，以確保更改生效。 #### 建置 (Chrome or Edge) @@ -105,7 +105,7 @@ pnpm dev-firefox ``` 然後在瀏覽器中使用 `extension-firefox/` 資料夾載入此擴充功能。 -每次修改後，您需要點選 [Extensions Reloader](https://chrome.google.com/webstore/detail/fimgfedafeadlieiabdeeaodndnlbhid) 按鈕，然後重新整理頁面，以確保更改生效。 +每次修改後，您需要點選 [Extensions Reloader](https://chromewebstore.google.com/detail/extensions-reloader/fimgfedafeadlieiabdeeaodndnlbhid) 按鈕，然後重新整理頁面，以確保更改生效。 #### 建置 (Firefox) diff --git a/README-jyut.md b/README-jyut.md index 0bef63a0..815761de 100644 --- a/README-jyut.md +++ b/README-jyut.md @@ -26,7 +26,7 @@ 即使你用嘅係 Edge browser，我哋都係建議你喺返 Chrome 線上應用程式商店單撈。事關喺審核速度上，Chrome 線上應用程式商店照計係快過 Edge 的附加元件一啲嘅。 -- Chrome: +- Chrome: - Edge: - Firefox: **我要人幫手!!!!!!!!!!!!!!!!!! ( ；∀；)** @@ -77,7 +77,7 @@ pnpm dev ``` 然之後喺瀏覽器度用 `extension/` 資料夾愛嚟載入此擴充功能。 -每一次執過 code 之後，你都要撳 [Extensions Reloader](https://chrome.google.com/webstore/detail/fimgfedafeadlieiabdeeaodndnlbhid) 粒掣，然之後 refresh 個 page，確保係有效果。 +每一次執過 code 之後，你都要撳 [Extensions Reloader](https://chromewebstore.google.com/detail/extensions-reloader/fimgfedafeadlieiabdeeaodndnlbhid) 粒掣，然之後 refresh 個 page，確保係有效果。 #### 建置 (Chrome or Edge) @@ -105,7 +105,7 @@ pnpm dev-firefox ``` 然之後喺瀏覽器度用 `extension-firefox/` 資料夾愛嚟載入此擴充功能。 -每一次執過 code 之後，你都要撳 [Extensions Reloader](https://chrome.google.com/webstore/detail/fimgfedafeadlieiabdeeaodndnlbhid) 粒掣，然之後 refresh 個 page，確保係有效果。 +每一次執過 code 之後，你都要撳 [Extensions Reloader](https://chromewebstore.google.com/detail/extensions-reloader/fimgfedafeadlieiabdeeaodndnlbhid) 粒掣，然之後 refresh 個 page，確保係有效果。 #### 建置 (Firefox) diff --git a/README.md b/README.md index 9fd956ec..1f2c2f75 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ English | [简体中文](README-cmn_CN.md) | [正體中文](README-cmn_TW.md) | Even in the Edge browser, we strongly recommend you install it in the Chrome web store. In terms of review speed, the Chrome web store is slightly faster than Edge Add-ons. -- Chrome: +- Chrome: - Edge: - Firefox: **I NEED SOME HELP!!!!!!!!!!!!!!!!!! ( ；∀；)** @@ -77,7 +77,7 @@ pnpm dev ``` Then **load the extension in the browser with the `extension/` folder**. -After each modification, you need to click the [Extensions Reloader](https://chrome.google.com/webstore/detail/fimgfedafeadlieiabdeeaodndnlbhid) button and refresh the page to ensure the changes will be applied. +After each modification, you need to click the [Extensions Reloader](https://chromewebstore.google.com/detail/extensions-reloader/fimgfedafeadlieiabdeeaodndnlbhid) button and refresh the page to ensure the changes will be applied. ##### Build (Chrome or Edge) @@ -105,7 +105,7 @@ pnpm dev-firefox ``` Then **load the extension in the browser with the `extension-firefox/` folder**. -After each modification, you need to click the [Extensions Reloader](https://chrome.google.com/webstore/detail/fimgfedafeadlieiabdeeaodndnlbhid) button and refresh the page to ensure the changes will be applied. +After each modification, you need to click the [Extensions Reloader](https://chromewebstore.google.com/detail/extensions-reloader/fimgfedafeadlieiabdeeaodndnlbhid) button and refresh the page to ensure the changes will be applied. #### Build (Firefox) From 61d3354fcf7f017d41966b60d42d8688bad4208b Mon Sep 17 00:00:00 2001 From: Stephen Zhou Date: Sat, 2 Mar 2024 18:55:20 +0800 Subject: [PATCH 5/5] ci: only sync branch in source repo (#353) --- .github/workflows/sync-bugfixes.yml | 1 + .github/workflows/sync-dev-firefox.yml | 1 + .github/workflows/sync-dev.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/.github/workflows/sync-bugfixes.yml b/.github/workflows/sync-bugfixes.yml index 0e909d75..2ef61335 100644 --- a/.github/workflows/sync-bugfixes.yml +++ b/.github/workflows/sync-bugfixes.yml @@ -6,6 +6,7 @@ on: jobs: sync-branches: + if: github.repository == 'hakadao/BewlyBewly' runs-on: ubuntu-latest name: Syncing branches steps: diff --git a/.github/workflows/sync-dev-firefox.yml b/.github/workflows/sync-dev-firefox.yml index 451557a4..a79a1680 100644 --- a/.github/workflows/sync-dev-firefox.yml +++ b/.github/workflows/sync-dev-firefox.yml @@ -6,6 +6,7 @@ on: jobs: sync-branches: + if: github.repository == 'hakadao/BewlyBewly' runs-on: ubuntu-latest name: Syncing branches steps: diff --git a/.github/workflows/sync-dev.yml b/.github/workflows/sync-dev.yml index 76abbba1..7793d02c 100644 --- a/.github/workflows/sync-dev.yml +++ b/.github/workflows/sync-dev.yml @@ -6,6 +6,7 @@ on: jobs: sync-branches: + if: github.repository == 'hakadao/BewlyBewly' runs-on: ubuntu-latest name: Syncing branches steps: