Skip to content

Commit

Permalink
Merge pull request #277 from element-hq/renovate/major-compound-desig…
Browse files Browse the repository at this point in the history
…n-tokens
  • Loading branch information
t3chguy authored Nov 15, 2024
2 parents 413e28e + d544b84 commit 0fddc88
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 10 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"@types/react": "^18.2.21",
"@typescript-eslint/eslint-plugin": "^8.0.0",
"@typescript-eslint/parser": "^8.0.0",
"@vector-im/compound-design-tokens": "^1.6.1",
"@vector-im/compound-design-tokens": "^2.0.0",
"@vitejs/plugin-react": "^4.0.4",
"@vitest/coverage-v8": "^2.0.0",
"browserslist-to-esbuild": "^2.0.0",
Expand Down Expand Up @@ -118,7 +118,7 @@
"@fontsource/inconsolata": "^5",
"@fontsource/inter": "^5",
"@types/react": "*",
"@vector-im/compound-design-tokens": ">=1.6.1 <2.0.0",
"@vector-im/compound-design-tokens": ">=1.6.1 <3.0.0",
"react": "^18"
},
"peerDependenciesMeta": {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Dropdown/Dropdown.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ limitations under the License.
}

button.placeholder {
color: var(--cpd-color-text-placeholder);
color: var(--cpd-color-text-secondary);
}

.border {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Progress/Progress.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ limitations under the License.
flex-direction: column;
gap: var(--cpd-space-1x);

--cpd-progress-bar-main: var(--cpd-color-text-placeholder);
--cpd-progress-bar-main: var(--cpd-color-text-secondary);
--cpd-progress-bar-muted: var(--cpd-color-gray-800);

&[data-tint="green"] {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Search/Search.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ limitations under the License.
}

.input::placeholder {
color: var(--cpd-color-text-placeholder);
color: var(--cpd-color-text-secondary);
}

.input:focus::placeholder {
Expand Down
12 changes: 7 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1799,10 +1799,12 @@
resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==

"@vector-im/compound-design-tokens@^1.6.1":
version "1.9.1"
resolved "https://registry.yarnpkg.com/@vector-im/compound-design-tokens/-/compound-design-tokens-1.9.1.tgz#644dc7ca5ca251fd476af2a7c075e9d740c08871"
integrity sha512-zjI+PhoNLNrJrLU8whEGjzCuxdqIz6tM0ARYBMS8AG1vC+NlGak6Y21TWnzHT3VINNhnF+PiQ9lFWsU65GydOg==
"@vector-im/compound-design-tokens@^2.0.0":
version "2.0.0"
resolved "https://registry.yarnpkg.com/@vector-im/compound-design-tokens/-/compound-design-tokens-2.0.0.tgz#ba3abe9c687ff81b2c190573789fd261bd7c659f"
integrity sha512-4y2QQqB5sdMrvhlWlt5a7tQmUzmDgNX4P/tk44lBjR9FlLycZBBQmuNRyJvIUFELVLqS72262NdzqCNRMMQ3+A==
dependencies:
prettier "^3.3.3"

"@vitejs/plugin-react@^4.0.4":
version "4.3.3"
Expand Down Expand Up @@ -4692,7 +4694,7 @@ prettier-linter-helpers@^1.0.0:
dependencies:
fast-diff "^1.1.2"

prettier@3.3.3:
prettier@3.3.3, prettier@^3.3.3:
version "3.3.3"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.3.3.tgz#30c54fe0be0d8d12e6ae61dbb10109ea00d53105"
integrity sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==
Expand Down

0 comments on commit 0fddc88

Please sign in to comment.