whai/cherry-studio
1
1
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: windows frame background color

Browse Source
This commit is contained in:
kangfenmao 2024-08-16 17:41:14 +08:00
parent 1866b00265
commit b8960ef02c
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/renderer/src/assets/styles/index.scss
View File

@ -39,8 +39,8 @@
--color-scrollbar-thumb: rgba(255, 255, 255, 0.15); --color-scrollbar-thumb: rgba(255, 255, 255, 0.15);
--color-scrollbar-thumb-hover: rgba(255, 255, 255, 0.3); --color-scrollbar-thumb-hover: rgba(255, 255, 255, 0.3);
--navbar-background: rgba(30, 30, 30, 0.75); --navbar-background-mac: rgba(30, 30, 30, 0.8);
--sidebar-background: rgba(30, 30, 30, 0.75); --navbar-background: rgba(30, 30, 30);
--input-bar-background: rgba(255, 255, 255, 0.02); --input-bar-background: rgba(255, 255, 255, 0.02);
--navbar-height: 42px; --navbar-height: 42px;
@ -88,8 +88,8 @@ body[theme-mode='light'] {
--color-scrollbar-thumb: rgba(0, 0, 0, 0.15); --color-scrollbar-thumb: rgba(0, 0, 0, 0.15);
--color-scrollbar-thumb-hover: rgba(0, 0, 0, 0.3); --color-scrollbar-thumb-hover: rgba(0, 0, 0, 0.3);
--navbar-background: rgba(255, 255, 255, 0.8); --navbar-background-mac: rgba(255, 255, 255, 0.75);
--sidebar-background: rgba(255, 255, 255, 0.8); --navbar-background: rgba(255, 255, 255);
--input-bar-background: rgba(0, 0, 0, 0.02); --input-bar-background: rgba(0, 0, 0, 0.02);
} }

6
src/renderer/src/components/app/Navbar.tsx
View File

@ -5,9 +5,11 @@ import styled from 'styled-components'
type Props = PropsWithChildren & JSX.IntrinsicElements['div'] type Props = PropsWithChildren & JSX.IntrinsicElements['div']
const navbarBackgroundColor = isMac ? 'var(--navbar-background-mac)' : 'var(--navbar-background)'
export const Navbar: FC<Props> = ({ children, ...props }) => { export const Navbar: FC<Props> = ({ children, ...props }) => {
const { minappShow } = useRuntime() const { minappShow } = useRuntime()
const backgroundColor = minappShow ? 'var(--color-background)' : 'var(--navbar-background)' const backgroundColor = minappShow ? 'var(--color-background)' : navbarBackgroundColor
return ( return (
<NavbarContainer {...props} style={{ backgroundColor }}> <NavbarContainer {...props} style={{ backgroundColor }}>
@ -37,7 +39,7 @@ const NavbarContainer = styled.div`
margin-left: ${isMac ? 'calc(var(--sidebar-width) * -1)' : 0}; margin-left: ${isMac ? 'calc(var(--sidebar-width) * -1)' : 0};
padding-left: ${isMac ? 'var(--sidebar-width)' : 0}; padding-left: ${isMac ? 'var(--sidebar-width)' : 0};
border-bottom: 0.5px solid var(--color-border); border-bottom: 0.5px solid var(--color-border);
background-color: var(--navbar-background); background-color: ${navbarBackgroundColor};
transition: background-color 0.3s ease; transition: background-color 0.3s ease;
-webkit-app-region: drag; -webkit-app-region: drag;
` `

6
src/renderer/src/components/app/Sidebar.tsx
View File

@ -10,6 +10,8 @@ import styled from 'styled-components'
import UserPopup from '../Popups/UserPopup' import UserPopup from '../Popups/UserPopup'
const sidebarBackgroundColor = isMac ? 'var(--navbar-background-mac)' : 'var(--navbar-background)'
const Sidebar: FC = () => { const Sidebar: FC = () => {
const { pathname } = useLocation() const { pathname } = useLocation()
const avatar = useAvatar() const avatar = useAvatar()
@ -22,7 +24,7 @@ const Sidebar: FC = () => {
} }
return ( return (
<Container style={{ backgroundColor: minappShow ? 'var(--color-background)' : 'var(--sidebar-background)' }}> <Container style={{ backgroundColor: minappShow ? 'var(--color-background)' : sidebarBackgroundColor }}>
<AvatarImg src={avatar || Logo} draggable={false} className="dragdisable" onClick={onEditUser} /> <AvatarImg src={avatar || Logo} draggable={false} className="dragdisable" onClick={onEditUser} />
<MainMenus> <MainMenus>
<Menus> <Menus>
@ -64,7 +66,7 @@ const Container = styled.div`
-webkit-app-region: drag !important; -webkit-app-region: drag !important;
border-right: 0.5px solid var(--color-border); border-right: 0.5px solid var(--color-border);
margin-top: ${isMac ? 'var(--navbar-height)' : 0}; margin-top: ${isMac ? 'var(--navbar-height)' : 0};
background-color: var(--sidebar-background); background-color: ${sidebarBackgroundColor};
transition: background-color 0.3s ease; transition: background-color 0.3s ease;
` `

2
src/renderer/src/pages/home/Messages/Prompt.tsx
View File

@ -43,7 +43,7 @@ const Container = styled.div`
` `
const Text = styled.div` const Text = styled.div`
color: var(--color-text-3); color: var(--color-text-2);
font-size: 12px; font-size: 12px;
display: -webkit-box; display: -webkit-box;
-webkit-line-clamp: 2; -webkit-line-clamp: 2;