From 7fec4c0dac763583ca3c424f847a7ab0dc4117bd Mon Sep 17 00:00:00 2001
From: kangfenmao <kangfenmao@qq.com>
Date: Thu, 11 Sep 2025 15:13:43 +0800
Subject: [PATCH] refactor: update styles and improve navbar handling

- Removed unnecessary margin-bottom style from bubble markdown.
- Adjusted margin in Prompt component for better layout.
- Enhanced useAppInit hook to include navbar position logic for background styling.
- Added alignment to ErrorBlock alert for improved visual consistency.
---
 src/renderer/src/assets/styles/index.css                   | 4 ----
 src/renderer/src/hooks/useAppInit.ts                       | 7 ++++---
 src/renderer/src/pages/home/Messages/Blocks/ErrorBlock.tsx | 1 +
 src/renderer/src/pages/home/Messages/Prompt.tsx            | 2 +-
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/renderer/src/assets/styles/index.css b/src/renderer/src/assets/styles/index.css
index 40899314d0..b344e60ae6 100644
--- a/src/renderer/src/assets/styles/index.css
+++ b/src/renderer/src/assets/styles/index.css
@@ -169,10 +169,6 @@ ul {
   display: flow-root;
 }
 
-.bubble:not(.multi-select-mode) .markdown *:last-child {
-  margin-bottom: 0;
-}
-
 .lucide:not(.lucide-custom) {
   color: var(--color-icon);
 }
diff --git a/src/renderer/src/hooks/useAppInit.ts b/src/renderer/src/hooks/useAppInit.ts
index 2a481f564b..1bbe278431 100644
--- a/src/renderer/src/hooks/useAppInit.ts
+++ b/src/renderer/src/hooks/useAppInit.ts
@@ -20,7 +20,7 @@ import { useEffect } from 'react'
 import { useDefaultModel } from './useAssistant'
 import useFullScreenNotice from './useFullScreenNotice'
 import { useRuntime } from './useRuntime'
-import { useSettings } from './useSettings'
+import { useNavbarPosition, useSettings } from './useSettings'
 import useUpdateHandler from './useUpdateHandler'
 
 const logger = loggerService.withContext('useAppInit')
@@ -37,6 +37,7 @@ export function useAppInit() {
     customCss,
     enableDataCollection
   } = useSettings()
+  const { isTopNavbar } = useNavbarPosition()
   const { minappShow } = useRuntime()
   const { setDefaultModel, setQuickModel, setTranslateModel } = useDefaultModel()
   const avatar = useLiveQuery(() => db.settings.get('image://avatar'))
@@ -102,14 +103,14 @@ export function useAppInit() {
   useEffect(() => {
     const transparentWindow = windowStyle === 'transparent' && isMac && !minappShow
 
-    if (minappShow) {
+    if (minappShow && isTopNavbar) {
       window.root.style.background =
         windowStyle === 'transparent' && isMac ? 'var(--color-background)' : 'var(--navbar-background)'
       return
     }
 
     window.root.style.background = transparentWindow ? 'var(--navbar-background-mac)' : 'var(--navbar-background)'
-  }, [windowStyle, minappShow, theme])
+  }, [windowStyle, minappShow, theme, isTopNavbar])
 
   useEffect(() => {
     if (isLocalAi) {
diff --git a/src/renderer/src/pages/home/Messages/Blocks/ErrorBlock.tsx b/src/renderer/src/pages/home/Messages/Blocks/ErrorBlock.tsx
index bcac629bf4..298d3c274a 100644
--- a/src/renderer/src/pages/home/Messages/Blocks/ErrorBlock.tsx
+++ b/src/renderer/src/pages/home/Messages/Blocks/ErrorBlock.tsx
@@ -266,6 +266,7 @@ const Alert = styled(AntdAlert)`
   margin: 0.5rem 0 !important;
   padding: 10px;
   font-size: 12px;
+  align-items: center;
   & .ant-alert-close-icon {
     margin: 5px;
   }
diff --git a/src/renderer/src/pages/home/Messages/Prompt.tsx b/src/renderer/src/pages/home/Messages/Prompt.tsx
index 97fd5adfe5..e02389d915 100644
--- a/src/renderer/src/pages/home/Messages/Prompt.tsx
+++ b/src/renderer/src/pages/home/Messages/Prompt.tsx
@@ -73,7 +73,7 @@ const Container = styled.div<{ $isDark: boolean }>`
   border-radius: 10px;
   cursor: pointer;
   border: 0.5px solid var(--color-border);
-  margin: 15px 24px;
+  margin: 15px 20px;
   margin-bottom: 0;
 `