diff --git a/src/components/config/DiffModal.module.scss b/src/components/config/DiffModal.module.scss index 02b7b6e..7089c54 100644 --- a/src/components/config/DiffModal.module.scss +++ b/src/components/config/DiffModal.module.scss @@ -5,6 +5,7 @@ :global(.modal-body) { padding: $spacing-md $spacing-lg; max-height: none; + overflow: hidden; } } @@ -39,17 +40,17 @@ :global(.cm-mergeView) { height: 100%; + overflow: auto !important; + -webkit-overflow-scrolling: touch; background: var(--bg-primary); } - :global(.cm-mergeViewEditors), - :global(.cm-mergeViewEditor), - :global(.cm-editor) { - height: 100%; + :global(.cm-mergeViewEditors) { + min-height: 100%; } - :global(.cm-scroller) { - overflow: auto; + :global(.cm-mergeViewEditor) { + height: 100%; } :global(.cm-gutters) { diff --git a/src/features/authFiles/components/AuthFileCard.tsx b/src/features/authFiles/components/AuthFileCard.tsx index 5bec54e..f8f5f7e 100644 --- a/src/features/authFiles/components/AuthFileCard.tsx +++ b/src/features/authFiles/components/AuthFileCard.tsx @@ -2,7 +2,7 @@ import { useTranslation } from 'react-i18next'; import { Button } from '@/components/ui/Button'; import { LoadingSpinner } from '@/components/ui/LoadingSpinner'; import { ToggleSwitch } from '@/components/ui/ToggleSwitch'; -import { IconBot, IconCode, IconDownload, IconInfo, IconTrash2 } from '@/components/ui/icons'; +import { IconBot, IconCheck, IconCode, IconDownload, IconInfo, IconTrash2 } from '@/components/ui/icons'; import { ProviderStatusBar } from '@/components/providers/ProviderStatusBar'; import type { AuthFileItem } from '@/types'; import { resolveAuthProvider } from '@/utils/quota'; @@ -102,13 +102,16 @@ export function AuthFileCard(props: AuthFileCardProps) {