diff --git a/config.json b/config.json index 658b53a..6edf714 100644 --- a/config.json +++ b/config.json @@ -17,23 +17,20 @@ "bitcoin": "14KvY3Pg2GKyaxGzkHAh2gNtapZeKd4jM2" }, "colors": { - "light": { - "background": "#FBF1C9", - "foreground": "#3C3836", - "yellow": "#D79921", - "green": "#98971A", - "gray": "#7C6F64", - "blue": "#458588", - "red": "#CA2124" - }, - "dark": { - "background": "#2E3440", - "foreground": "#E5E9F0", - "yellow": "#5E81AC", - "green": "#A3BE8C", - "gray": "#88C0D0", - "blue": "#EBCB8B", - "red": "#BF616A" - } + "light-background": "#FBF1C9", + "light-foreground": "#3C3836", + "light-yellow": "#D79921", + "light-green": "#98971A", + "light-gray": "#7C6F64", + "light-blue": "#458588", + "light-red": "#CA2124", + + "dark-background": "#2E3440", + "dark-foreground": "#E5E9F0", + "dark-yellow": "#5E81AC", + "dark-green": "#A3BE8C", + "dark-gray": "#88C0D0", + "dark-blue": "#EBCB8B", + "dark-red": "#BF616A" } } diff --git a/src/styles/global.css b/src/styles/global.css index 6f42924..e8a409d 100644 --- a/src/styles/global.css +++ b/src/styles/global.css @@ -1,6 +1,5 @@ -@tailwind base; -@tailwind components; -@tailwind utilities; +@import "tailwindcss"; +@config "../../tailwind.config.js"; @font-face { font-family: 'Hack'; diff --git a/src/utils/bin/commands.ts b/src/utils/bin/commands.ts index fb8bc40..b2cb856 100644 --- a/src/utils/bin/commands.ts +++ b/src/utils/bin/commands.ts @@ -132,7 +132,7 @@ export const sumfetch = (args?: string[]): string => { d888 ,%888b. ----------- d88% %%%8--'-.  DONATE /88:.__ , _%-' --- -  ${config.donate_urls.paypal} - '''::===..-' = --. '  ${config.donate_urls.bitcoin} + '''::===..-' = --. '  ${config.donate_urls.bitcoin} `; }; diff --git a/tailwind.config.js b/tailwind.config.js index 2c63b9b..2b70872 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -5,17 +5,11 @@ module.exports = { './src/pages/**/*.{js,ts,jsx,tsx}', './src/components/**/*.{js,ts,jsx,tsx}', ], - darkMode: 'media', // or 'media' or 'class' + darkMode: 'media', theme: { - colors: { - transparent: 'transparent', - current: 'currentColor', - ...colors, + extend: { + colors, }, - extend: {}, - }, - variants: { - extend: {}, }, plugins: [], }; diff --git a/tsconfig.json b/tsconfig.json index 5fe0c70..616cdcc 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -14,7 +14,7 @@ "incremental": true, "esModuleInterop": true, "module": "esnext", - "moduleResolution": "node", + "moduleResolution": "bundler", "resolveJsonModule": true, "isolatedModules": true, "jsx": "react-jsx"