diff --git a/www/src/assets/icons/Extension.tsx b/www/src/assets/icons/Extension.tsx new file mode 100644 index 00000000..2376cb2e --- /dev/null +++ b/www/src/assets/icons/Extension.tsx @@ -0,0 +1,10 @@ +import SvgIcon, { SvgIconProps } from "@material-ui/core/SvgIcon"; +import { mdiPuzzleOutline } from "@mdi/js"; + +export default function Extension(props: SvgIconProps) { + return ( + + + + ); +} diff --git a/www/src/components/Table/TableHeader/Extensions/index.tsx b/www/src/components/Table/TableHeader/Extensions/index.tsx index 19124857..357a3ae3 100644 --- a/www/src/components/Table/TableHeader/Extensions/index.tsx +++ b/www/src/components/Table/TableHeader/Extensions/index.tsx @@ -6,7 +6,7 @@ import { db } from "../../../../firebase"; import { Breadcrumbs, Typography, Button } from "@material-ui/core"; import TableHeaderButton from "../TableHeaderButton"; -import ExtensionIcon from "@material-ui/icons/ExtensionOutlined"; +import ExtensionIcon from "assets/icons/Extension"; import Modal from "components/Modal"; import { useFiretableContext } from "contexts/FiretableContext"; import { useAppContext } from "contexts/AppContext"; diff --git a/www/src/components/Table/TableHeader/RowHeight.tsx b/www/src/components/Table/TableHeader/RowHeight.tsx index 9451822d..63f3dde0 100644 --- a/www/src/components/Table/TableHeader/RowHeight.tsx +++ b/www/src/components/Table/TableHeader/RowHeight.tsx @@ -30,12 +30,15 @@ export default function RowHeight() { InputProps={{ disableUnderline: true, sx: { - background: "transparent", - boxShadow: "none", height: 32, - "&:hover:not(.Mui-disabled), &:focus, &.Mui-focused": { - backgroundColor: theme.palette.action.hover, + "&:hover": { + backgroundColor: theme.palette.action.hover + " !important", }, + + "& .MuiSelect-select": { + padding: theme.spacing(0.5, 1) + " !important", + }, + "& .MuiSelect-icon": { display: "none" }, }, }} InputLabelProps={{ style: { display: "none" } }} diff --git a/www/src/components/Table/TableHeader/TableHeaderButton.tsx b/www/src/components/Table/TableHeader/TableHeaderButton.tsx index 80dc6da6..5550ccdb 100644 --- a/www/src/components/Table/TableHeader/TableHeaderButton.tsx +++ b/www/src/components/Table/TableHeader/TableHeaderButton.tsx @@ -1,6 +1,6 @@ -import { Tooltip, IconButton, IconButtonProps } from "@material-ui/core"; +import { Tooltip, Button, ButtonProps } from "@material-ui/core"; -export interface ITableHeaderButtonProps extends Partial { +export interface ITableHeaderButtonProps extends Partial { title: string; icon: React.ReactNode; } @@ -12,16 +12,16 @@ export default function TableHeaderButton({ }: ITableHeaderButtonProps) { return ( - {icon} - + ); } diff --git a/www/src/components/Table/TableHeader/TableLogs.tsx b/www/src/components/Table/TableHeader/TableLogs.tsx index 31b8d482..cc701fc2 100644 --- a/www/src/components/Table/TableHeader/TableLogs.tsx +++ b/www/src/components/Table/TableHeader/TableLogs.tsx @@ -57,10 +57,10 @@ const useStyles = makeStyles((theme) => position: "absolute", bottom: 2, - right: 2, + right: 5, - backgroundColor: theme.palette.background.default, - boxShadow: `0 0 0 1px ${theme.palette.background.default}`, + backgroundColor: theme.palette.background.paper, + boxShadow: `0 0 0 1px ${theme.palette.background.paper}`, borderRadius: "50%", }, diff --git a/www/src/components/Table/TableHeader/index.tsx b/www/src/components/Table/TableHeader/index.tsx index a7921002..8adb5425 100644 --- a/www/src/components/Table/TableHeader/index.tsx +++ b/www/src/components/Table/TableHeader/index.tsx @@ -26,7 +26,7 @@ const useStyles = makeStyles((theme) => root: { width: "100%", margin: 0, - padding: theme.spacing(0, 1.5, 1.5, 0.5), + padding: theme.spacing(0, 2, 1.5, 1), height: TABLE_HEADER_HEIGHT, overflowX: "auto",