From f1cf55c125856c81c7d6bc264ed44ec2ba70fe0f Mon Sep 17 00:00:00 2001 From: G Date: Wed, 11 Sep 2024 10:54:46 +0000 Subject: [PATCH] decoupled text variants --- src/themes/Theme.tsx | 48 ++---------------------------------------------- src/themes/Variants.tsx | 5 ----- src/themes/variants/textVariants.ts | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 51 deletions(-) create mode 100644 src/themes/variants/textVariants.ts diff --git a/src/themes/Theme.tsx b/src/themes/Theme.tsx index ccf6f12..64873e2 100644 --- a/src/themes/Theme.tsx +++ b/src/themes/Theme.tsx @@ -1,6 +1,7 @@ import { createTheme } from "@shopify/restyle"; import { buttonVariants } from "./variants/buttonVariants"; import { cardVariants } from "./variants/cardVariants"; +import { textVariants } from "./variants/textVariants"; const palette = { purpleLight: "#8C6FF7", @@ -61,52 +62,7 @@ const theme = createTheme({ phone: 0, tablet: 768, }, - textVariants: { - defaults: { - // We can define a default text variant here. - color: "gray", - }, - - header: { - fontWeight: "bold", - fontSize: 34, - }, - body: { - fontSize: 16, - lineHeight: 24, - }, - primary: { - color: "primary", - }, - secondary: { - color: "secondary", - }, - black: { - color: "black", - }, - white: { - color: "white", - }, - gray: { - color: "gray", - }, - lightGray: { - color: "lightGray", - }, - error: { - color: "red", - }, - softRed: { - color: "softRed", - }, - yellow: { - color: "softYellow", - }, - - softYellow: { - color: "softYellow", - }, - }, + textVariants, cardVariants, buttonVariants, }); diff --git a/src/themes/Variants.tsx b/src/themes/Variants.tsx index c43835f..acebcea 100644 --- a/src/themes/Variants.tsx +++ b/src/themes/Variants.tsx @@ -11,9 +11,4 @@ export const buttonVariants = createVariant({ export const textVariants = createVariant({ themeKey: "textVariants", - defaults: { - fontSize: 16, - fontWeight: "normal", - color: "gray", - }, }); diff --git a/src/themes/variants/textVariants.ts b/src/themes/variants/textVariants.ts new file mode 100644 index 0000000..a54da06 --- /dev/null +++ b/src/themes/variants/textVariants.ts @@ -0,0 +1,47 @@ +export const textVariants = { + defaults: { + // fontSize: 16, + // fontWeight: "normal", + color: "gray", + }, + + header: { + fontWeight: "bold", + fontSize: 34, + }, + body: { + fontSize: 16, + lineHeight: 24, + }, + primary: { + color: "primary", + }, + secondary: { + color: "secondary", + }, + black: { + color: "black", + }, + white: { + color: "white", + }, + gray: { + color: "gray", + }, + lightGray: { + color: "lightGray", + }, + error: { + color: "red", + }, + softRed: { + color: "softRed", + }, + yellow: { + color: "softYellow", + }, + + softYellow: { + color: "softYellow", + }, +}; -- libgit2 0.27.1