Skip to content

Commit 15aaa2b

Browse files
committed
Fix display issues due to removal of quirks mode
1 parent 0216e3f commit 15aaa2b

File tree

6 files changed

+24
-16
lines changed

6 files changed

+24
-16
lines changed

resources/scripts/components/dashboard/ServerRow.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ export default ({ server, className }: { server: Server; className?: string }) =
9191
return (
9292
<StatusIndicatorBox as={Link} to={`/server/${server.id}`} className={className} $status={stats?.status}>
9393
<div css={tw`flex items-center col-span-12 sm:col-span-5 lg:col-span-6`}>
94-
<div className={'icon'} css={tw`mr-4`}>
94+
<div className={'icon mr-4'}>
9595
<FontAwesomeIcon icon={faServer} />
9696
</div>
9797
<div>

resources/scripts/components/elements/GreyRowBox.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ export default styled.div<{ $hoverable?: boolean }>`
77
${(props) => props.$hoverable !== false && tw`hover:border-neutral-500`};
88
99
& .icon {
10-
${tw`rounded-full bg-neutral-500 p-3`};
10+
${tw`rounded-full w-16 flex items-center justify-center bg-neutral-500 p-3`};
1111
}
1212
`;

resources/scripts/components/server/files/FileDropdownMenu.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ const FileDropdownMenu = ({ file }: { file: FileObject }) => {
142142
<DropdownMenu
143143
ref={onClickRef}
144144
renderToggle={(onClick) => (
145-
<div css={tw`p-3 hover:text-white`} onClick={onClick}>
145+
<div css={tw`px-4 py-2 hover:text-white`} onClick={onClick}>
146146
<FontAwesomeIcon icon={faEllipsisH} />
147147
{modal ? (
148148
modal === 'chmod' ? (

resources/scripts/components/server/files/FileObjectRow.tsx

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,11 @@ import { ServerContext } from '@/state/server';
99
import { NavLink, useRouteMatch } from 'react-router-dom';
1010
import tw from 'twin.macro';
1111
import isEqual from 'react-fast-compare';
12-
import styled from 'styled-components/macro';
1312
import SelectFileCheckbox from '@/components/server/files/SelectFileCheckbox';
1413
import { usePermissions } from '@/plugins/usePermissions';
1514
import { join } from 'path';
1615
import { bytesToString } from '@/lib/formatters';
17-
18-
const Row = styled.div`
19-
${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`};
20-
`;
16+
import styles from './style.module.css';
2117

2218
const Clickable: React.FC<{ file: FileObject }> = memo(({ file, children }) => {
2319
const [canReadContents] = usePermissions(['file.read-content']);
@@ -26,21 +22,20 @@ const Clickable: React.FC<{ file: FileObject }> = memo(({ file, children }) => {
2622
const match = useRouteMatch();
2723

2824
return !canReadContents || (file.isFile && !file.isEditable()) ? (
29-
<div css={tw`flex flex-1 text-neutral-300 no-underline p-3 cursor-default overflow-hidden truncate`}>
30-
{children}
31-
</div>
25+
<div className={styles.details}>{children}</div>
3226
) : (
3327
<NavLink
28+
className={styles.details}
3429
to={`${match.url}${file.isFile ? '/edit' : ''}#${encodePathSegments(join(directory, file.name))}`}
35-
css={tw`flex flex-1 text-neutral-300 no-underline p-3 overflow-hidden truncate`}
3630
>
3731
{children}
3832
</NavLink>
3933
);
4034
}, isEqual);
4135

4236
const FileObjectRow = ({ file }: { file: FileObject }) => (
43-
<Row
37+
<div
38+
className={styles.file_row}
4439
key={file.name}
4540
onContextMenu={(e) => {
4641
e.preventDefault();
@@ -49,7 +44,7 @@ const FileObjectRow = ({ file }: { file: FileObject }) => (
4944
>
5045
<SelectFileCheckbox name={file.name} />
5146
<Clickable file={file}>
52-
<div css={tw`flex-none self-center text-neutral-400 ml-6 mr-4 text-lg pl-3`}>
47+
<div css={tw`flex-none text-neutral-400 ml-6 mr-4 text-lg pl-3`}>
5348
{file.isFile ? (
5449
<FontAwesomeIcon
5550
icon={file.isSymlink ? faFileImport : file.isArchiveType() ? faFileArchive : faFileAlt}
@@ -67,7 +62,7 @@ const FileObjectRow = ({ file }: { file: FileObject }) => (
6762
</div>
6863
</Clickable>
6964
<FileDropdownMenu file={file} />
70-
</Row>
65+
</div>
7166
);
7267

7368
export default memo(FileObjectRow, (prevProps, nextProps) => {

resources/scripts/components/server/files/SelectFileCheckbox.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export default ({ name }: { name: string }) => {
2020
const removeSelectedFile = ServerContext.useStoreActions((actions) => actions.files.removeSelectedFile);
2121

2222
return (
23-
<label css={tw`flex-none p-4 absolute self-center z-30 cursor-pointer`}>
23+
<label css={tw`flex-none px-4 py-2 absolute self-center z-30 cursor-pointer`}>
2424
<FileActionCheckbox
2525
name={'selectedFiles'}
2626
value={name}

resources/scripts/components/server/files/style.module.css

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,16 @@
1313
}
1414
}
1515
}
16+
17+
.file_row {
18+
@apply flex items-center cursor-pointer bg-neutral-700 rounded-sm mb-px text-sm no-underline;
19+
@apply hover:text-neutral-100 hover:bg-neutral-600;
20+
21+
& > .details {
22+
@apply flex flex-1 items-center text-neutral-300 no-underline px-4 py-2 overflow-hidden truncate;
23+
24+
&:not(a) {
25+
@apply cursor-default;
26+
}
27+
}
28+
}

0 commit comments

Comments
 (0)