[restore] conflict notification commits restore

2026-04-28 10:12:11 +00:00 · 2025-08-02 12:49:53 +09:00
parent eccd7ca2cd
commit 28250aa132
67 changed files with 7296 additions and 243 deletions
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -173,6 +173,20 @@ export default {
          800: '#9c4221',
          900: '#7b341e',
          950: '#431407'
+        },
+
+        yellow: {
+          50: '#fffef5',
+          100: '#fffce8',
+          200: '#fff8c5',
+          300: '#fff197',
+          400: '#ffcc00',
+          500: '#ffc000',
+          600: '#e6a800',
+          700: '#cc9600',
+          800: '#b38400',
+          900: '#997200',
+          950: '#664d00'
        }
      },