Releasing new design #161

Merged
b merged 241 commits from staging into main 2024-08-21 11:38:25 +00:00
4 changed files with 42 additions and 34 deletions
Showing only changes of commit 9dae3a48be - Show all commits

View File

@ -170,7 +170,10 @@ export const AppBar = () => {
<MenuItem
sx={{
justifyContent: 'center',
display: { md: 'none' }
display: { md: 'none' },
fontWeight: 500,
fontSize: '14px',
color: 'var(--text-color)'
}}
>
<Typography variant="h6">{username}</Typography>

View File

@ -15,34 +15,45 @@ const Username = ({ username, avatarContent, handleClick }: Props) => {
const hexKey = useSelector((state: State) => state.auth.usersPubkey)
return (
<IconButton
aria-label="account of current user"
aria-controls="menu-appbar"
aria-haspopup="true"
onClick={handleClick}
color="inherit"
<div
style={{
display: 'flex',
flexDirection: 'row',
justifyContent: 'end',
alignItems: 'center',
gap: '12px'
}}
>
<img
src={avatarContent}
alt="user-avatar"
className="profile-image"
style={{
borderWidth: '3px',
borderStyle: hexKey ? 'solid' : 'none',
borderColor: `#${hexKey?.substring(0, 6)}`
}}
/>
<Typography
variant="h6"
sx={{
color: '#3e3e3e',
padding: '0 8px',
fontWeight: 500,
fontSize: '14px',
color: 'var(--text-color)',
display: { xs: 'none', md: 'flex' }
}}
>
{username}
{username || 'test'}
</Typography>
</IconButton>
<IconButton
aria-label="account of current user"
aria-controls="menu-appbar"
aria-haspopup="true"
onClick={handleClick}
color="inherit"
>
<img
src={avatarContent}
alt="user-avatar"
className="profile-image"
style={{
borderWidth: '3px',
borderStyle: hexKey ? 'solid' : 'none',
borderColor: `#${hexKey?.substring(0, 6)}`
}}
/>
</IconButton>
</div>
)
}

View File

@ -59,7 +59,13 @@ export const Modal = () => {
onClick={handleClose}
sx={{
fontSize: '18px',
color: 'rgba(0, 0, 0, 0.5)'
color: 'rgba(0, 0, 0, 0.5)',
padding: '8px 15px',
borderRadius: '4px',
':hover': {
background: 'var(--primary-light)',
color: 'white'
}
}}
>
<svg

View File

@ -74,18 +74,6 @@ export const theme = extendTheme({
defaultProps: {
fontFamily: ['Roboto', 'system-ui', 'sans-serif'].join(',')
}
},
MuiIconButton: {
styleOverrides: {
root: {
padding: '8px 15px',
borderRadius: '4px',
':hover': {
background: 'var(--primary-light)',
color: 'white'
}
}
}
}
},
breakpoints: {