Skip to content

Commit

Permalink
Merge pull request #114 from intechstudio/feat/Colors
Browse files Browse the repository at this point in the history
ProfileCloud uses tailwind colors from UI-kit
  • Loading branch information
narayb authored Feb 7, 2025
2 parents 377f78a + 332f382 commit 1cc32de
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 80 deletions.
69 changes: 9 additions & 60 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"type": "module",
"dependencies": {
"@intechstudio/grid-protocol": "1.20250122.1457",
"@intechstudio/grid-uikit": "1.20241126.1622",
"@intechstudio/grid-uikit": "1.20250204.1847",
"@melt-ui/svelte": "^0.83.0",
"@toast-ui/editor": "^3.2.2",
"audit": "^0.0.6",
Expand Down
2 changes: 2 additions & 0 deletions src/app.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import "@intechstudio/grid-uikit/dist/app.css";

@tailwind base;
@tailwind components;
@tailwind utilities;
22 changes: 3 additions & 19 deletions tailwind.config.cjs
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
const defaultTheme = require("tailwindcss/defaultTheme");
const colors = require("tailwindcss/colors");
const uiKitConfig = require("@intechstudio/grid-uikit/tailwind.config");

/** @type {import('tailwindcss').Config} */
module.exports = {
mode: "jit",
darkMode: "class",
content: [
"./src/**/*.{html,js,svelte,ts}",
"./node_modules/@intechstudio/grid-uikit/dist/*.{html,js,svelte,ts}"
],
content: ["./src/**/*.{html,js,svelte,ts}"],
presets: [uiKitConfig], // Use the UI kit's Tailwind configuration as a preset
theme: {
extend: {
colors: {
Expand All @@ -23,21 +22,6 @@ module.exports = {
orange: colors.orange,
neutral: {
950: "#121212"
},
primary: {
DEFAULT: "#1e2628",
100: "#d3dcde",
200: "#b6c5c8",
300: "#99adb2",
400: "#7c969d",
500: "#627d83",
600: "#4d6166",
700: "#374549",
800: "#212a2c",
900: "#0b0e0f"
},
secondary: {
DEFAULT: "#2a3439"
}
},
fontFamily: {
Expand Down

0 comments on commit 1cc32de

Please sign in to comment.