Fix display issues due to removal of quirks mode
This commit is contained in:
parent
0216e3fd5b
commit
15aaa2b3c3
6 changed files with 24 additions and 16 deletions
|
@ -91,7 +91,7 @@ export default ({ server, className }: { server: Server; className?: string }) =
|
||||||
return (
|
return (
|
||||||
<StatusIndicatorBox as={Link} to={`/server/${server.id}`} className={className} $status={stats?.status}>
|
<StatusIndicatorBox as={Link} to={`/server/${server.id}`} className={className} $status={stats?.status}>
|
||||||
<div css={tw`flex items-center col-span-12 sm:col-span-5 lg:col-span-6`}>
|
<div css={tw`flex items-center col-span-12 sm:col-span-5 lg:col-span-6`}>
|
||||||
<div className={'icon'} css={tw`mr-4`}>
|
<div className={'icon mr-4'}>
|
||||||
<FontAwesomeIcon icon={faServer} />
|
<FontAwesomeIcon icon={faServer} />
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
|
|
|
@ -7,6 +7,6 @@ export default styled.div<{ $hoverable?: boolean }>`
|
||||||
${(props) => props.$hoverable !== false && tw`hover:border-neutral-500`};
|
${(props) => props.$hoverable !== false && tw`hover:border-neutral-500`};
|
||||||
|
|
||||||
& .icon {
|
& .icon {
|
||||||
${tw`rounded-full bg-neutral-500 p-3`};
|
${tw`rounded-full w-16 flex items-center justify-center bg-neutral-500 p-3`};
|
||||||
}
|
}
|
||||||
`;
|
`;
|
||||||
|
|
|
@ -142,7 +142,7 @@ const FileDropdownMenu = ({ file }: { file: FileObject }) => {
|
||||||
<DropdownMenu
|
<DropdownMenu
|
||||||
ref={onClickRef}
|
ref={onClickRef}
|
||||||
renderToggle={(onClick) => (
|
renderToggle={(onClick) => (
|
||||||
<div css={tw`p-3 hover:text-white`} onClick={onClick}>
|
<div css={tw`px-4 py-2 hover:text-white`} onClick={onClick}>
|
||||||
<FontAwesomeIcon icon={faEllipsisH} />
|
<FontAwesomeIcon icon={faEllipsisH} />
|
||||||
{modal ? (
|
{modal ? (
|
||||||
modal === 'chmod' ? (
|
modal === 'chmod' ? (
|
||||||
|
|
|
@ -9,15 +9,11 @@ import { ServerContext } from '@/state/server';
|
||||||
import { NavLink, useRouteMatch } from 'react-router-dom';
|
import { NavLink, useRouteMatch } from 'react-router-dom';
|
||||||
import tw from 'twin.macro';
|
import tw from 'twin.macro';
|
||||||
import isEqual from 'react-fast-compare';
|
import isEqual from 'react-fast-compare';
|
||||||
import styled from 'styled-components/macro';
|
|
||||||
import SelectFileCheckbox from '@/components/server/files/SelectFileCheckbox';
|
import SelectFileCheckbox from '@/components/server/files/SelectFileCheckbox';
|
||||||
import { usePermissions } from '@/plugins/usePermissions';
|
import { usePermissions } from '@/plugins/usePermissions';
|
||||||
import { join } from 'path';
|
import { join } from 'path';
|
||||||
import { bytesToString } from '@/lib/formatters';
|
import { bytesToString } from '@/lib/formatters';
|
||||||
|
import styles from './style.module.css';
|
||||||
const Row = styled.div`
|
|
||||||
${tw`flex bg-neutral-700 rounded-sm mb-px text-sm hover:text-neutral-100 cursor-pointer items-center no-underline hover:bg-neutral-600`};
|
|
||||||
`;
|
|
||||||
|
|
||||||
const Clickable: React.FC<{ file: FileObject }> = memo(({ file, children }) => {
|
const Clickable: React.FC<{ file: FileObject }> = memo(({ file, children }) => {
|
||||||
const [canReadContents] = usePermissions(['file.read-content']);
|
const [canReadContents] = usePermissions(['file.read-content']);
|
||||||
|
@ -26,13 +22,11 @@ const Clickable: React.FC<{ file: FileObject }> = memo(({ file, children }) => {
|
||||||
const match = useRouteMatch();
|
const match = useRouteMatch();
|
||||||
|
|
||||||
return !canReadContents || (file.isFile && !file.isEditable()) ? (
|
return !canReadContents || (file.isFile && !file.isEditable()) ? (
|
||||||
<div css={tw`flex flex-1 text-neutral-300 no-underline p-3 cursor-default overflow-hidden truncate`}>
|
<div className={styles.details}>{children}</div>
|
||||||
{children}
|
|
||||||
</div>
|
|
||||||
) : (
|
) : (
|
||||||
<NavLink
|
<NavLink
|
||||||
|
className={styles.details}
|
||||||
to={`${match.url}${file.isFile ? '/edit' : ''}#${encodePathSegments(join(directory, file.name))}`}
|
to={`${match.url}${file.isFile ? '/edit' : ''}#${encodePathSegments(join(directory, file.name))}`}
|
||||||
css={tw`flex flex-1 text-neutral-300 no-underline p-3 overflow-hidden truncate`}
|
|
||||||
>
|
>
|
||||||
{children}
|
{children}
|
||||||
</NavLink>
|
</NavLink>
|
||||||
|
@ -40,7 +34,8 @@ const Clickable: React.FC<{ file: FileObject }> = memo(({ file, children }) => {
|
||||||
}, isEqual);
|
}, isEqual);
|
||||||
|
|
||||||
const FileObjectRow = ({ file }: { file: FileObject }) => (
|
const FileObjectRow = ({ file }: { file: FileObject }) => (
|
||||||
<Row
|
<div
|
||||||
|
className={styles.file_row}
|
||||||
key={file.name}
|
key={file.name}
|
||||||
onContextMenu={(e) => {
|
onContextMenu={(e) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
|
@ -49,7 +44,7 @@ const FileObjectRow = ({ file }: { file: FileObject }) => (
|
||||||
>
|
>
|
||||||
<SelectFileCheckbox name={file.name} />
|
<SelectFileCheckbox name={file.name} />
|
||||||
<Clickable file={file}>
|
<Clickable file={file}>
|
||||||
<div css={tw`flex-none self-center text-neutral-400 ml-6 mr-4 text-lg pl-3`}>
|
<div css={tw`flex-none text-neutral-400 ml-6 mr-4 text-lg pl-3`}>
|
||||||
{file.isFile ? (
|
{file.isFile ? (
|
||||||
<FontAwesomeIcon
|
<FontAwesomeIcon
|
||||||
icon={file.isSymlink ? faFileImport : file.isArchiveType() ? faFileArchive : faFileAlt}
|
icon={file.isSymlink ? faFileImport : file.isArchiveType() ? faFileArchive : faFileAlt}
|
||||||
|
@ -67,7 +62,7 @@ const FileObjectRow = ({ file }: { file: FileObject }) => (
|
||||||
</div>
|
</div>
|
||||||
</Clickable>
|
</Clickable>
|
||||||
<FileDropdownMenu file={file} />
|
<FileDropdownMenu file={file} />
|
||||||
</Row>
|
</div>
|
||||||
);
|
);
|
||||||
|
|
||||||
export default memo(FileObjectRow, (prevProps, nextProps) => {
|
export default memo(FileObjectRow, (prevProps, nextProps) => {
|
||||||
|
|
|
@ -20,7 +20,7 @@ export default ({ name }: { name: string }) => {
|
||||||
const removeSelectedFile = ServerContext.useStoreActions((actions) => actions.files.removeSelectedFile);
|
const removeSelectedFile = ServerContext.useStoreActions((actions) => actions.files.removeSelectedFile);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<label css={tw`flex-none p-4 absolute self-center z-30 cursor-pointer`}>
|
<label css={tw`flex-none px-4 py-2 absolute self-center z-30 cursor-pointer`}>
|
||||||
<FileActionCheckbox
|
<FileActionCheckbox
|
||||||
name={'selectedFiles'}
|
name={'selectedFiles'}
|
||||||
value={name}
|
value={name}
|
||||||
|
|
|
@ -13,3 +13,16 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.file_row {
|
||||||
|
@apply flex items-center cursor-pointer bg-neutral-700 rounded-sm mb-px text-sm no-underline;
|
||||||
|
@apply hover:text-neutral-100 hover:bg-neutral-600;
|
||||||
|
|
||||||
|
& > .details {
|
||||||
|
@apply flex flex-1 items-center text-neutral-300 no-underline px-4 py-2 overflow-hidden truncate;
|
||||||
|
|
||||||
|
&:not(a) {
|
||||||
|
@apply cursor-default;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in a new issue