From 6562da51e06f0df970a50b2a555b960933203f06 Mon Sep 17 00:00:00 2001
From: Hakadao <a578457889743@gmail.com>
Date: Thu, 14 Mar 2024 00:16:13 -0300
Subject: [PATCH 1/4] fix: correct frosted glass disablement not working in
 several cases and adjust opacity

---
 src/contentScripts/views/App.vue |  2 ++
 src/styles/variables.scss        | 49 +++++++++++++++-----------------
 2 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/src/contentScripts/views/App.vue b/src/contentScripts/views/App.vue
index 394bb48c..061cbdec 100644
--- a/src/contentScripts/views/App.vue
+++ b/src/contentScripts/views/App.vue
@@ -269,6 +269,8 @@ function handleDisableFrostedGlass() {
       bewlyElement.classList.add('disable-frosted-glass')
 
     document.documentElement.classList.add('disable-frosted-glass')
+
+    settings.value.reduceFrostedGlassBlur = false
   }
   else {
     if (bewlyElement)
diff --git a/src/styles/variables.scss b/src/styles/variables.scss
index 962d8a55..425d6ad3 100644
--- a/src/styles/variables.scss
+++ b/src/styles/variables.scss
@@ -63,16 +63,16 @@
   --bew-success-color-80: rgba(110 231 183 / 0.8);
   --bew-success-color-90: rgba(110 231 183 / 0.9);
 
-  --bew-warning-color: rgb(217 178 22);
-  --bew-warning-color-10: rgba(217 178 22 / 0.1);
-  --bew-warning-color-20: rgba(217 178 22 / 0.2);
-  --bew-warning-color-30: rgba(217 178 22 / 0.3);
-  --bew-warning-color-40: rgba(217 178 22 / 0.4);
-  --bew-warning-color-50: rgba(217 178 22 / 0.5);
-  --bew-warning-color-60: rgba(217 178 22 / 0.6);
-  --bew-warning-color-70: rgba(217 178 22 / 0.7);
-  --bew-warning-color-80: rgba(217 178 22 / 0.8);
-  --bew-warning-color-90: rgba(217 178 22 / 0.9);
+  --bew-warning-color: rgb(243 199 27);
+  --bew-warning-color-10: rgba(243 199 27 / 0.1);
+  --bew-warning-color-20: rgba(243 199 27 / 0.2);
+  --bew-warning-color-30: rgba(243 199 27 / 0.3);
+  --bew-warning-color-40: rgba(243 199 27 / 0.4);
+  --bew-warning-color-50: rgba(243 199 27 / 0.5);
+  --bew-warning-color-60: rgba(243 199 27 / 0.6);
+  --bew-warning-color-70: rgba(243 199 27 / 0.7);
+  --bew-warning-color-80: rgba(243 199 27 / 0.8);
+  --bew-warning-color-90: rgba(243 199 27 / 0.9);
 
   --bew-error-color: rgb(219 65 108);
   --bew-error-color-10: rgba(219 65 108 / 0.1);
@@ -102,7 +102,6 @@
     220 14% 96% / var(--bew-homepage-bg-mask-opacity)
   );
 
-  // Decrease the opacity in light mode to ensure the text can be seen clearly
   --bew-content-opacity: 0.8;
 
   // #region content colors, used to buttons, cards, popover and so on
@@ -138,19 +137,6 @@
   --bew-page-max-width: 2280px;
 }
 
-:host(.disable-frosted-glass),
-:root.disable-frosted-glass {
-  --bew-content-opacity: 1;
-  --bew-filter-glass-1: none;
-  --bew-filter-glass-2: none;
-}
-
-:host(.reduce-frosted-glass-blur),
-:root.reduce-frosted-glass-blur {
-  --bew-filter-glass-1: blur(10px) saturate(180%);
-  --bew-filter-glass-2: blur(20px) saturate(180%);
-}
-
 :host(.dark),
 :root.dark {
   // dark mode
@@ -183,8 +169,6 @@
   --bew-homepage-bg: hsl(230 12% 6%);
   --bew-homepage-bg-mask: hsl(230 12% 6% / var(--bew-homepage-bg-mask-opacity));
 
-  --bew-content-opacity: 0.6;
-
   --bew-content-1: hsl(230 12% 12% / var(--bew-content-opacity));
   --bew-content-1-hover: hsl(230 12% 28% / var(--bew-content-opacity));
   --bew-content-2: hsl(230 12% 20% / var(--bew-content-opacity));
@@ -213,6 +197,19 @@
   --bew-border-color: rgb(131 131 145 / 26%);
 }
 
+:host(.disable-frosted-glass),
+:root.disable-frosted-glass {
+  --bew-content-opacity: 1;
+  --bew-filter-glass-1: none;
+  --bew-filter-glass-2: none;
+}
+
+:host(.reduce-frosted-glass-blur),
+:root.reduce-frosted-glass-blur {
+  --bew-filter-glass-1: blur(10px) saturate(180%);
+  --bew-filter-glass-2: blur(20px) saturate(180%);
+}
+
 :root.bewly-design {
   --brand_pink: var(--bew-theme-color);
   --brand_pink_thin: var(--bew-theme-color-20);

From cac5c987b9c821c7894da73144e60d9f5054c7b2 Mon Sep 17 00:00:00 2001
From: Hakadao <a578457889743@gmail.com>
Date: Thu, 14 Mar 2024 00:46:05 -0300
Subject: [PATCH 2/4] style(Dock): adjust dock styles

---
 src/components/Dock/Dock.vue | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/components/Dock/Dock.vue b/src/components/Dock/Dock.vue
index e64a34a7..1af16cc9 100644
--- a/src/components/Dock/Dock.vue
+++ b/src/components/Dock/Dock.vue
@@ -190,7 +190,7 @@ function toggleDockHide(hide: boolean) {
       <template v-for="dockItem in currentDockItems" :key="dockItem.page">
         <Tooltip :content="$t(dockItem.i18nKey)" :placement="tooltipPlacement">
           <button
-            class="dock-item"
+            class="dock-item group"
             :class="{ active: activatedPage === dockItem.page }"
             @click="emit('change-page', dockItem.page)"
           >
@@ -297,9 +297,10 @@ function toggleDockHide(hide: boolean) {
 }
 
 .dock-item {
-  --shadow-dark: 0 0 30px 4px rgba(255, 255, 255, 0.6);
-  --shadow-active: 0 0 20px var(--bew-theme-color-50);
-  --shadow-dark-active: 0 0 20px rgba(255, 255, 255, 0.6);
+  --shadow-dark: 0 4px 30px 4px rgba(255, 255, 255, 0.6);
+  --shadow-active: 0 4px 30px var(--bew-theme-color-70);
+  --shadow-dark-active: 0 4px 20px rgba(255, 255, 255, 0.6);
+  --shadow-active-active: 0 4px 20px var(--bew-theme-color-70);
 
   --at-apply: transform active:scale-90
     md:w-45px w-35px
@@ -307,25 +308,25 @@ function toggleDockHide(hide: boolean) {
     p-0 flex items-center justify-center
     aspect-square relative
     leading-0 duration-300
-    rounded-60px
-    bg-$bew-content-1 dark:bg-$bew-fill-1 cursor-pointer
-    hover:bg-$bew-fill-3 dark-hover:bg-$bew-fill-3 hover:scale-110
+    rounded-60px antialiased
+    bg-$bew-content-1 hover:bg-$bew-fill-2 cursor-pointer
+    dark:bg-$bew-fill-1 dark-hover:bg-$bew-fill-4 hover:scale-110
     active:important-scale-100;
 
-  box-shadow: var(--bew-shadow-edge-glow-1), 0 4px 12px rgba(0, 0, 0, 0.08);
+  box-shadow: var(--bew-shadow-edge-glow-1), var(--bew-shadow-1);
+
+  &:hover {
+    box-shadow: var(--bew-shadow-edge-glow-1), 0 0 0 2px var(--bew-fill-2), var(--bew-shadow-2);
+  }
 
   &.active {
     --at-apply: important-bg-$bew-theme-color-auto text-$bew-text-auto
       shadow-$shadow-active  dark:shadow-$shadow-dark
-      active:shadow-$shadow-active dark-active:shadow-$shadow-dark-active;
+      active:shadow-$shadow-active-active dark-active:shadow-$shadow-dark-active;
   }
 
   svg {
     --at-apply: md:w-22px w-18px md:h-22px h-18px block align-middle;
   }
 }
-
-.dark .dock-item {
-  box-shadow: var(--bew-shadow-edge-glow-1), 0 4px 12px rgba(0, 0, 0, 0.08);
-}
 </style>

From 92958871cc9ba31d751b16ff1847fe88f76f21c1 Mon Sep 17 00:00:00 2001
From: Hakadao <a578457889743@gmail.com>
Date: Thu, 14 Mar 2024 00:46:36 -0300
Subject: [PATCH 3/4] chore: update version number

---
 .github/workflows/changelog.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
index b5ff0bc8..28108dbf 100644
--- a/.github/workflows/changelog.yml
+++ b/.github/workflows/changelog.yml
@@ -19,6 +19,6 @@ jobs:
           token: ${{ secrets.RELEASE_TOKEN }}
           release-type: node
           package-name: release-please-action
-          release-as: 0.15.1
+          release-as: 0.15.2
           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":true},{"type":"style","section":"Style Changes","hidden":false},{"type":"ci","section":"CI","hidden":false},{"type":"chore","section":"Miscellaneous","hidden":true},{"type":"contributor","section":"New Contributors","hidden":false},{"type":"notice","section":"Notices","hidden":false}]'

From 33d961919fb1b05b4e30be754597999219338591 Mon Sep 17 00:00:00 2001
From: Hakadao <a578457889743@gmail.com>
Date: Wed, 13 Mar 2024 13:49:51 -0300
Subject: [PATCH 4/4] chore(main): release 0.15.2 (#383)

Signed-off-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
---
 CHANGELOG.md | 14 ++++++++++++++
 package.json |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7def9550..8c89f760 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Changelog
 
+## [0.15.2](https://github.com/hakadao/BewlyBewly/compare/v0.15.1...v0.15.2) (2024-03-13)
+
+
+### Bug Fixes
+
+* correct frosted glass disablement not working in several cases and adjust opacity ([6562da5](https://github.com/hakadao/BewlyBewly/commit/6562da51e06f0df970a50b2a555b960933203f06))
+* resolve issue when using ad-blocking extensions blocks entire page ([#375](https://github.com/hakadao/BewlyBewly/issues/375)) ([5f60bc4](https://github.com/hakadao/BewlyBewly/commit/5f60bc4b4725617376e810fb6a35fe96a3315310))
+* **TopBar:** moments icon badges show the 0 ([#376](https://github.com/hakadao/BewlyBewly/issues/376)) ([a234881](https://github.com/hakadao/BewlyBewly/commit/a23488114e8dd134cf8df4ae434fff02d2b3d21d))
+
+
+### Style Changes
+
+* **Dock:** adjust dock styles ([cac5c98](https://github.com/hakadao/BewlyBewly/commit/cac5c987b9c821c7894da73144e60d9f5054c7b2))
+
 ## [0.15.1](https://github.com/hakadao/BewlyBewly/compare/v0.15.0...v0.15.1) (2024-03-11)
 
 
diff --git a/package.json b/package.json
index b569dd1d..d20e3bac 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "bewly-bewly",
   "displayName": "BewlyBewly",
-  "version": "0.15.1",
+  "version": "0.15.2",
   "private": true,
   "packageManager": "pnpm@8.15.3",
   "description": "Just make a few small changes to your Bilibili homepage.",