fix(FE): resolve conflict pull branch development

This commit is contained in:
randy-ar
2025-12-03 21:21:42 +07:00
28 changed files with 4007 additions and 2126 deletions
+3 -3
View File
@@ -7,7 +7,7 @@
default: false;
prefersdark: false;
color-scheme: 'light';
/* Primary Colors */
--color-primary: oklch(39.4% 0.177 301.9);
--color-primary-content: oklch(87.5% 0.038 274.5);
@@ -22,7 +22,7 @@
/* Neutral Colors */
--color-neutral: oklch(22.4% 0.032 258.8);
--color-neutral-content: oklch(87.7% 0.016 257.0);
--color-neutral-content: oklch(87.7% 0.016 257);
/* Base Colors */
--color-base-100: oklch(100% 0 0); /* #ffffff */
@@ -33,7 +33,7 @@
/* Status/Utility Colors */
--color-info: oklch(67.4% 0.176 238.9);
--color-info-content: oklch(0% 0 0); /* #000000 */
--color-success: oklch(62.3% 0.147 149.0);
--color-success: oklch(62.3% 0.147 149);
--color-success-content: oklch(100% 0 0); /* #ffffff */
--color-warning: oklch(82.2% 0.165 91.9);
--color-warning-content: oklch(0% 0 0); /* #000000 */