fix(): Reintroduce extends.

CQCL · Sep 26, 2024 · 4f8c6fb · 4f8c6fb
1 parent f238cb7
commit 4f8c6fb
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 60 deletions.
diff --git a/src/tailwindTheme.ts b/src/tailwindTheme.ts
@@ -11,66 +11,68 @@ export const tailwindTheme = {
         "2xl": "1400px",
       },
     },
-    colors: {
-      quantinuum: "hsl(var(--quantinuum))",
-      border: "hsl(var(--border))",
-      input: "hsl(var(--input))",
-      ring: "hsl(var(--ring))",
-      background: "hsl(var(--background))",
-      foreground: "hsl(var(--foreground))",
-      primary: {
-        DEFAULT: "hsl(var(--primary))",
-        foreground: "hsl(var(--primary-foreground))",
+    extend: {
+      colors: {
+        quantinuum: "hsl(var(--quantinuum))",
+        border: "hsl(var(--border))",
+        input: "hsl(var(--input))",
+        ring: "hsl(var(--ring))",
+        background: "hsl(var(--background))",
+        foreground: "hsl(var(--foreground))",
+        primary: {
+          DEFAULT: "hsl(var(--primary))",
+          foreground: "hsl(var(--primary-foreground))",
+        },
+        secondary: {
+          DEFAULT: "hsl(var(--secondary))",
+          foreground: "hsl(var(--secondary-foreground))",
+        },
+        destructive: {
+          DEFAULT: "hsl(var(--destructive))",
+          foreground: "hsl(var(--destructive-foreground))",
+        },
+        muted: {
+          DEFAULT: "hsl(var(--muted))",
+          foreground: "hsl(var(--muted-foreground))",
+        },
+        accent: {
+          DEFAULT: "hsl(var(--accent))",
+          foreground: "hsl(var(--accent-foreground))",
+        },
+        popover: {
+          DEFAULT: "hsl(var(--popover))",
+          foreground: "hsl(var(--popover-foreground))",
+        },
+        card: {
+          DEFAULT: "hsl(var(--card))",
+          foreground: "hsl(var(--card-foreground))",
+        },
       },
-      secondary: {
-        DEFAULT: "hsl(var(--secondary))",
-        foreground: "hsl(var(--secondary-foreground))",
+      borderRadius: {
+        xl: `calc(var(--radius) + 4px)`,
+        lg: "var(--radius)",
+        md: "calc(var(--radius) - 2px)",
+        sm: "calc(var(--radius) - 4px)",
       },
-      destructive: {
-        DEFAULT: "hsl(var(--destructive))",
-        foreground: "hsl(var(--destructive-foreground))",
+      keyframes: {
+        "accordion-down": {
+          from: { height: "0" },
+          to: { height: "var(--radix-accordion-content-height)" },
+        },
+        "accordion-up": {
+          from: { height: "var(--radix-accordion-content-height)" },
+          to: { height: "0" },
+        },
+        "slide-up": {
+          from: { opacity: "0", transform: "translateY(50%)" },
+          to: { opacity: "1", transform: "translateY(0)" },
+        },
       },
-      muted: {
-        DEFAULT: "hsl(var(--muted))",
-        foreground: "hsl(var(--muted-foreground))",
+      animation: {
+        "accordion-down": "accordion-down 0.2s ease-out",
+        "accordion-up": "accordion-up 0.2s ease-out",
+        "slide-up": "slide-up 0.6s ease-in",
       },
-      accent: {
-        DEFAULT: "hsl(var(--accent))",
-        foreground: "hsl(var(--accent-foreground))",
-      },
-      popover: {
-        DEFAULT: "hsl(var(--popover))",
-        foreground: "hsl(var(--popover-foreground))",
-      },
-      card: {
-        DEFAULT: "hsl(var(--card))",
-        foreground: "hsl(var(--card-foreground))",
-      },
-    },
-    borderRadius: {
-      xl: `calc(var(--radius) + 4px)`,
-      lg: "var(--radius)",
-      md: "calc(var(--radius) - 2px)",
-      sm: "calc(var(--radius) - 4px)",
-    },
-    keyframes: {
-      "accordion-down": {
-        from: { height: "0" },
-        to: { height: "var(--radix-accordion-content-height)" },
-      },
-      "accordion-up": {
-        from: { height: "var(--radix-accordion-content-height)" },
-        to: { height: "0" },
-      },
-      "slide-up": {
-        from: { opacity: "0", transform: "translateY(50%)" },
-        to: { opacity: "1", transform: "translateY(0)" },
-      },
-    },
-    animation: {
-      "accordion-down": "accordion-down 0.2s ease-out",
-      "accordion-up": "accordion-up 0.2s ease-out",
-      "slide-up": "slide-up 0.6s ease-in",
     },
   },
   plugins: [animate, typography],

diff --git a/src/tokens.css b/src/tokens.css
@@ -11,7 +11,7 @@
   --secondary-foreground: 240 5.9% 10%;
   --muted: 240 4.8% 95.9%;
   --muted-foreground: 240 3.8% 46.1%;
-  --accent: 240 4.8% 95.9%;
+  --accent: 170 40% 61%;
   --accent-foreground: 240 5.9% 10%;
   --destructive: 0 84.2% 60.2%;
   --destructive-foreground: 0 0% 98%;
@@ -41,7 +41,7 @@
   --secondary-foreground: 0 0% 98%;
   --muted: 240 5.9% 10%;
   --muted-foreground: 240 5% 64.9%;
-  --accent: 240 5.9% 10%
+  --accent: 170 40% 61%;
   --accent-foreground: 0 0% 98%;
   --destructive: 0 62.8% 30.6%;
   --destructive-foreground: 0 0% 98%;
@@ -53,5 +53,5 @@
   --chart-3: 30 80% 55%;
   --chart-4: 280 65% 60%;
   --chart-5: 340 75% 55%;
-  --quantinuum: 170 54% 41%;
+  --quantinuum: 170 40% 61%;
 }
diff --git a/stories/shadcn/badge.stories.tsx b/stories/shadcn/badge.stories.tsx
@@ -8,7 +8,7 @@ export function BadgeDemo() {
       <Badge variant='destructive'>Destructive</Badge>
       <Badge variant='outline'>Outlined</Badge>
       <Badge variant='secondary'>Secondary</Badge>
-      <Badge variant='secondary' className='bg-quantinuum'>
+      <Badge variant='secondary' className='text-background bg-quantinuum'>
         Secondary
       </Badge>
     </div>