organize code

styles/components/dashboard.ts

@@ -108,7 +108,7 @@ export const dashboard = css`
             background: #0000;
             &:hover {
               background: ${themeVars.github.control.transparent.bgColor.hover};
-              color: ${themeVars.color.text.self}
+              color: ${themeVars.color.text.self};
             }
           }
           .ui.circular.label {

themes/catppuccin.ts

@@ -36,10 +36,3 @@ export const catppuccinLatteTheme = defineCatppuccinTheme(flavors.latte);
 export const catppuccinFrappeTheme = defineCatppuccinTheme(flavors.frappe);
 export const catppuccinMacchiatoTheme = defineCatppuccinTheme(flavors.macchiato);
 export const catppuccinMochaTheme = defineCatppuccinTheme(flavors.mocha);
-
-export default {
-  catppuccinLatteTheme,
-  catppuccinFrappeTheme,
-  catppuccinMacchiatoTheme,
-  catppuccinMochaTheme,
-};

themes/github.ts

@@ -79,26 +79,3 @@ export const githubLightTritanopiaHighContrastTheme = defineGitHubTheme(githubLi
 export const githubPinkDarkTheme = defineGitHubTheme(githubPinkDarkColor);
 export const githubPinkSoftDarkTheme = defineGitHubTheme(githubPinkSoftDarkColor);
 export const githubPinkLightTheme = defineGitHubTheme(githubPinkLightColor);
-
-export default {
-  // 普通主题
-  githubDarkTheme,
-  githubSoftDarkTheme,
-  githubColorblindDarkTheme,
-  githubTritanopiaDarkTheme,
-  githubLightTheme,
-  githubColorblindLightTheme,
-  githubTritanopiaLightTheme,
-  // 高对比度主题
-  githubDarkHighContrastTheme,
-  githubDarkColorblindHighContrastTheme,
-  githubDarkTritanopiaHighContrastTheme,
-  githubSoftDarkHighContrastTheme,
-  githubLightHighContrastTheme,
-  githubLightColorblindHighContrastTheme,
-  githubLightTritanopiaHighContrastTheme,
-  // 自定义主题
-  githubPinkDarkTheme,
-  githubPinkSoftDarkTheme,
-  githubPinkLightTheme,
-};

themes/index.ts

@@ -1,5 +1,5 @@
 /*!
- * Copyright (c) https://github.com/lutinglt
+ * Copyright (c) https://com/lutinglt
  *
  * See the NOTICE file distributed with this work for additional
  * information regarding copyright ownership.
@@ -17,40 +17,63 @@
  * limitations under the License.
  */
 
-import catppuccin from "./catppuccin";
+import {
+  catppuccinFrappeTheme,
+  catppuccinLatteTheme,
+  catppuccinMacchiatoTheme,
+  catppuccinMochaTheme,
+} from "./catppuccin";
 import { giteaDarkTheme } from "./giteaDark";
 import { giteaLightTheme } from "./giteaLight";
-import github from "./github";
+import {
+  githubColorblindDarkTheme,
+  githubColorblindLightTheme,
+  githubDarkColorblindHighContrastTheme,
+  githubDarkHighContrastTheme,
+  githubDarkTheme,
+  githubDarkTritanopiaHighContrastTheme,
+  githubLightColorblindHighContrastTheme,
+  githubLightHighContrastTheme,
+  githubLightTheme,
+  githubLightTritanopiaHighContrastTheme,
+  githubPinkDarkTheme,
+  githubPinkLightTheme,
+  githubPinkSoftDarkTheme,
+  githubSoftDarkHighContrastTheme,
+  githubSoftDarkTheme,
+  githubTritanopiaDarkTheme,
+  githubTritanopiaLightTheme,
+} from "./github";
 
 export default {
   github: {
-    dark: github.githubDarkTheme,
-    light: github.githubLightTheme,
-    softDark: github.githubSoftDarkTheme,
+    dark: githubDarkTheme,
+    light: githubLightTheme,
+    softDark: githubSoftDarkTheme,
     colorblind: {
-      dark: github.githubColorblindDarkTheme,
-      light: github.githubColorblindLightTheme,
+      dark: githubColorblindDarkTheme,
+      light: githubColorblindLightTheme,
     },
     tritanopia: {
-      dark: github.githubTritanopiaDarkTheme,
-      light: github.githubTritanopiaLightTheme,
+      dark: githubTritanopiaDarkTheme,
+      light: githubTritanopiaLightTheme,
     },
     pink: {
-      dark: github.githubPinkDarkTheme,
-      light: github.githubPinkLightTheme,
-      softDark: github.githubPinkSoftDarkTheme,
+      dark: githubPinkDarkTheme,
+      light: githubPinkLightTheme,
+      softDark: githubPinkSoftDarkTheme,
     },
     highContrast: {
-      dark: github.githubDarkHighContrastTheme,
-      light: github.githubLightHighContrastTheme,
-      softDark: github.githubSoftDarkHighContrastTheme,
+      dark: githubDarkHighContrastTheme,
+      light: githubLightHighContrastTheme,
+      softDark: githubSoftDarkHighContrastTheme,
       colorblind: {
-        dark: github.githubDarkColorblindHighContrastTheme,
-        light: github.githubLightColorblindHighContrastTheme,
+        dark: githubDarkColorblindHighContrastTheme,
+        light: githubLightColorblindHighContrastTheme,
       },
       tritanopia: {
-        dark: github.githubDarkTritanopiaHighContrastTheme,
-        light: github.githubLightTritanopiaHighContrastTheme,
+        dark: githubDarkTritanopiaHighContrastTheme,
+        light: githubLightTritanopiaHighContrastTheme,
       },
     },
   },
@@ -59,9 +82,9 @@ export default {
     light: giteaLightTheme,
   },
   catppuccin: {
-    latte: catppuccin.catppuccinLatteTheme,
-    frappe: catppuccin.catppuccinFrappeTheme,
-    macchiato: catppuccin.catppuccinMacchiatoTheme,
-    mocha: catppuccin.catppuccinMochaTheme,
+    latte: catppuccinLatteTheme,
+    frappe: catppuccinFrappeTheme,
+    macchiato: catppuccinMacchiatoTheme,
+    mocha: catppuccinMochaTheme,
   },
 };