fix: modified some copy

This commit is contained in:
qinluhe 2024-07-24 12:30:00 +08:00
parent 4976f870c8
commit 403fd2f5a0
7 changed files with 29 additions and 3 deletions

View File

@ -29,6 +29,8 @@ export const AFScroller = React.forwardRef(
ref.current = scrollEl; ref.current = scrollEl;
} }
}} }}
renderTrackHorizontal={(props) => <div {...props} className='appflowy-scrollbar-track-horizontal' />}
renderTrackVertical={(props) => <div {...props} className='appflowy-scrollbar-track-vertical' />}
renderThumbHorizontal={(props) => <div {...props} className='appflowy-scrollbar-thumb-horizontal' />} renderThumbHorizontal={(props) => <div {...props} className='appflowy-scrollbar-thumb-horizontal' />}
renderThumbVertical={(props) => <div {...props} className='appflowy-scrollbar-thumb-vertical' />} renderThumbVertical={(props) => <div {...props} className='appflowy-scrollbar-thumb-vertical' />}
{...(overflowXHidden && { {...(overflowXHidden && {

View File

@ -20,7 +20,7 @@ function Duplicate() {
return ( return (
<> <>
<Button onClick={handleClick} size={'small'} variant={'outlined'} color={'inherit'}> <Button onClick={handleClick} size={'small'} variant={'outlined'} color={'inherit'}>
{t('button.duplicate')} {t('publish.saveThisPage')}
</Button> </Button>
<LoginModal redirectTo={url} open={loginOpen} onClose={handleLoginClose} /> <LoginModal redirectTo={url} open={loginOpen} onClose={handleLoginClose} />
<DuplicateModal open={duplicateOpen} onClose={handleDuplicateClose} /> <DuplicateModal open={duplicateOpen} onClose={handleDuplicateClose} />

View File

@ -73,7 +73,7 @@ function SelectWorkspace({ value, onChange, workspaceList }: SelectWorkspaceProp
<div className={'flex max-h-[360px] w-[360px] flex-col gap-1 p-2'}> <div className={'flex max-h-[360px] w-[360px] flex-col gap-1 p-2'}>
<div className={'w-full px-3 py-2 text-sm font-medium text-text-caption'}>{email}</div> <div className={'w-full px-3 py-2 text-sm font-medium text-text-caption'}>{email}</div>
<Divider /> <Divider />
<div className={'flex flex-1 flex-col overflow-y-auto overflow-x-hidden'}> <div className={'appflowy-scroller flex flex-1 flex-col overflow-y-auto overflow-x-hidden'}>
{workspaceList.map((workspace) => { {workspaceList.map((workspace) => {
const isSelected = workspace.id === selectedWorkspace?.id; const isSelected = workspace.id === selectedWorkspace?.id;

View File

@ -54,7 +54,7 @@ function SpaceList({ spaceList, value, onChange }: SpaceListProps) {
return ( return (
<div className={'flex max-h-[260px] w-[360px] flex-col gap-2 overflow-hidden'}> <div className={'flex max-h-[260px] w-[360px] flex-col gap-2 overflow-hidden'}>
<div className={'text-sm text-text-caption'}>{t('publish.addTo')}</div> <div className={'text-sm text-text-caption'}>{t('publish.addTo')}</div>
<div className={'flex w-full flex-1 flex-col gap-1 overflow-y-auto overflow-x-hidden'}> <div className={'appflowy-scroller flex w-full flex-1 flex-col gap-1 overflow-y-auto overflow-x-hidden'}>
{spaceList.map((space) => { {spaceList.map((space) => {
const isSelected = value === space.id; const isSelected = value === space.id;

View File

@ -24,6 +24,7 @@ body {
} }
@apply bg-bg-body text-text-title; @apply bg-bg-body text-text-title;
&[data-os="windows"]:not([data-browser="firefox"]) { &[data-os="windows"]:not([data-browser="firefox"]) {
.appflowy-custom-scroller { .appflowy-custom-scroller {
@include mixin.hidden-scrollbar @include mixin.hidden-scrollbar
@ -45,12 +46,23 @@ body {
} }
.appflowy-scroller {
@include mixin.scrollbar-style;
}
.appflowy-scrollbar-thumb-horizontal, .appflowy-scrollbar-thumb-vertical { .appflowy-scrollbar-thumb-horizontal, .appflowy-scrollbar-thumb-vertical {
background-color: var(--scrollbar-thumb); background-color: var(--scrollbar-thumb);
border-radius: 4px; border-radius: 4px;
opacity: 60%; opacity: 60%;
} }
.appflowy-scrollbar-track-horizontal, .appflowy-scrollbar-track-vertical {
background-color: var(--scrollbar-track);
}
.icon { .icon {
font-family: 'Apple Color Emoji', 'Noto Color Emoji', 'Segoe UI Emoji', 'Twemoji Mozilla', sans-serif; font-family: 'Apple Color Emoji', 'Noto Color Emoji', 'Segoe UI Emoji', 'Twemoji Mozilla', sans-serif;
} }

View File

@ -1,3 +1,13 @@
::-webkit-scrollbar-thumb:hover {
border-radius: 4px;
background-color: var(--scrollbar-thumb);
}
::-webkit-scrollbar-track:hover {
background-color: var(--scrollbar-track);
}
@mixin hidden-scrollbar { @mixin hidden-scrollbar {
&::-webkit-scrollbar { &::-webkit-scrollbar {
display: none; display: none;
@ -7,6 +17,7 @@
scrollbar-width: none; // For Firefox scrollbar-width: none; // For Firefox
} }
@mixin scrollbar-style { @mixin scrollbar-style {
::-webkit-scrollbar, &::-webkit-scrollbar { ::-webkit-scrollbar, &::-webkit-scrollbar {
width: 8px; width: 8px;

View File

@ -2135,6 +2135,7 @@
"mustSelectPrimaryDatabase": "The primary view must be selected", "mustSelectPrimaryDatabase": "The primary view must be selected",
"noDatabaseSelected": "No database selected, please select at least one database.", "noDatabaseSelected": "No database selected, please select at least one database.",
"unableToDeselectPrimaryDatabase": "Unable to deselect primary database", "unableToDeselectPrimaryDatabase": "Unable to deselect primary database",
"saveThisPage": "Save this page",
"duplicateTitle": "Where would you like to add", "duplicateTitle": "Where would you like to add",
"selectWorkspace": "Select a workspace", "selectWorkspace": "Select a workspace",
"addTo": "Add to", "addTo": "Add to",