style: update delete button style (#3180)

This commit is contained in:
JimmFly
2023-07-12 09:23:39 +00:00
committed by GitHub
parent bd42380f8a
commit 1ac1c33bb1
11 changed files with 30 additions and 11 deletions
@@ -87,7 +87,7 @@ const CollectionOperations = ({
element: <div key="divider" className={styles.menuDividerStyle}></div>, element: <div key="divider" className={styles.menuDividerStyle}></div>,
}, },
{ {
icon: <DeleteIcon style={{ color: 'var(--affine-warning-color)' }} />, icon: <DeleteIcon />,
name: t['Delete'](), name: t['Delete'](),
click: () => { click: () => {
return setting.deleteCollection(view.id); return setting.deleteCollection(view.id);
@@ -77,7 +77,7 @@ export const PageOperations = ({
element: <div key="divider" className={styles.menuDividerStyle}></div>, element: <div key="divider" className={styles.menuDividerStyle}></div>,
}, },
{ {
icon: <DeleteIcon style={{ color: 'var(--affine-warning-color)' }} />, icon: <DeleteIcon />,
name: t['Delete'](), name: t['Delete'](),
click: () => { click: () => {
removeToTrash(page.id); removeToTrash(page.id);
@@ -1,4 +1,4 @@
import { style } from '@vanilla-extract/css'; import { globalStyle, style } from '@vanilla-extract/css';
export const wrapper = style({ export const wrapper = style({
userSelect: 'none', userSelect: 'none',
@@ -36,11 +36,14 @@ export const more = style({
}, },
}); });
export const deleteFolder = style({ export const deleteFolder = style({
color: 'var(--affine-warning-color)',
':hover': { ':hover': {
backgroundColor: 'var(--affine-background-warning-color)', color: 'var(--affine-error-color)',
backgroundColor: 'var(--affine-background-error-color)',
}, },
}); });
globalStyle(`${deleteFolder}:hover svg`, {
color: 'var(--affine-error-color)',
});
export const menuDividerStyle = style({ export const menuDividerStyle = style({
marginTop: '2px', marginTop: '2px',
marginBottom: '2px', marginBottom: '2px',
@@ -138,7 +138,7 @@ export const buttonStyle = style({
margin: '10px 6px', margin: '10px 6px',
padding: '0 0', padding: '0 0',
':hover': { ':hover': {
backgroundColor: 'var(--affine-hover-color)', backgroundColor: 'var(--affine-background-error-color)',
backgroundSize: '24px 24px', backgroundSize: '24px 24px',
}, },
}); });
@@ -478,7 +478,7 @@ const ImagePreviewModalImpl = (
noBorder={true} noBorder={true}
className={buttonStyle} className={buttonStyle}
onClick={() => blockId && deleteHandler(blockId)} onClick={() => blockId && deleteHandler(blockId)}
hoverColor={'-moz-initial'} hoverColor="var(--affine-error-color)"
/> />
</Tooltip> </Tooltip>
</div> </div>
@@ -147,6 +147,8 @@ export const TrashOperationCell: React.FC<TrashOperationCellProps> = ({
onClick={() => { onClick={() => {
setOpen(true); setOpen(true);
}} }}
hoverBackground="var(--affine-background-error-color)"
hoverColor="var(--affine-error-color)"
> >
<DeletePermanentlyIcon /> <DeletePermanentlyIcon />
</IconButton> </IconButton>
@@ -0,0 +1,12 @@
import { globalStyle, style } from '@vanilla-extract/css';
export const moveToTrashStyle = style({
':hover': {
backgroundColor: 'var(--affine-background-error-color)',
color: 'var(--affine-error-color)',
},
});
globalStyle(`${moveToTrashStyle}:hover svg`, {
color: 'var(--affine-error-color)',
});
@@ -3,8 +3,8 @@ import { DeleteTemporarilyIcon } from '@blocksuite/icons';
import type { ConfirmProps } from '../../..'; import type { ConfirmProps } from '../../..';
import { Confirm, MenuItem } from '../../..'; import { Confirm, MenuItem } from '../../..';
import { moveToTrashStyle } from './index.css';
import type { CommonMenuItemProps } from './types'; import type { CommonMenuItemProps } from './types';
export const MoveToTrash = ({ export const MoveToTrash = ({
onSelect, onSelect,
onItemClick, onItemClick,
@@ -21,6 +21,7 @@ export const MoveToTrash = ({
onSelect?.(); onSelect?.();
}} }}
icon={<DeleteTemporarilyIcon />} icon={<DeleteTemporarilyIcon />}
className={moveToTrashStyle}
> >
{t['Move to Trash']()} {t['Move to Trash']()}
</MenuItem> </MenuItem>
@@ -69,7 +69,7 @@ export const CollectionBar = ({
}, },
}, },
{ {
icon: <DeleteIcon style={{ color: 'red' }} />, icon: <DeleteIcon style={{ color: 'var(--affine-error-color)' }} />,
name: 'delete', name: 'delete',
click: () => { click: () => {
setting.deleteCollection(collection.id).catch(err => { setting.deleteCollection(collection.id).catch(err => {
@@ -202,6 +202,7 @@ export const deleteIcon = style({
padding: 4, padding: 4,
cursor: 'pointer', cursor: 'pointer',
':hover': { ':hover': {
backgroundColor: 'var(--affine-hover-color)', color: 'var(--affine-error-color)',
backgroundColor: 'var(--affine-background-error-color)',
}, },
}); });
@@ -57,7 +57,7 @@ const CollectionOption = ({
}, },
}, },
{ {
icon: <DeleteIcon style={{ color: 'red' }} />, icon: <DeleteIcon style={{ color: 'var(--affine-error-color)' }} />,
name: 'delete', name: 'delete',
click: () => { click: () => {
setting.deleteCollection(collection.id).catch(err => { setting.deleteCollection(collection.id).catch(err => {