added gaps to settings

This commit is contained in:
Fedor Katurov 2023-04-29 22:04:43 +06:00
parent b39633c736
commit 2a5dd5ca30
5 changed files with 149 additions and 103 deletions

View file

@ -0,0 +1,13 @@
import { FC, PropsWithChildren } from "react";
import styles from "./styles.module.scss";
import classNames from "classnames";
type VerticalListProps = PropsWithChildren & {
direction?: "row" | "column";
};
const Grid: FC<VerticalListProps> = ({ children, direction = "column" }) => (
<div className={classNames(styles.list, styles[direction])}>{children}</div>
);
export { Grid };

View file

@ -0,0 +1,16 @@
.list {
display: flex;
gap: 16px;
width: 100%;
&.column {
flex-direction: column;
}
&.row {
flex-direction: row;
flex-wrap: wrap;
justify-content: stretch;
align-items: stretch;
}
}

View file

@ -1,18 +1,25 @@
import { FC, ReactNode } from "react"; import { FC, ReactNode, useMemo } from "react";
import styles from "./styles.module.scss"; import styles from "./styles.module.scss";
interface RowGroupProps { interface RowGroupProps {
children: ReactNode[]; children: ReactNode | ReactNode[];
} }
const RowGroup: FC<RowGroupProps> = ({ children }) => ( const RowGroup: FC<RowGroupProps> = ({ children }) => {
const items = useMemo(
() => (Array.isArray(children) ? children : [children]),
[children]
);
return (
<div className={styles.group}> <div className={styles.group}>
{children.map((item, key) => ( {items.map((item, key) => (
<div key={key} className={styles.row}> <div key={key} className={styles.row}>
{item} {item}
</div> </div>
))} ))}
</div> </div>
); );
};
export { RowGroup }; export { RowGroup };

View file

@ -3,6 +3,7 @@
flex-direction: column; flex-direction: column;
border-radius: 6px; border-radius: 6px;
box-shadow: var(--color-border) 0 0 0 1px; box-shadow: var(--color-border) 0 0 0 1px;
width: 100%;
} }
.row { .row {

View file

@ -10,6 +10,7 @@ import {
import { useBuiltinThemes } from "~/modules/theme/constants/themes"; import { useBuiltinThemes } from "~/modules/theme/constants/themes";
import { fillThemeHeadings } from "~/modules/theme/utils/fillThemeHeadings"; import { fillThemeHeadings } from "~/modules/theme/utils/fillThemeHeadings";
import { ThemeSelect } from "../../components/ThemeSelect"; import { ThemeSelect } from "../../components/ThemeSelect";
import { Grid } from "~/components/containers/Grid";
const ColorSettings: FC = () => { const ColorSettings: FC = () => {
const { update, settings } = useSettings(); const { update, settings } = useSettings();
@ -55,6 +56,7 @@ const ColorSettings: FC = () => {
}, [currentTheme, t]); }, [currentTheme, t]);
return ( return (
<Grid>
<RowGroup> <RowGroup>
<label> <label>
<SettingsRow title={t("Color theme")} subTitle={themeSubtitle}> <SettingsRow title={t("Color theme")} subTitle={themeSubtitle}>
@ -65,7 +67,10 @@ const ColorSettings: FC = () => {
/> />
</SettingsRow> </SettingsRow>
</label> </label>
</RowGroup>
<Grid direction="row">
<RowGroup>
<label> <label>
<SettingsRow title={t("Background")}> <SettingsRow title={t("Background")}>
<input <input
@ -105,7 +110,9 @@ const ColorSettings: FC = () => {
/> />
</SettingsRow> </SettingsRow>
</label> </label>
</RowGroup>
<RowGroup>
<label> <label>
<SettingsRow title={t("Heading 1")}> <SettingsRow title={t("Heading 1")}>
<input <input
@ -156,6 +163,8 @@ const ColorSettings: FC = () => {
</SettingsRow> </SettingsRow>
</label> </label>
</RowGroup> </RowGroup>
</Grid>
</Grid>
); );
}; };