From f1de0d5bfaae7f3687cb55b3d757757a5ca5a5a1 Mon Sep 17 00:00:00 2001
From: hakadao <a578457889743@gmail.com>
Date: Sun, 16 Jun 2024 18:35:07 +0800
Subject: [PATCH] refactor: use `--bew-top-bar-height` to set the bewly top bar
 height

---
 src/components/TopBar/TopBar.vue | 6 ++++--
 src/contentScripts/index.ts      | 6 ++++--
 src/styles/variables.scss        | 2 ++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/components/TopBar/TopBar.vue b/src/components/TopBar/TopBar.vue
index 9962950f..b48d0f36 100644
--- a/src/components/TopBar/TopBar.vue
+++ b/src/components/TopBar/TopBar.vue
@@ -386,8 +386,10 @@ defineExpose({
     :class="{ hide: hideTopBar }"
   >
     <main
-      max-w="$bew-page-max-width" m-auto flex="~ justify-between items-center gap-4"
-      p="lg:x-20 md:x-16 x-14" h="70px"
+      max-w="$bew-page-max-width"
+      flex="~ justify-between items-center gap-4"
+      p="lg:x-20 md:x-16 x-14" m-auto
+      h="$bew-top-bar-height"
     >
       <!-- Top bar mask -->
       <div
diff --git a/src/contentScripts/index.ts b/src/contentScripts/index.ts
index 5aeb078e..78347bfb 100644
--- a/src/contentScripts/index.ts
+++ b/src/contentScripts/index.ts
@@ -107,13 +107,15 @@ if (settings.value.adaptToOtherPageStyles && isHomePage()) {
 }
 
 if (isSupportedPages()) {
-  // remove the original top bar
+  // remove the original top bar and adjust the height of the top bar to match the bewly top bar
   injectCSS(`
     .bili-header .bili-header__bar,
     #internationalHeader,
     .link-navbar,
-    #home_nav {
+    #home_nav,
+    #biliMainHeader {
       visibility: hidden;
+      height: var(--bew-top-bar-height) !important;
     }
   `)
 }
diff --git a/src/styles/variables.scss b/src/styles/variables.scss
index af463f4e..f0e27e72 100644
--- a/src/styles/variables.scss
+++ b/src/styles/variables.scss
@@ -4,6 +4,8 @@
   --bew-radius: 12px;
   --bew-radius-half: calc(var(--bew-radius) / 2);
 
+  --bew-top-bar-height: 70px;
+
   --bew-filter-glass-1: blur(20px) saturate(180%);
   --bew-filter-glass-2: blur(40px) saturate(180%);
   --bew-filter-icon-glow: saturate(0) brightness(2) drop-shadow(0 0 0.2px white)