diff --git a/src/modules/category/components/CategorySettingsCard.tsx b/src/modules/category/components/CategorySettingsCard.tsx index b900c866..076743d5 100644 --- a/src/modules/category/components/CategorySettingsCard.tsx +++ b/src/modules/category/components/CategorySettingsCard.tsx @@ -13,12 +13,12 @@ import DeleteIcon from '@mui/icons-material/Delete'; import { useTranslation } from 'react-i18next'; import Box from '@mui/material/Box'; import Card from '@mui/material/Card'; -import CardContent from '@mui/material/CardContent'; import Stack from '@mui/material/Stack'; import Typography from '@mui/material/Typography'; import { CustomTooltip } from '@/modules/core/components/CustomTooltip.tsx'; import { requestManager } from '@/lib/requests/RequestManager.ts'; import { CategoryType } from '@/lib/graphql/generated/graphql.ts'; +import { ListCardContent } from '@/modules/core/components/cards/list/ListCardContent.tsx'; export const CategorySettingsCard = ({ category, @@ -36,18 +36,7 @@ export const CategorySettingsCard = ({ return ( - + {category.name} @@ -64,7 +53,7 @@ export const CategorySettingsCard = ({ - + ); diff --git a/src/modules/chapter/components/cards/ChapterCard.tsx b/src/modules/chapter/components/cards/ChapterCard.tsx index 958908bb..4b97a243 100644 --- a/src/modules/chapter/components/cards/ChapterCard.tsx +++ b/src/modules/chapter/components/cards/ChapterCard.tsx @@ -12,7 +12,6 @@ import CardActionArea from '@mui/material/CardActionArea'; import Checkbox from '@mui/material/Checkbox'; import Stack from '@mui/material/Stack'; import Card from '@mui/material/Card'; -import CardContent from '@mui/material/CardContent'; import IconButton from '@mui/material/IconButton'; import { useTheme } from '@mui/material/styles'; import React, { memo, MouseEvent, TouchEvent, useRef } from 'react'; @@ -39,6 +38,7 @@ import { import { applyStyles } from '@/modules/core/utils/ApplyStyles.ts'; import { ChapterCardMetadata } from '@/modules/chapter/components/cards/ChapterCardMetadata.tsx'; import { MUIUtil } from '@/lib/mui/MUI.util.ts'; +import { ListCardContent } from '@/modules/core/components/cards/list/ListCardContent.tsx'; type TChapter = ChapterIdInfo & ChapterMangaInfo & @@ -129,15 +129,7 @@ export const ChapterCard = memo((props: IProps) => { onClick={(e) => handleClick(e)} {...longPressBind(popupState.open)} > - + { )} - + {!isSelecting && popupState.isOpen && ( diff --git a/src/modules/core/components/cards/list/ListCardContent.tsx b/src/modules/core/components/cards/list/ListCardContent.tsx index cdcf6bac..5d3a3e17 100644 --- a/src/modules/core/components/cards/list/ListCardContent.tsx +++ b/src/modules/core/components/cards/list/ListCardContent.tsx @@ -16,6 +16,9 @@ export const ListCardContent = ({ children, ...props }: CardContentProps) => ( alignItems: 'center', gap: 1, p: 1.5, + '&:last-child': { + paddingBottom: 1.5, + }, ...props.sx, }} > diff --git a/src/modules/extension/components/ExtensionOptions.tsx b/src/modules/extension/components/ExtensionOptions.tsx index 685bba66..7e16b9da 100644 --- a/src/modules/extension/components/ExtensionOptions.tsx +++ b/src/modules/extension/components/ExtensionOptions.tsx @@ -9,7 +9,6 @@ import Box from '@mui/material/Box'; import { useTranslation } from 'react-i18next'; import Card from '@mui/material/Card'; -import CardContent from '@mui/material/CardContent'; import Typography from '@mui/material/Typography'; import IconButton from '@mui/material/IconButton'; import SettingsIcon from '@mui/icons-material/Settings'; @@ -29,6 +28,7 @@ import { translateExtensionLanguage } from '@/modules/extension/Extensions.utils import { StyledGroupItemWrapper } from '@/modules/core/components/virtuoso/StyledGroupItemWrapper.tsx'; import { TExtension } from '@/modules/extension/Extensions.types.ts'; import { Sources } from '@/modules/source/services/Sources.ts'; +import { ListCardContent } from '@/modules/core/components/cards/list/ListCardContent.tsx'; interface IExtensionOptions { extensionId: TExtension['pkgName'] | undefined; @@ -73,17 +73,7 @@ export function ExtensionOptions({ extensionId, closeDialog }: IExtensionOptions {relevantSources?.map((source) => ( - + {translateExtensionLanguage(Sources.getLanguage(source))} @@ -101,7 +91,7 @@ export function ExtensionOptions({ extensionId, closeDialog }: IExtensionOptions )} - + ))}