diff --git a/ui/frontend/build_src/.eslintrc.cjs b/ui/frontend/build_src/.eslintrc.cjs index a3780c76..1a10d68e 100644 --- a/ui/frontend/build_src/.eslintrc.cjs +++ b/ui/frontend/build_src/.eslintrc.cjs @@ -9,6 +9,7 @@ module.exports = { parserOptions: { ecmaVersion: "latest", sourceType: "module", + tsconfigRootDir: __dirname, }, plugins: ["react"], extends: [ @@ -21,6 +22,7 @@ module.exports = { // general things turned off for now "prefer-const": "off", "no-debugger": "warn", + "eol-last": "off", "comma-dangle": ["off", "always-multiline"], "no-void": ["off"], diff --git a/ui/frontend/build_src/src/components/organisms/creationPanel/advancedSettings/advancedsettings.css.ts b/ui/frontend/build_src/src/components/organisms/creationPanel/advancedSettings/advancedsettings.css.ts index 5e43e3f4..33223875 100644 --- a/ui/frontend/build_src/src/components/organisms/creationPanel/advancedSettings/advancedsettings.css.ts +++ b/ui/frontend/build_src/src/components/organisms/creationPanel/advancedSettings/advancedsettings.css.ts @@ -13,7 +13,6 @@ export const AdvancedSettingsList = style({ export const AdvancedSettingGrouping = style({ marginTop: vars.spacing.medium, - marginBottom: vars.spacing.medium, }); export const MenuButton = style({ diff --git a/ui/frontend/build_src/src/components/organisms/creationPanel/imageModifiers/imageModifiers.css b/ui/frontend/build_src/src/components/organisms/creationPanel/imageModifiers/imageModifiers.css deleted file mode 100644 index e69de29b..00000000 diff --git a/ui/frontend/build_src/src/components/organisms/creationPanel/imageModifiers/imageModifiers.css.ts b/ui/frontend/build_src/src/components/organisms/creationPanel/imageModifiers/imageModifiers.css.ts new file mode 100644 index 00000000..175f8363 --- /dev/null +++ b/ui/frontend/build_src/src/components/organisms/creationPanel/imageModifiers/imageModifiers.css.ts @@ -0,0 +1,48 @@ +import { style, globalStyle } from "@vanilla-extract/css"; +// @ts-ignore +import { vars } from "../../../../styles/theme/index.css.ts"; + +export const ImagerModifierGroups = style({ + // marginBottom: vars.spacing.small, + paddingLeft: 0, + listStyleType: "none", +}); + +globalStyle(`${ImagerModifierGroups} li`, { + marginTop: vars.spacing.medium, +}); + +export const ImageModifierGrouping = style({ + marginTop: vars.spacing.medium, +}); + +export const MenuButton = style({ + display: "block", + width: "100%", + textAlign: "left", + backgroundColor: "transparent", + color: vars.colors.text.normal, + border: "0 none", + cursor: "pointer", + padding: "0", + marginBottom: vars.spacing.medium, +}); + + +globalStyle(`${MenuButton}> h4`, { + color: "#e7ba71", +}); + + +export const ModifierListStyle = style({ + // marginBottom: vars.spacing.small, + paddingLeft: 0, + listStyleType: "none", + display: "flex", + flexWrap: "wrap", + +}); + +globalStyle(`${ModifierListStyle} li`, { + margin: 0, +}); \ No newline at end of file diff --git a/ui/frontend/build_src/src/components/organisms/creationPanel/imageModifiers/index.tsx b/ui/frontend/build_src/src/components/organisms/creationPanel/imageModifiers/index.tsx index 6dd7ccd8..05b99662 100644 --- a/ui/frontend/build_src/src/components/organisms/creationPanel/imageModifiers/index.tsx +++ b/ui/frontend/build_src/src/components/organisms/creationPanel/imageModifiers/index.tsx @@ -6,6 +6,15 @@ import { loadModifications } from "../../../../api"; // @ts-expect-error import { PanelBox } from "../../../../styles/shared.css.ts"; +import { + ImagerModifierGroups, + ImageModifierGrouping, + MenuButton, + ModifierListStyle +} from //@ts-expect-error + "./imageModifiers.css.ts"; + + import { useImageCreate } from "../../../../stores/imageCreateStore"; import { useCreateUI } from "../creationPanelUIStore"; @@ -17,7 +26,7 @@ interface ModifierListProps { function ModifierList({ tags }: ModifierListProps) { return ( -