Skip to content

Commit fdea27b

Browse files
authored
Merge pull request #90 from nativeui-org/hotfix
feat(theme): add muted and toggle colors to theme configuration
2 parents 0afac2c + 043c691 commit fdea27b

File tree

1 file changed

+39
-17
lines changed

1 file changed

+39
-17
lines changed

app/(site)/docs/installation/page.tsx

Lines changed: 39 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,10 @@ module.exports = {
232232
DEFAULT: "rgb(var(--color-foreground) / <alpha-value>)",
233233
muted: "rgb(var(--color-foreground-muted) / <alpha-value>)",
234234
},
235+
muted: {
236+
DEFAULT: "rgb(var(--color-muted) / <alpha-value>)",
237+
foreground: "rgb(var(--color-muted-foreground) / <alpha-value>)",
238+
},
235239
destructive: {
236240
DEFAULT: "rgb(var(--color-destructive) / <alpha-value>)",
237241
foreground: "rgb(var(--color-destructive-foreground) / <alpha-value>)",
@@ -249,27 +253,31 @@ module.exports = {
249253
foreground: "rgb(var(--color-info-foreground) / <alpha-value>)",
250254
},
251255
card: {
252-
DEFAULT: "rgb(var(--card-rgb) / <alpha-value>)",
253-
foreground: "rgb(var(--card-foreground-rgb) / <alpha-value>)",
256+
DEFAULT: "rgb(var(--color-card) / <alpha-value>)",
257+
foreground: "rgb(var(--color-card-foreground) / <alpha-value>)",
254258
},
255259
popover: {
256-
DEFAULT: "rgb(var(--popover-rgb) / <alpha-value>)",
257-
foreground: "rgb(var(--popover-foreground-rgb) / <alpha-value>)",
260+
DEFAULT: "rgb(var(--color-popover) / <alpha-value>)",
261+
foreground: "rgb(var(--color-popover-foreground) / <alpha-value>)",
258262
},
259263
accent: {
260-
DEFAULT: "rgb(var(--accent-rgb) / <alpha-value>)",
261-
foreground: "rgb(var(--accent-foreground-rgb) / <alpha-value>)",
264+
DEFAULT: "rgb(var(--color-accent) / <alpha-value>)",
265+
foreground: "rgb(var(--color-accent-foreground) / <alpha-value>)",
262266
},
263267
border: {
264-
DEFAULT: "rgb(var(--border-rgb) / <alpha-value>)",
265-
foreground: "rgb(var(--border-foreground-rgb) / <alpha-value>)",
268+
DEFAULT: "rgb(var(--border) / <alpha-value>)",
269+
foreground: "rgb(var(--border-foreground) / <alpha-value>)",
266270
},
267271
input: {
268-
DEFAULT: "rgb(var(--input-rgb) / <alpha-value>)",
269-
foreground: "rgb(var(--input-foreground-rgb) / <alpha-value>)",
272+
DEFAULT: "rgb(var(--input) / <alpha-value>)",
273+
foreground: "rgb(var(--input-foreground) / <alpha-value>)",
274+
},
275+
276+
toggle: {
277+
active: "rgb(var(--toggle-active) / <alpha-value>)",
278+
"active-foreground": "rgb(var(--toggle-active-foreground) / <alpha-value>)",
279+
border: "rgb(var(--toggle-border) / <alpha-value>)",
270280
},
271-
ring: "rgb(var(--ring-rgb) / <alpha-value>)",
272-
radius: "var(--radius)",
273281
},
274282
},
275283
},
@@ -287,6 +295,8 @@ module.exports = {
287295
"--color-warning": "234 179 8",
288296
"--color-info": "59 130 246",
289297
"--color-muted": "115 115 115",
298+
"--toggle-active": "45 45 45",
299+
"--toggle-border": "229 231 235",
290300
},
291301
});
292302
},
@@ -326,9 +336,11 @@ export const themes = {
326336
"--color-secondary": "45 45 45",
327337
"--color-secondary-foreground": "255 255 255",
328338
"--color-foreground-muted": "115 115 115",
339+
"--color-muted-foreground": "115 115 115",
340+
"--color-muted": "240 240 240",
329341
330342
// Accent colors
331-
"--color-accent": "45 45 45",
343+
"--color-accent": "145 145 145",
332344
"--color-accent-foreground": "255 255 255",
333345
334346
// Status colors
@@ -350,6 +362,11 @@ export const themes = {
350362
"--input": "229 231 235",
351363
"--input-foreground": "13 13 13",
352364
"--ring": "13 13 13",
365+
366+
// Toggle specific colors
367+
"--toggle-active": "45 45 45",
368+
"--toggle-active-foreground": "255 255 255",
369+
"--toggle-border": "229 231 235",
353370
}),
354371
355372
dark: vars({
@@ -368,7 +385,9 @@ export const themes = {
368385
369386
// Secondary colors
370387
"--color-secondary": "58 58 58",
371-
"--color-muted": "163 163 163",
388+
"--color-muted": "75 85 99",
389+
"--color-foreground-muted": "209 213 219",
390+
"--color-muted-foreground": "209 213 219",
372391
373392
// Accent colors
374393
"--color-accent": "58 58 58",
@@ -388,11 +407,14 @@ export const themes = {
388407
"--color-info-foreground": "250 250 250",
389408
390409
// Borders, inputs and "rings"
391-
"--border": " 38 38 38",
392-
"--border-foreground": "250 250 250",
410+
"--border": "75 85 99",
393411
"--input": " 38 38 38",
394-
"--input-foreground": "250 250 250",
395412
"--ring": "212 212 212",
413+
414+
// Toggle specific colors
415+
"--toggle-active": "120 120 120",
416+
"--toggle-active-foreground": "250 250 250",
417+
"--toggle-border": "100 100 100",
396418
}),
397419
} as const;
398420
`}

0 commit comments

Comments
 (0)