From b050df0d3bff1a6a11628f7ca63b98ccfada60f3 Mon Sep 17 00:00:00 2001 From: bflatastic Date: Fri, 19 Apr 2024 09:16:08 +0700 Subject: [PATCH] styling fixes --- app/components/Input.tsx | 9 +++-- app/components/Typography.tsx | 40 +++++++++++++------ .../comps/SidePanelTabs/comps/TabTitle.tsx | 9 ++++- .../itemTabs/StylizeTab/Prompts.tsx | 18 +++++---- .../itemTabs/StylizeTab/StyleButtons.tsx | 8 ++-- .../itemTabs/StylizeTab/StylizeTab.tsx | 2 +- 6 files changed, 56 insertions(+), 30 deletions(-) diff --git a/app/components/Input.tsx b/app/components/Input.tsx index 4e89941702..1ca037c21f 100644 --- a/app/components/Input.tsx +++ b/app/components/Input.tsx @@ -3,8 +3,11 @@ import { IconDefinition } from "@fortawesome/pro-solid-svg-icons"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { Label } from "./Typography"; import { kebabCase } from "~/utilities"; -import { disableHotkeyInput,enableHotkeyInput,DomLevels } from "~/pages/PageEnigma/store"; - +import { + disableHotkeyInput, + enableHotkeyInput, + DomLevels, +} from "~/pages/PageEnigma/store"; interface InputProps extends React.InputHTMLAttributes { label?: string; @@ -13,7 +16,7 @@ interface InputProps extends React.InputHTMLAttributes { export function Input({ label, icon, className, id, ...rest }: InputProps) { return ( -
+
{label && }
diff --git a/app/components/Typography.tsx b/app/components/Typography.tsx index 0bb645e383..c4bb8bac65 100644 --- a/app/components/Typography.tsx +++ b/app/components/Typography.tsx @@ -9,41 +9,54 @@ interface TypoProps { const baseTypo = "text-white"; export const H1 = ({ className, children }: TypoProps) => ( -

{children}

+

+ {children} +

); export const H2 = ({ className, children }: TypoProps) => ( -

{children}

+

+ {children} +

); export const H3 = ({ className, children }: TypoProps) => ( -

{children}

+

+ {children} +

); export const H4 = ({ className, children }: TypoProps) => ( -

{children}

+

+ {children} +

); -export const Label = ({ - className, children, ...rest +export const Label = ({ + className, + children, + ...rest }: LabelHTMLAttributes) => ( ); export const H5 = ({ className, children }: TypoProps) => ( -
{children}
+
+ {children} +
); export const H6 = ({ className, children }: TypoProps) => ( -
{children}
+
+ {children} +
); -export const Link = ({className, ...rest}:NavLinkProps)=> +export const Link = ({ className, ...rest }: NavLinkProps) => ( )} {...rest} /> +); export const P = ({ className, children }: TypoProps) => (

{children}

diff --git a/app/pages/PageEnigma/comps/SidePanelTabs/comps/TabTitle.tsx b/app/pages/PageEnigma/comps/SidePanelTabs/comps/TabTitle.tsx index eda5831cba..e0af33215c 100644 --- a/app/pages/PageEnigma/comps/SidePanelTabs/comps/TabTitle.tsx +++ b/app/pages/PageEnigma/comps/SidePanelTabs/comps/TabTitle.tsx @@ -19,7 +19,7 @@ export function TabTitle({ title, onBack }: Props) { }; return ( -
+
{onBack ? (
@@ -28,7 +28,12 @@ export function TabTitle({ title, onBack }: Props) { ) : (
{title}
)} - +
); } diff --git a/app/pages/PageEnigma/comps/SidePanelTabs/itemTabs/StylizeTab/Prompts.tsx b/app/pages/PageEnigma/comps/SidePanelTabs/itemTabs/StylizeTab/Prompts.tsx index 9e43ed1681..24a7f14690 100644 --- a/app/pages/PageEnigma/comps/SidePanelTabs/itemTabs/StylizeTab/Prompts.tsx +++ b/app/pages/PageEnigma/comps/SidePanelTabs/itemTabs/StylizeTab/Prompts.tsx @@ -43,11 +43,11 @@ export const Prompts = () => { }; return ( -
+