From f9f5befc5968b33cac97f826220f55a310a8cbb5 Mon Sep 17 00:00:00 2001
From: kangfenmao <kangfenmao@qq.com>
Date: Wed, 8 Jan 2025 14:19:09 +0800
Subject: [PATCH] fix: window navbar layout

---
 .../src/pages/home/Inputbar/TokenCount.tsx    |  3 +++
 src/renderer/src/pages/home/Navbar.tsx        | 26 +++++++++----------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/renderer/src/pages/home/Inputbar/TokenCount.tsx b/src/renderer/src/pages/home/Inputbar/TokenCount.tsx
index 0a8209db..2243e371 100644
--- a/src/renderer/src/pages/home/Inputbar/TokenCount.tsx
+++ b/src/renderer/src/pages/home/Inputbar/TokenCount.tsx
@@ -66,6 +66,9 @@ const Container = styled.div`
     font-size: 10px;
     margin-right: 3px;
   }
+  @media (max-width: 600px) {
+    display: none;
+  }
 `
 
 const Text = styled.div`
diff --git a/src/renderer/src/pages/home/Navbar.tsx b/src/renderer/src/pages/home/Navbar.tsx
index fe267100..46019cc8 100644
--- a/src/renderer/src/pages/home/Navbar.tsx
+++ b/src/renderer/src/pages/home/Navbar.tsx
@@ -50,8 +50,8 @@ const HeaderNavbar: FC<Props> = ({ activeAssistant }) => {
   return (
     <Navbar className="home-navbar">
       {showAssistants && (
-        <NavbarLeft style={{ justifyContent: 'space-between', borderRight: 'none', padding: '0 8px' }}>
-          <NavbarIcon onClick={toggleShowAssistants} style={{ marginLeft: isMac ? 8 : 0 }}>
+        <NavbarLeft style={{ justifyContent: 'space-between', borderRight: 'none', padding: 0 }}>
+          <NavbarIcon onClick={toggleShowAssistants} style={{ marginLeft: isMac ? 16 : 0 }}>
             <i className="iconfont icon-hide-sidebar" />
           </NavbarIcon>
           <NavbarIcon onClick={() => EventEmitter.emit(EVENT_NAMES.ADD_NEW_TOPIC)}>
@@ -64,9 +64,7 @@ const HeaderNavbar: FC<Props> = ({ activeAssistant }) => {
         className="home-navbar-right">
         <HStack alignItems="center">
           {!showAssistants && (
-            <NavbarIcon
-              onClick={() => toggleShowAssistants()}
-              style={{ marginRight: isMac ? 8 : 25, marginLeft: isMac ? 4 : 0 }}>
+            <NavbarIcon onClick={() => toggleShowAssistants()} style={{ marginRight: 8, marginLeft: isMac ? 4 : -12 }}>
               <i className="iconfont icon-show-sidebar" />
             </NavbarIcon>
           )}
@@ -79,23 +77,23 @@ const HeaderNavbar: FC<Props> = ({ activeAssistant }) => {
           <SelectModelButton assistant={assistant} />
         </HStack>
         <HStack alignItems="center" gap={8}>
-          <NavbarIcon onClick={() => SearchPopup.show()}>
+          <NarrowIcon onClick={() => SearchPopup.show()}>
             <SearchOutlined />
-          </NavbarIcon>
+          </NarrowIcon>
           <NarrowIcon onClick={() => dispatch(setNarrowMode(!narrowMode))}>
             <i className="iconfont icon-icon-adaptive-width"></i>
           </NarrowIcon>
           {sidebarIcons.visible.includes('minapp') && (
             <AppStorePopover>
-              <NavbarIcon>
+              <NarrowIcon>
                 <i className="iconfont icon-appstore" />
-              </NavbarIcon>
+              </NarrowIcon>
             </AppStorePopover>
           )}
           {topicPosition === 'right' && (
-            <NavbarIcon onClick={toggleShowTopics}>
+            <NarrowIcon onClick={toggleShowTopics}>
               <i className={`iconfont icon-${showTopics ? 'show' : 'hide'}-sidebar`} />
-            </NavbarIcon>
+            </NarrowIcon>
           )}
         </HStack>
       </NavbarRight>
@@ -140,15 +138,15 @@ export const NavbarIcon = styled.div`
 const TitleText = styled.span`
   margin-left: 5px;
   font-family: Ubuntu;
-  font-size: 13px;
+  font-size: 12px;
   user-select: none;
-  @media (max-width: 600px) {
+  @media (max-width: 1080px) {
     display: none;
   }
 `
 
 const NarrowIcon = styled(NavbarIcon)`
-  @media (max-width: 800px) {
+  @media (max-width: 1000px) {
     display: none;
   }
 `