From 1fd31497eba18ee6029374b8188d253e1ccfad0b Mon Sep 17 00:00:00 2001
From: mulan xia <mulanjxia@gmail.com>
Date: Tue, 23 Jan 2024 15:21:34 -0500
Subject: [PATCH] move files, fix text colors

---
 src/components/Button.tsx                         |  4 ++--
 src/{styles/colors => constants/styles}/base.ts   |  0
 src/{styles/colors => constants/styles}/colors.ts |  0
 src/styles/globalStyle.ts                         | 10 +++++-----
 src/styles/themes.ts                              |  4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)
 rename src/{styles/colors => constants/styles}/base.ts (100%)
 rename src/{styles/colors => constants/styles}/colors.ts (100%)

diff --git a/src/components/Button.tsx b/src/components/Button.tsx
index 9c88ac9..dff6cdb 100644
--- a/src/components/Button.tsx
+++ b/src/components/Button.tsx
@@ -89,7 +89,7 @@ const buttonActionVariants = {
     --button-border: solid var(--border-width) var(--color-border);
   `,
   [ButtonAction.Primary]: css`
-    --button-textColor: var(--color-text-0);
+    --button-textColor: var(--color-text-2);
     --button-backgroundColor: var(--color-accent);
     --button-border: solid var(--border-width) var(--color-border-white);
   `,
@@ -107,7 +107,7 @@ const buttonActionVariants = {
   `,
 
   [ButtonAction.Destroy]: css`
-    --button-textColor: var(--color-text-0);
+    --button-textColor: var(--color-text-2);
     --button-backgroundColor: var(--color-negative);
     --button-border: solid var(--border-width) var(--color-border-white);
   `,
diff --git a/src/styles/colors/base.ts b/src/constants/styles/base.ts
similarity index 100%
rename from src/styles/colors/base.ts
rename to src/constants/styles/base.ts
diff --git a/src/styles/colors/colors.ts b/src/constants/styles/colors.ts
similarity index 100%
rename from src/styles/colors/colors.ts
rename to src/constants/styles/colors.ts
diff --git a/src/styles/globalStyle.ts b/src/styles/globalStyle.ts
index 065c495..f3579f2 100644
--- a/src/styles/globalStyle.ts
+++ b/src/styles/globalStyle.ts
@@ -12,12 +12,12 @@ export const GlobalStyle = createGlobalStyle`
     --color-layer-7: ${({ theme }) => theme.layer7};
 
     --color-border: ${({ theme }) => theme.borderDefault};
-    --color-border-white: ${({ theme }) => theme.borderButton}; //xcxc
-    --color-border-red: ${({ theme }) => theme.borderDestructive}; //xcxc
+    --color-border-white: ${({ theme }) => theme.borderButton};
+    --color-border-red: ${({ theme }) => theme.borderDestructive};
 
-    --color-text-0: ${({ theme }) => theme.textPrimary}; //xcxc
-    --color-text-1: ${({ theme }) => theme.textSecondary}; //xcxc
-    --color-text-2: ${({ theme }) => theme.textTertiary}; //xcxc
+    --color-text-0: ${({ theme }) => theme.textTertiary};
+    --color-text-1: ${({ theme }) => theme.textSecondary};
+    --color-text-2: ${({ theme }) => theme.textPrimary};
 
     --color-accent: ${({ theme }) => theme.accent};
     --color-favorite: ${({ theme }) => theme.favorite};
diff --git a/src/styles/themes.ts b/src/styles/themes.ts
index 315ef9f..106ad72 100644
--- a/src/styles/themes.ts
+++ b/src/styles/themes.ts
@@ -1,6 +1,6 @@
 import { AppTheme } from '@/state/configs';
-import { ThemeColors } from '@/styles/colors/colors';
-import { ColorToken } from '@/styles/colors/base';
+import { ThemeColors } from '@/constants/styles/colors';
+import { ColorToken } from '@/constants/styles/base';
 
 const ClassicTheme: ThemeColors = {
   layer0: ColorToken.GrayBlue7,