Skip to content

Commit

Permalink
Merge pull request #1030 from lumapps/feat/refine-colors
Browse files Browse the repository at this point in the history
feat(design-tokens): update color values
  • Loading branch information
gcornut authored Dec 4, 2023
2 parents db76829 + 6bf75b1 commit 46091c6
Show file tree
Hide file tree
Showing 10 changed files with 276 additions and 266 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- `@lumx/icons`: override & alias system in place. now custom icon fonts are now generated from MDI fonts we extend.
- `@lumx/icons`: override Twitter logo to use the new X logo.
- `@lumx/core`: make component spacing styles default to CSS variables.
- `@lumx/core`: make component border styles default to CSS variables.
- `@lumx/core`: change text-field background to transparent.
- `@lumx/core`: minor change on tabs color.
- `@lumx/core`: minor change on navigation colors.
- `@lumx/core`: minor change on button colors.

## [3.5.5][] - 2023-11-13

Expand Down
104 changes: 52 additions & 52 deletions packages/lumx-core/src/css/design-tokens.css

Large diffs are not rendered by default.

248 changes: 126 additions & 122 deletions packages/lumx-core/src/js/constants/design-tokens.ts

Large diffs are not rendered by default.

104 changes: 52 additions & 52 deletions packages/lumx-core/src/scss/_design-tokens.scss

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
},
"theme-dark": {
"background-color": "{color.light.L5}",
"color": "{color.light.N}",
"color": "{color.light.L1}",
"border-color": { "value": "transparent" }
}
},
Expand All @@ -81,7 +81,7 @@
},
"theme-dark": {
"background-color": "{color.light.L4}",
"color": "{color.light.N}",
"color": "{color.light.L1}",
"border-color": { "value": "transparent" }
}
},
Expand All @@ -97,7 +97,7 @@
},
"theme-dark": {
"background-color": "{color.light.L3}",
"color": "{color.light.N}",
"color": "{color.light.L1}",
"border-color": { "value": "transparent" }
}
}
Expand All @@ -115,7 +115,7 @@
},
"theme-dark": {
"background-color": { "value": "transparent" },
"color": "{color.light.N}",
"color": "{color.light.L1}",
"border-color": { "value": "transparent" }
}
},
Expand All @@ -131,7 +131,7 @@
},
"theme-dark": {
"background-color": "{color.light.L5}",
"color": "{color.light.N}",
"color": "{color.light.L1}",
"border-color": { "value": "transparent" }
}
},
Expand All @@ -147,7 +147,7 @@
},
"theme-dark": {
"background-color": "{color.light.L4}",
"color": "{color.light.N}",
"color": "{color.light.L1}",
"border-color": { "value": "transparent" }
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,19 @@
},
"theme-light": {
"background-color": { "value": "transparent" },
"border-color": "{color.dark.L5}",
"border-color": "{color.dark.L4}",
"icon-color": "{color.dark.L1}",
"label-color": "{color.dark.N}",
"chevron-background-color": { "value": "transparent" },
"chevron-color": "{color.dark.L1}"
},
"theme-dark": {
"background-color": { "value": "transparent" },
"border-color": "{color.light.L5}",
"icon-color": "{color.light.N}",
"border-color": "{color.light.L4}",
"icon-color": "{color.light.L1}",
"label-color": "{color.light.N}",
"chevron-background-color": { "value": "transparent" },
"chevron-color": "{color.light.N}"
"chevron-color": "{color.light.L1}"
}
},
"state-hover": {
Expand All @@ -56,19 +56,19 @@
},
"theme-light": {
"background-color": "{color.dark.L5}",
"border-color": "{color.dark.L5}",
"border-color": "{color.dark.L4}",
"icon-color": "{color.dark.L1}",
"label-color": "{color.dark.N}",
"chevron-background-color": "{color.dark.L5}",
"chevron-color": "{color.dark.L1}"
},
"theme-dark": {
"background-color": "{color.light.L5}",
"border-color": "{color.light.L5}",
"icon-color": "{color.light.N}",
"border-color": "{color.light.L4}",
"icon-color": "{color.light.L1}",
"label-color": "{color.light.N}",
"chevron-background-color": "{color.light.L5}",
"chevron-color": "{color.light.N}"
"chevron-color": "{color.light.L1}"
}
},
"state-active": {
Expand All @@ -88,19 +88,19 @@
},
"theme-light": {
"background-color": "{color.dark.L4}",
"border-color": "{color.dark.L5}",
"border-color": "{color.dark.L4}",
"icon-color": "{color.dark.L1}",
"label-color": "{color.dark.N}",
"chevron-background-color": "{color.dark.L4}",
"chevron-color": "{color.dark.L1}"
},
"theme-dark": {
"background-color": "{color.light.L4}",
"border-color": "{color.light.L5}",
"icon-color": "{color.light.N}",
"border-color": "{color.light.L4}",
"icon-color": "{color.light.L1}",
"label-color": "{color.light.N}",
"chevron-background-color": "{color.light.L4}",
"chevron-color": "{color.light.N}"
"chevron-color": "{color.light.L1}"
}
}
},
Expand Down Expand Up @@ -130,7 +130,7 @@
},
"theme-dark": {
"background-color": "{color.light.L3}",
"border-color": "{color.light.L5}",
"border-color": "{color.light.N}",
"icon-color": "{color.light.N}",
"label-color": "{color.light.N}",
"chevron-background-color": { "value": "transparent" },
Expand Down Expand Up @@ -162,7 +162,7 @@
},
"theme-dark": {
"background-color": "{color.light.L4}",
"border-color": "{color.light.L5}",
"border-color": "{color.light.N}",
"icon-color": "{color.light.N}",
"label-color": "{color.light.N}",
"chevron-background-color": "{color.light.L4}",
Expand Down Expand Up @@ -194,7 +194,7 @@
},
"theme-dark": {
"background-color": "{color.light.L5}",
"border-color": "{color.light.L5}",
"border-color": "{color.light.N}",
"icon-color": "{color.light.N}",
"label-color": "{color.light.N}",
"chevron-background-color": "{color.light.L5}",
Expand Down
24 changes: 12 additions & 12 deletions packages/lumx-core/style-dictionary/properties/components/tabs.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
"theme-light": {
"background-color": { "value": "transparent" },
"color": "{color.dark.L1}",
"border-color": "{color.dark.L5}"
"border-color": "{color.dark.L4}"
},
"theme-dark": {
"background-color": { "value": "transparent" },
"color": "{color.light.N}",
"border-color": "{color.light.L5}"
"color": "{color.light.L1}",
"border-color": "{color.light.L4}"
}
},
"state-hover": {
Expand All @@ -48,12 +48,12 @@
"theme-light": {
"background-color": "{color.dark.L5}",
"color": "{color.dark.L1}",
"border-color": "{color.dark.L5}"
"border-color": "{color.dark.L4}"
},
"theme-dark": {
"background-color": "{color.light.L5}",
"color": "{color.light.N}",
"border-color": "{color.light.L5}"
"color": "{color.light.L1}",
"border-color": "{color.light.L4}"
}
},
"state-active": {
Expand All @@ -74,12 +74,12 @@
"theme-light": {
"background-color": "{color.dark.L4}",
"color": "{color.dark.L1}",
"border-color": "{color.dark.L5}"
"border-color": "{color.dark.L4}"
},
"theme-dark": {
"background-color": "{color.light.L4}",
"color": "{color.light.N}",
"border-color": "{color.light.L5}"
"color": "{color.light.L1}",
"border-color": "{color.light.L4}"
}
}
},
Expand All @@ -106,7 +106,7 @@
},
"theme-dark": {
"background-color": { "value": "transparent" },
"color": "{color.light.N}",
"color": "{color.light.L1}",
"border-color": "{color.light.N}"
}
},
Expand All @@ -132,7 +132,7 @@
},
"theme-dark": {
"background-color": "{color.light.L5}",
"color": "{color.light.N}",
"color": "{color.light.L1}",
"border-color": "{color.light.N}"
}
},
Expand All @@ -158,7 +158,7 @@
},
"theme-dark": {
"background-color": "{color.light.L4}",
"color": "{color.light.N}",
"color": "{color.light.L1}",
"border-color": "{color.light.N}"
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
}
},
"input": {
"background-color": "{color.light.N}",
"background-color": { "value": "transparent" },
"border-color": "{color.primary.N}",
"content": {
"color": "{color.dark.N}"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"border-radius": { "value": "4px" }
"border-radius": { "value": "4px", "preferCSSVariable": true }
}
10 changes: 5 additions & 5 deletions packages/lumx-core/style-dictionary/properties/core/spacing.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"spacing": {
"unit": {
"tiny": { "value": "4px" },
"regular": { "value": "8px" },
"medium": { "value": "12px" },
"big": { "value": "16px" },
"huge": { "value": "24px" }
"tiny": { "value": "4px", "preferCSSVariable": true },
"regular": { "value": "8px", "preferCSSVariable": true },
"medium": { "value": "12px", "preferCSSVariable": true },
"big": { "value": "16px", "preferCSSVariable": true },
"huge": { "value": "24px", "preferCSSVariable": true }
}
}
}

0 comments on commit 46091c6

Please sign in to comment.