Merge branch 'main' of https://github.com/Donetick/frontend
This commit is contained in:
@@ -6,7 +6,15 @@ import {
|
|||||||
Star,
|
Star,
|
||||||
StarBorder,
|
StarBorder,
|
||||||
} from '@mui/icons-material'
|
} from '@mui/icons-material'
|
||||||
import { Box, Chip, Menu, MenuItem, Tooltip, Typography } from '@mui/joy'
|
import {
|
||||||
|
Box,
|
||||||
|
Chip,
|
||||||
|
Menu,
|
||||||
|
MenuItem,
|
||||||
|
Tooltip,
|
||||||
|
Typography,
|
||||||
|
IconButton,
|
||||||
|
} from '@mui/joy'
|
||||||
import { useState } from 'react'
|
import { useState } from 'react'
|
||||||
import { useNavigate } from 'react-router-dom'
|
import { useNavigate } from 'react-router-dom'
|
||||||
import { getTextColorFromBackgroundColor } from '../../../utils/Colors'
|
import { getTextColorFromBackgroundColor } from '../../../utils/Colors'
|
||||||
@@ -107,6 +115,7 @@ const CustomFilterChips = ({
|
|||||||
transition: 'all 0.2s ease',
|
transition: 'all 0.2s ease',
|
||||||
px: 1.0,
|
px: 1.0,
|
||||||
py: 0.5,
|
py: 0.5,
|
||||||
|
height: 32,
|
||||||
|
|
||||||
opacity: hasWarning ? 0.7 : isActive ? 1 : 0.85,
|
opacity: hasWarning ? 0.7 : isActive ? 1 : 0.85,
|
||||||
...(hasCustomColor && {
|
...(hasCustomColor && {
|
||||||
@@ -189,10 +198,12 @@ const CustomFilterChips = ({
|
|||||||
)
|
)
|
||||||
})}
|
})}
|
||||||
|
|
||||||
<Chip
|
<IconButton
|
||||||
variant='outlined'
|
variant='outlined'
|
||||||
size='lg'
|
size='sm'
|
||||||
sx={{ cursor: 'pointer', minWidth: 'auto', px: 0.8 }}
|
sx={{
|
||||||
|
borderRadius: 24,
|
||||||
|
}}
|
||||||
onClick={e => {
|
onClick={e => {
|
||||||
e.preventDefault()
|
e.preventDefault()
|
||||||
e.stopPropagation()
|
e.stopPropagation()
|
||||||
@@ -200,7 +211,7 @@ const CustomFilterChips = ({
|
|||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Settings />
|
<Settings />
|
||||||
</Chip>
|
</IconButton>
|
||||||
|
|
||||||
<Menu
|
<Menu
|
||||||
anchorEl={menuAnchor}
|
anchorEl={menuAnchor}
|
||||||
|
|||||||
Reference in New Issue
Block a user