fix: theme colors

Longhorn-Developers · Mar 8, 2024 · 2f537b4 · 2f537b4
1 parent 11303da
commit 2f537b4
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 136 deletions.
diff --git a/src/shared/util/themeColors.ts b/src/shared/util/themeColors.ts
@@ -18,6 +18,10 @@ export const colors = {
         red: '#AF2E2D',
         black: '#1A2024',
     },
+} as const satisfies Record<string, Record<string, string>>;
+
+export const extendedColors = {
+    ...colors,
     gradeDistribution: {
         a: '#22C55E',
         aminus: '#A3E635',
@@ -32,129 +36,7 @@ export const colors = {
         dminus: '#B91C1C',
         f: '#B91C1C',
     },
-    palette: {
-        slateBase: '#64748B',
-        slate200: '#e2e8f0',
-        slate300: '#cbd5e1',
-        slate400: '#94a3b8',
-        slate600: '#475569',
-        slate700: '#334155',
-        grayBase: '#6b7280',
-        gray200: '#e5e7eb',
-        gray300: '#d1d5db',
-        gray400: '#9ca3af',
-        gray600: '#4b5563',
-        gray700: '#374151',
-        stoneBase: '#78716c',
-        stone200: '#e7e5e4',
-        stone300: '#d6d3d1',
-        stone400: '#a8a29e',
-        stone600: '#57534e',
-        stone700: '#44403c',
-        redBase: '#ef4444',
-        red200: '#fecaca',
-        red300: '#fca5a5',
-        red400: '#f87171',
-        red600: '#dc2626',
-        red700: '#b91c1c',
-        orangeBase: '#f97316',
-        orange200: '#fed7aa',
-        orange300: '#fdba74',
-        orange400: '#fb923c',
-        orange600: '#ea580c',
-        orange700: '#c2410c',
-        amberBase: '#f59e0b',
-        amber200: '#fde68a',
-        amber300: '#fcd34d',
-        amber400: '#fbbf24',
-        amber600: '#d97706',
-        amber700: '#b45309',
-        yellowBase: '#eab308',
-        yellow200: '#fef08a',
-        yellow300: '#fde047',
-        yellow400: '#facc15',
-        yellow600: '#ca8a04',
-        yellow700: '#a16207',
-        limeBase: '#84cc16',
-        lime200: '#d9f99d',
-        lime300: '#bef264',
-        lime400: '#a3e635',
-        lime600: '#65a30d',
-        lime700: '#4d7c0f',
-        greenBase: '#22c55e',
-        green200: '#bbf7d0',
-        green300: '#86efac',
-        green400: '#4ade80',
-        green600: '#16a34a',
-        green700: '#15803d',
-        emeraldBase: '#10b981',
-        emerald200: '#a7f3d0',
-        emerald300: '#6ee7b7',
-        emerald400: '#34d399',
-        emerald600: '#059669',
-        emerald700: '#047857',
-        tealBase: '#14b8a6',
-        teal200: '#99f6e4',
-        teal300: '#5eead4',
-        teal400: '#2dd4bf',
-        teal600: '#0d9488',
-        teal700: '#0f766e',
-        cyanBase: '#06b6d4',
-        cyan200: '#a5f3fc',
-        cyan300: '#67e8f9',
-        cyan400: '#22d3ee',
-        cyan600: '#0891b2',
-        cyan700: '#0e7490',
-        skyBase: '#0ea5e9',
-        sky200: '#bae6fd',
-        sky300: '#7dd3fc',
-        sky400: '#38bdf8',
-        sky600: '#0284c7',
-        sky700: '#0369a1',
-        blueBase: '#3b82f6',
-        blue200: '#bfdbfe',
-        blue300: '#93c5fd',
-        blue400: '#60a5fa',
-        blue600: '#2563eb',
-        blue700: '#1d4ed8',
-        indigoBase: '#6366f1',
-        indigo200: '#c7d2fe',
-        indigo300: '#a5b4fc',
-        indigo400: '#818cf8',
-        indigo600: '#4f46e5',
-        indigo700: '#4338ca',
-        violetBase: '#8b5cf6',
-        violet200: '#ddd6fe',
-        violet300: '#c4b5fd',
-        violet400: '#a78bfa',
-        violet600: '#7c3aed',
-        violet700: '#6d28d9',
-        purpleBase: '#a855f7',
-        purple200: '#e9d5ff',
-        purple300: '#d8b4fe',
-        purple400: '#c084fc',
-        purple600: '#9333ea',
-        purple700: '#7e22ce',
-        fuschiaBase: '#d946ef',
-        fuschia200: '#f5d0fe',
-        fuschia300: '#f0abfc',
-        fuschia400: '#e879f9',
-        fuschia600: '#c026d3',
-        fuschia700: '#a21caf',
-        pinkBase: '#ec4899',
-        pink200: '#fbcfe8',
-        pink300: '#f9a8d4',
-        pink400: '#f472b6',
-        pink600: '#db2777',
-        pink700: '#be185d',
-        roseBase: '#f43f5e',
-        rose200: '#fecdd3',
-        rose300: '#fda4af',
-        rose400: '#fb7185',
-        rose600: '#e11d48',
-        rose700: '#be123c',
-    },
-} as const satisfies Record<string, Record<string, string>>;
+} as const;
 
 type NestedKeys<T> = {
     [K in keyof T]: T[K] extends Record<string, any> ? `${string & K}-${string & keyof T[K]}` : never;

diff --git a/src/views/components/injected/CourseCatalogInjectedPopup/GradeDistribution.tsx b/src/views/components/injected/CourseCatalogInjectedPopup/GradeDistribution.tsx
@@ -1,6 +1,6 @@
 import type { Course } from '@shared/types/Course';
 import type { Distribution, LetterGrade } from '@shared/types/Distribution';
-import { colors } from '@shared/util/themeColors';
+import { extendedColors } from '@shared/util/themeColors';
 import Spinner from '@views/components/common/Spinner/Spinner';
 import Text from '@views/components/common/Text/Text';
 import {
@@ -25,18 +25,18 @@ const DataStatus = {
 type DataStatusType = (typeof DataStatus)[keyof typeof DataStatus];
 
 const GRADE_COLORS = {
-    A: colors.gradeDistribution.a,
-    'A-': colors.gradeDistribution.aminus,
-    'B+': colors.gradeDistribution.bplus,
-    B: colors.gradeDistribution.b,
-    'B-': colors.gradeDistribution.bminus,
-    'C+': colors.gradeDistribution.cplus,
-    C: colors.gradeDistribution.c,
-    'C-': colors.gradeDistribution.cminus,
-    'D+': colors.gradeDistribution.dplus,
-    D: colors.gradeDistribution.d,
-    'D-': colors.gradeDistribution.dminus,
-    F: colors.gradeDistribution.f,
+    A: extendedColors.gradeDistribution.a,
+    'A-': extendedColors.gradeDistribution.aminus,
+    'B+': extendedColors.gradeDistribution.bplus,
+    B: extendedColors.gradeDistribution.b,
+    'B-': extendedColors.gradeDistribution.bminus,
+    'C+': extendedColors.gradeDistribution.cplus,
+    C: extendedColors.gradeDistribution.c,
+    'C-': extendedColors.gradeDistribution.cminus,
+    'D+': extendedColors.gradeDistribution.dplus,
+    D: extendedColors.gradeDistribution.d,
+    'D-': extendedColors.gradeDistribution.dminus,
+    F: extendedColors.gradeDistribution.f,
 } as const satisfies Record<LetterGrade, string>;
 
 /**