Skip to content

Commit

Permalink
Merge pull request BewlyBewly#215 from hakadao/main
Browse files Browse the repository at this point in the history
sync: main to dev
  • Loading branch information
hakadao authored Jan 22, 2024
2 parents ae057f7 + 0f92cb8 commit f9701b0
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ jobs:
token: ${{ secrets.RELEASE_TOKEN }}
release-type: node
package-name: release-please-action
release-as: 0.14.2
release-as: 0.14.3
signoff: 'github-actions <41898282+github-actions[bot]@users.noreply.github.com>'
changelog-types: '[{"type":"types","section":"Types","hidden":false},{"type":"revert","section":"Reverts","hidden":false},{"type":"feat","section":"Features","hidden":false},{"type":"fix","section":"Bug Fixes","hidden":false},{"type":"improvement","section":"Feature Improvements","hidden":false},{"type":"docs","section":"Docs","hidden":false},{"type":"i18n","section":"I18n","hidden":false},{"type":"style","section":"Style Changes","hidden":false},{"type":"ci","section":"CI","hidden":false},{"type":"chore","section":"Miscellaneous","hidden":false},{"type":"contributor","section":"New Contributors","hidden":false},{"type":"notice","section":"Notices","hidden":false}]'
20 changes: 20 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,25 @@
# Changelog

## [0.14.3](https://github.com/hakadao/BewlyBewly/compare/v0.14.2...v0.14.3) (2024-01-22)


### Bug Fixes

* exclude the unsupported page ([#206](https://github.com/hakadao/BewlyBewly/issues/206)) ([fda3469](https://github.com/hakadao/BewlyBewly/commit/fda3469425c93e7cc9157d017164d308966e474d))
* resolve issue with displaying full favorites video list ([#207](https://github.com/hakadao/BewlyBewly/issues/207)) ([778382e](https://github.com/hakadao/BewlyBewly/commit/778382eb11028fc02fd491b77bca19badce380e1))
* top bar not showing when reaching the top of the moments page ([#205](https://github.com/hakadao/BewlyBewly/issues/205)) ([ec38faf](https://github.com/hakadao/BewlyBewly/commit/ec38fafeab6c80dd45bc0e8f29598eeaed43f202))


### Style Changes

* adjust homepage styles ([b2c142d](https://github.com/hakadao/BewlyBewly/commit/b2c142d5380e98e82640eee3f31abaf519736f45))


### Miscellaneous

* **deps-dev:** bump vite from 3.2.7 to 3.2.8 ([93a41fa](https://github.com/hakadao/BewlyBewly/commit/93a41fae8e370f9108c76c1e76f94b1e1c080ccc))
* update version number ([4b4808c](https://github.com/hakadao/BewlyBewly/commit/4b4808cbfe6adc3cf8ce38b0dd7208cfd81d80c5))

## [0.14.2](https://github.com/hakadao/BewlyBewly/compare/v0.14.1...v0.14.2) (2024-01-18)


Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "bewly-bewly",
"displayName": "BewlyBewly",
"version": "0.14.2",
"version": "0.14.3",
"private": true,
"packageManager": "[email protected]",
"description": "Just make a few small changes to your Bilibili homepage.",
Expand Down
3 changes: 3 additions & 0 deletions src/components/TopBar/TopBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,9 @@ function handleScroll() {
scrollTop.value = document.documentElement.scrollTop
}
if (scrollTop.value === 0)
toggleTopBarVisible(true)
if (settings.value.autoHideTopBar && !hoveringTopBar.value && scrollTop.value !== 0) {
if (scrollTop.value > oldScrollTop.value)
toggleTopBarVisible(false)
Expand Down
2 changes: 1 addition & 1 deletion src/contentScripts/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ function isSupportedPages() {
// notifications page
|| /https?:\/\/message.bilibili.com\.*/.test(currentUrl)
// bilibili channel page b站分区页面
|| /https?:\/\/www.bilibili.com\/v\/.*/.test(currentUrl)
|| /https?:\/\/www.bilibili.com\/v\/(?!popular).*/.test(currentUrl)
// anime page & chinese anime page
|| /https?:\/\/www.bilibili.com\/(anime|guochuang).*/.test(currentUrl)
// channel page e.g. tv shows, movie, variety shows, mooc page
Expand Down
7 changes: 2 additions & 5 deletions src/contentScripts/views/Favorites/Favorites.vue
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,7 @@ async function getFavoriteResources(
if (Array.isArray(res.data.medias) && res.data.medias.length > 0)
favoriteResources.push(...res.data.medias)
if (
res.data.medias === null
|| (res.data.medias.length < 20 && favoriteResources.length > 0)
)
if (!res.data.medias)
noMoreContent.value = true
}
}
Expand Down Expand Up @@ -158,7 +155,7 @@ function handleUnfavorite(favoriteResource: FavoriteResource) {
csrf: getCSRF(),
}).then((res) => {
if (res.code === 0)
favoriteResources.splice(favoriteResources.indexOf(favoriteResource), 1)
favoriteResources.splice(favoriteResources.indexOf(favoriteResource as FavoriteItem), 1)
})
}
</script>
Expand Down
9 changes: 7 additions & 2 deletions src/styles/adaptedStyles/homePage.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
// box-shadow: none;
// z-index: 60;
// }

// .header-channel-fixed {
// background-color: var(--bew-elevated-2);
// backdrop-filter: var(--bew-filter-glass);
Expand All @@ -34,6 +34,11 @@
// filter: var(--bew-filter-icon-glow);
// }

.bili-live-card .bili-live-card__info--living img,
.single-card.floor-card .living > img {
filter: var(--bew-filter-icon-glow);
}

&.dark {
.floor-card .floor-title {
color: var(--bew-text-1);
Expand All @@ -43,4 +48,4 @@
background-color: var(--bew-content-solid-1);
}
}
}
}

0 comments on commit f9701b0

Please sign in to comment.