From dfbdb989db165fdb4aeeb0c1a1d02b0bd5166640 Mon Sep 17 00:00:00 2001 From: kangfenmao Date: Fri, 6 Sep 2024 10:00:18 +0800 Subject: [PATCH] feat: Update icon font and navigation buttons - Updated icon font references and added new icon font glyphs. - Updated icon font file for improved rendering. - Updated icon font sizes and hover animations for navigation buttons. - Removed border styles from styled Container component. - Removed unused import and updated icon for '/settings/model' menu item. --- .../src/assets/fonts/icon-fonts/iconfont.css | 30 ++++++++++-------- .../assets/fonts/icon-fonts/iconfont.woff2 | Bin 2916 -> 3432 bytes src/renderer/src/pages/home/Navbar.tsx | 16 +++++----- src/renderer/src/pages/home/Topics.tsx | 2 -- .../src/pages/settings/SettingsPage.tsx | 15 ++++----- 5 files changed, 32 insertions(+), 31 deletions(-) diff --git a/src/renderer/src/assets/fonts/icon-fonts/iconfont.css b/src/renderer/src/assets/fonts/icon-fonts/iconfont.css index 949dafd5..f5f32a31 100644 --- a/src/renderer/src/assets/fonts/icon-fonts/iconfont.css +++ b/src/renderer/src/assets/fonts/icon-fonts/iconfont.css @@ -1,6 +1,6 @@ @font-face { font-family: 'iconfont'; /* Project id 4563475 */ - src: url('iconfont.woff2?t=1725450669049') format('woff2'); + src: url('iconfont.woff2?t=1725587595482') format('woff2'); } .iconfont { @@ -11,26 +11,22 @@ -moz-osx-font-smoothing: grayscale; } +.icon-ai-model:before { + content: '\e827'; +} + +.icon-ai-model1:before { + content: '\ec09'; +} + .icon-gridlines:before { content: '\e942'; } -.icon-grid-frame:before { - content: '\e680'; -} - .icon-grid-row-2copy:before { content: '\e681'; } -.icon-sidebar-left:before { - content: '\e6ab'; -} - -.icon-sidebar-right:before { - content: '\e6ac'; -} - .icon-inbox:before { content: '\e869'; } @@ -63,6 +59,14 @@ content: '\e758'; } +.icon-hide-sidebar:before { + content: '\e8eb'; +} + +.icon-show-sidebar:before { + content: '\e944'; +} + .icon-a-addchat:before { content: '\e658'; } diff --git a/src/renderer/src/assets/fonts/icon-fonts/iconfont.woff2 b/src/renderer/src/assets/fonts/icon-fonts/iconfont.woff2 index 07fda21bb786e9a58e8e0ca0b2d50752515a27d8..d9327f93217288ebb4af3605df1fec8bdc812f63 100644 GIT binary patch literal 3432 zcmV-u4VUtFPew8T0RR9101apW3jhEB02z<~01X)c0RR9100000000000000000000 z0000SR0d!Gg=Pw&Sese_HUcCAObaLg1Rw>3X9t1?8>SVbqNFpnlKoYJ4aT$^{K6T^ zn6a>YHGAb@L1tSXX#bMH4V(ASE3V07!%-yGP)dmUy>9Q`FQvF7wCWj;Lt$-q2H_cx zPpRW^nW9ZwB%*L=#1V@b5F&8IAkJMv#DUgH{1vK3ydK(gK1a=|sy>%%nF64SFu4a= zWL0)Q`PV zg!v21hJX}-dKp3#Iu&Kf#z-5TQ!6`mLWL$8mc?zjT;NUUrDiFksuO(_1O)D-!q42j zyo=Qh;2;hWiH!x`gtFl+i236nmc%Q(n4@~hc5Lq(J5>By2Gwp^#3% zBc8cwFMt&e2^_5G1UaxOBS^8DKwx3DmcYeo8$p0|6oHR*89{{gT!I2vTL>~>-9zAE zeTN{#hNloqj0A-Z;w2Eo*vb_K1PlZT4sMg707~P8rvT4{-NL0i0KR#PVNnj?3N0ew z0@|83Jm_v=WWlkS>sO^8CtXPUN$0)y?&^$QSRKq+l75M2vpA+Rixi zv1BRFFuaT1KUbMxHo%uU{$GbFaQ}C8w~SJ@QIVa~Ak)OC6Hi&VX^|4a`Gfh^RM9lG z>65z}H|8z!{XC5Y@DQg{>Xh|4##~*@v6GOwo-r3g zMy*#dRtn*n)OOX4$v_#*tM3Str)uqJ)U9iBtdsY`5ZO^gRFW)Tf@~UwNAlR?h~#)g zea??EN)UXE?$R-OJk3tA!(+QBr1yRzNC_IipRw967&r{Ff@Hr z64iA&pMz`-QVl|Odr(d6+<7tN_*xB^rku(LG(p#;3%czhG}Qe^{h}oZ^UhzanMJ`y zUONP!zy^@dZWSBK3CR-SQ)OZ|DnuErEr6e8my!@LL%`lqEQ&x&T_BG1J# zoNl`)VsRY*nroB7GmdoW)kG0Ww@m*guUU9Kgf~fj1AZwfSOl7 zR-xTmb(h#JCwa}8w_+dIG~?r@-_YreBi#2*h$*u=x{d(Hy(`v$(|(vBVU+%CTB!oGEM zut_YcI`bFvzc#b=S9k9g7k9Fq=l8A^{f)G^#J%jAdxE!>~C&dv}W zvXVEjz`XUYcGn2B-!K{kaf`mPzhI;fgEZ$7swI8U6!69=m|e5`72UT{}Sb61V5;?AdYcuCin z$E}_}uZpV`~TlkY#2Mx=-%De1(9j zrHNR>o_!@s)`;2!aDWcH{gU#tK02 zdX@U5TD^U<88Hw4M*l@oie06$i&g4fYL(cXIEF@`Y=hy}S#XLHc+WuKa6@ruY%Ch59bq0C;@E8FBEFIUs&y!M=d;%Ka0ljYKtt)nk?mu>~I`{ZQ;n8$+! zfZQ172?B@bQ^mpd;4*wJ0W2{DLx3tK$A`gW2^l`Sn4}BZIo^l`>4Pxic&yGyg4~@! zy6tQWLJChwuiH6({LTX{Ln9_*Wp(!PAA*o;|TB z;E;x-@x8r(kndICgv-cVv>Vrfp=7fWTx^OU{SP;K|hb=>@QvgcKy6I^oB zOB0e(bD>|ubJ@Boa@~q{(^V1m?~1YKSh3j4Z4rsJhk}FX$Toi^|DMc6{;M z+ygis)|EmnWh)UjGJi1drq)!1Y^jE=ys!EwGM=;4k)tkZQqQJtL%SGPQ~A)Qup54$-nvV&y^kK0P3@9kF9o4%@Dlb zflL})-`Hjq7is+`QV(T2HUBYCa6xIEUafHa#~J?f7*n`Yy)2c3{{zX=D^jiz4V5`T z3o$#19&lc@!q*&1OYb6YEr$Q0Y}P3fmt*Mf4*198mItLO#Rd( zaX&kHDMqAdh17c(&2`DEI%=#I>=Skt zEO}k|fN6DqLyF=^bsJ*yGvh-)j`#b6lwc>7Y9LmCo<1=Io|fPLoX>j+gPzeqWoL;U z)~G6P9j`J$NY$vbUe0RHWjIcxpJnGYs-zozpylLB3i&Ru01C9u9q>Ff%_|c)eLcZk KLS`SV5C8yXbDSXn literal 2916 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 O0;^0DGW%eAJpcg9omG1P diff --git a/src/renderer/src/pages/home/Navbar.tsx b/src/renderer/src/pages/home/Navbar.tsx index 119887b1..24f62ef5 100644 --- a/src/renderer/src/pages/home/Navbar.tsx +++ b/src/renderer/src/pages/home/Navbar.tsx @@ -48,9 +48,9 @@ const HeaderNavbar: FC = ({ activeAssistant, setActiveAssistant, setActiv {showAssistants && ( - + - + @@ -66,7 +66,7 @@ const HeaderNavbar: FC = ({ activeAssistant, setActiveAssistant, setActiv {!showAssistants && ( - + )} {showAssistants && ( @@ -80,13 +80,13 @@ const HeaderNavbar: FC = ({ activeAssistant, setActiveAssistant, setActiv )} - + {!showAssistants && (topicPosition === 'left' ? !showTopics : true) && ( toggleShowAssistants()} - style={{ marginRight: isMac ? 8 : 25, marginLeft: isMac ? 8 : 0 }}> - + style={{ marginRight: isMac ? 8 : 25, marginLeft: isMac ? 4 : 0 }}> + )} = ({ activeAssistant, setActiveAssistant, setActiv /> {topicPosition === 'right' && ( - + )} @@ -127,7 +127,7 @@ export const NewButton = styled.div` transition: all 0.2s ease-in-out; cursor: pointer; .iconfont { - font-size: 18px; + font-size: 19px; color: var(--color-icon); } .icon-a-addchat { diff --git a/src/renderer/src/pages/home/Topics.tsx b/src/renderer/src/pages/home/Topics.tsx index 3d7df3b5..f8345b0c 100644 --- a/src/renderer/src/pages/home/Topics.tsx +++ b/src/renderer/src/pages/home/Topics.tsx @@ -117,8 +117,6 @@ const Container = styled.div` padding-top: 10px; min-width: var(--topic-list-width); max-width: var(--topic-list-width); - border-right: 0.5px solid var(--color-border); - border-left: 0.5px solid var(--color-border); overflow-y: scroll; height: calc(100vh - var(--navbar-height)); ` diff --git a/src/renderer/src/pages/settings/SettingsPage.tsx b/src/renderer/src/pages/settings/SettingsPage.tsx index 2774a520..15939550 100644 --- a/src/renderer/src/pages/settings/SettingsPage.tsx +++ b/src/renderer/src/pages/settings/SettingsPage.tsx @@ -1,10 +1,4 @@ -import { - CloudOutlined, - CodeSandboxOutlined, - InfoCircleOutlined, - MessageOutlined, - SettingOutlined -} from '@ant-design/icons' +import { CloudOutlined, InfoCircleOutlined, MessageOutlined, SettingOutlined } from '@ant-design/icons' import { Navbar, NavbarCenter } from '@renderer/components/app/Navbar' import { isLocalAi } from '@renderer/config/env' import { FC } from 'react' @@ -41,7 +35,7 @@ const SettingsPage: FC = () => { - + {t('settings.model')} @@ -122,6 +116,11 @@ const MenuItem = styled.li` font-size: 16px; opacity: 0.8; } + .iconfont { + font-size: 18px; + opacity: 0.7; + margin-left: -1px; + } &:hover { background: var(--color-background-soft); }