diff --git a/apps/meteor/client/views/admin/info/UsagePieGraph.stories.tsx b/apps/meteor/client/views/admin/info/UsagePieGraph.stories.tsx index 12f211d47c5e..d76731f0d2c4 100644 --- a/apps/meteor/client/views/admin/info/UsagePieGraph.stories.tsx +++ b/apps/meteor/client/views/admin/info/UsagePieGraph.stories.tsx @@ -38,27 +38,27 @@ export const Animated: Story, 'size' | { total: 100, used: 0, - color: colorTokens.s500, + color: colorTokens.g500, }, { total: 100, used: 25, - color: colorTokens.p500, + color: colorTokens.b500, }, { total: 100, used: 50, - color: colorTokens.w500, + color: colorTokens.y500, }, { total: 100, used: 75, - color: colorTokens['s1-500'], + color: colorTokens.o500, }, { total: 100, used: 100, - color: colorTokens.d500, + color: colorTokens.r500, }, ]); diff --git a/apps/meteor/client/views/room/Header/icons/Encrypted.tsx b/apps/meteor/client/views/room/Header/icons/Encrypted.tsx index dbfda21f5b7a..bd380c5d8af2 100644 --- a/apps/meteor/client/views/room/Header/icons/Encrypted.tsx +++ b/apps/meteor/client/views/room/Header/icons/Encrypted.tsx @@ -29,7 +29,7 @@ const Encrypted = ({ room }: { room: IRoom }) => { }); }); return e2eEnabled && room?.encrypted ? ( - + ) : null; }; diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/users/ActiveUsersSection.tsx b/apps/meteor/ee/client/views/admin/engagementDashboard/users/ActiveUsersSection.tsx index e067f777090f..eb504033e1e6 100644 --- a/apps/meteor/ee/client/views/admin/engagementDashboard/users/ActiveUsersSection.tsx +++ b/apps/meteor/ee/client/views/admin/engagementDashboard/users/ActiveUsersSection.tsx @@ -127,7 +127,7 @@ const ActiveUsersSection = ({ timezone }: ActiveUsersSectionProps): ReactElement variation: diffDailyActiveUsers ?? 0, description: ( <> - {t('Daily_Active_Users')} + {t('Daily_Active_Users')} ), }, @@ -136,7 +136,7 @@ const ActiveUsersSection = ({ timezone }: ActiveUsersSectionProps): ReactElement variation: diffWeeklyActiveUsers ?? 0, description: ( <> - {t('Weekly_Active_Users')} + {t('Weekly_Active_Users')} ), }, @@ -203,7 +203,7 @@ const ActiveUsersSection = ({ timezone }: ActiveUsersSectionProps): ReactElement right: 0, left: 40, }} - colors={[colors.p200, colors.p300, colors.p500]} + colors={[colors.b200, colors.b300, colors.b500]} axisLeft={{ // TODO: Get it from theme tickSize: 0, diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/users/UsersByTimeOfTheDaySection.tsx b/apps/meteor/ee/client/views/admin/engagementDashboard/users/UsersByTimeOfTheDaySection.tsx index d8f13bb891a3..fa5664ebca27 100644 --- a/apps/meteor/ee/client/views/admin/engagementDashboard/users/UsersByTimeOfTheDaySection.tsx +++ b/apps/meteor/ee/client/views/admin/engagementDashboard/users/UsersByTimeOfTheDaySection.tsx @@ -119,13 +119,13 @@ const UsersByTimeOfTheDaySection = ({ timezone }: UsersByTimeOfTheDaySectionProp type: 'quantize', colors: [ // TODO: Get it from theme - colors.p100, - colors.p200, - colors.p300, - colors.p400, - colors.p500, - colors.p600, - colors.p700, + colors.b100, + colors.b200, + colors.b300, + colors.b400, + colors.b500, + colors.b600, + colors.b700, ], }} emptyColor='transparent' diff --git a/apps/meteor/ee/client/views/admin/info/SeatsCard.tsx b/apps/meteor/ee/client/views/admin/info/SeatsCard.tsx index b595dd9c1fae..804893ae8458 100644 --- a/apps/meteor/ee/client/views/admin/info/SeatsCard.tsx +++ b/apps/meteor/ee/client/views/admin/info/SeatsCard.tsx @@ -23,7 +23,7 @@ const SeatsCard = ({ seatsCap }: SeatsCardProps): ReactElement => { const isNearLimit = seatsCap && seatsCap.activeUsers / seatsCap.maxActiveUsers >= 0.8; - const color = isNearLimit ? colors.d500 : undefined; + const color = isNearLimit ? colors.r500 : undefined; return ( diff --git a/apps/meteor/package.json b/apps/meteor/package.json index 3ee3366f47dd..18e4725ffc40 100644 --- a/apps/meteor/package.json +++ b/apps/meteor/package.json @@ -236,11 +236,11 @@ "@rocket.chat/favicon": "workspace:^", "@rocket.chat/forked-matrix-appservice-bridge": "^4.0.1", "@rocket.chat/forked-matrix-bot-sdk": "^0.6.0-beta.2", - "@rocket.chat/fuselage": "^0.34.0", + "@rocket.chat/fuselage": "^0.35.0", "@rocket.chat/fuselage-hooks": "^0.32.1", "@rocket.chat/fuselage-polyfills": "next", "@rocket.chat/fuselage-toastbar": "next", - "@rocket.chat/fuselage-tokens": "next", + "@rocket.chat/fuselage-tokens": "^0.32.0", "@rocket.chat/fuselage-ui-kit": "workspace:^", "@rocket.chat/gazzodown": "workspace:^", "@rocket.chat/i18n": "workspace:^", @@ -251,7 +251,7 @@ "@rocket.chat/license": "workspace:^", "@rocket.chat/log-format": "workspace:^", "@rocket.chat/logger": "workspace:^", - "@rocket.chat/logo": "^0.31.27", + "@rocket.chat/logo": "^0.31.28", "@rocket.chat/memo": "next", "@rocket.chat/message-parser": "next", "@rocket.chat/model-typings": "workspace:^", diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json index 9081c64fba34..f4bd7c5b44f6 100644 --- a/ee/packages/pdf-worker/package.json +++ b/ee/packages/pdf-worker/package.json @@ -34,7 +34,7 @@ "dependencies": { "@react-pdf/renderer": "^3.1.12", "@rocket.chat/core-typings": "workspace:^", - "@rocket.chat/fuselage-tokens": "next", + "@rocket.chat/fuselage-tokens": "^0.32.0", "@types/react": "~17.0.62", "emoji-assets": "^7.0.1", "emoji-toolkit": "^7.0.1", diff --git a/ee/packages/ui-theming/package.json b/ee/packages/ui-theming/package.json index 11aa5fd57ff8..52b8062f332d 100644 --- a/ee/packages/ui-theming/package.json +++ b/ee/packages/ui-theming/package.json @@ -4,7 +4,7 @@ "private": true, "devDependencies": { "@rocket.chat/css-in-js": "next", - "@rocket.chat/fuselage": "^0.34.0", + "@rocket.chat/fuselage": "^0.35.0", "@rocket.chat/fuselage-hooks": "^0.32.1", "@rocket.chat/icons": "^0.32.0", "@rocket.chat/ui-contexts": "workspace:~", diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json index 4555216c2d44..a32d2456752b 100644 --- a/packages/fuselage-ui-kit/package.json +++ b/packages/fuselage-ui-kit/package.json @@ -56,7 +56,7 @@ "devDependencies": { "@rocket.chat/apps-engine": "1.41.0-alpha.290", "@rocket.chat/eslint-config": "workspace:^", - "@rocket.chat/fuselage": "^0.34.0", + "@rocket.chat/fuselage": "^0.35.0", "@rocket.chat/fuselage-hooks": "^0.32.1", "@rocket.chat/fuselage-polyfills": "next", "@rocket.chat/icons": "^0.32.0", diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json index e891e5677c75..311950f2222d 100644 --- a/packages/gazzodown/package.json +++ b/packages/gazzodown/package.json @@ -6,8 +6,8 @@ "@babel/core": "~7.22.9", "@rocket.chat/core-typings": "workspace:^", "@rocket.chat/css-in-js": "next", - "@rocket.chat/fuselage": "^0.34.0", - "@rocket.chat/fuselage-tokens": "next", + "@rocket.chat/fuselage": "^0.35.0", + "@rocket.chat/fuselage-tokens": "^0.32.0", "@rocket.chat/message-parser": "next", "@rocket.chat/styled": "next", "@rocket.chat/ui-client": "workspace:^", diff --git a/packages/livechat/package.json b/packages/livechat/package.json index 756248c1df0c..bb92a0716669 100644 --- a/packages/livechat/package.json +++ b/packages/livechat/package.json @@ -30,8 +30,8 @@ "@rocket.chat/core-typings": "workspace:^", "@rocket.chat/ddp-client": "workspace:^", "@rocket.chat/eslint-config": "workspace:^", - "@rocket.chat/fuselage-tokens": "next", - "@rocket.chat/logo": "^0.31.27", + "@rocket.chat/fuselage-tokens": "^0.32.0", + "@rocket.chat/logo": "^0.31.28", "@storybook/addon-essentials": "~6.5.16", "@storybook/addon-postcss": "~2.0.0", "@storybook/preact": "~6.5.16", diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json index f8ef2d3a1e93..7edd02cc6e56 100644 --- a/packages/ui-client/package.json +++ b/packages/ui-client/package.json @@ -5,7 +5,7 @@ "devDependencies": { "@babel/core": "~7.22.9", "@rocket.chat/css-in-js": "next", - "@rocket.chat/fuselage": "^0.34.0", + "@rocket.chat/fuselage": "^0.35.0", "@rocket.chat/fuselage-hooks": "^0.32.1", "@rocket.chat/icons": "^0.32.0", "@rocket.chat/mock-providers": "workspace:^", diff --git a/packages/ui-composer/package.json b/packages/ui-composer/package.json index b5c804b4a2ad..b13328bd001b 100644 --- a/packages/ui-composer/package.json +++ b/packages/ui-composer/package.json @@ -5,7 +5,7 @@ "devDependencies": { "@babel/core": "~7.22.9", "@rocket.chat/eslint-config": "workspace:^", - "@rocket.chat/fuselage": "^0.34.0", + "@rocket.chat/fuselage": "^0.35.0", "@rocket.chat/icons": "^0.32.0", "@storybook/addon-actions": "~6.5.16", "@storybook/addon-docs": "~6.5.16", diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json index 7ca7b1d86140..2e880b3db8bb 100644 --- a/packages/ui-video-conf/package.json +++ b/packages/ui-video-conf/package.json @@ -6,7 +6,7 @@ "@babel/core": "~7.22.9", "@rocket.chat/css-in-js": "next", "@rocket.chat/eslint-config": "workspace:^", - "@rocket.chat/fuselage": "^0.34.0", + "@rocket.chat/fuselage": "^0.35.0", "@rocket.chat/fuselage-hooks": "^0.32.1", "@rocket.chat/icons": "^0.32.0", "@rocket.chat/styled": "next", diff --git a/packages/uikit-playground/package.json b/packages/uikit-playground/package.json index 5a8b1276defb..d9abdf001162 100644 --- a/packages/uikit-playground/package.json +++ b/packages/uikit-playground/package.json @@ -15,13 +15,13 @@ "@codemirror/tooltip": "^0.19.16", "@lezer/highlight": "^1.1.6", "@rocket.chat/css-in-js": "next", - "@rocket.chat/fuselage": "^0.34.0", + "@rocket.chat/fuselage": "^0.35.0", "@rocket.chat/fuselage-hooks": "^0.32.1", "@rocket.chat/fuselage-polyfills": "next", - "@rocket.chat/fuselage-tokens": "next", + "@rocket.chat/fuselage-tokens": "^0.32.0", "@rocket.chat/fuselage-ui-kit": "workspace:~", "@rocket.chat/icons": "^0.32.0", - "@rocket.chat/logo": "^0.31.27", + "@rocket.chat/logo": "^0.31.28", "@rocket.chat/styled": "next", "@rocket.chat/ui-contexts": "workspace:~", "codemirror": "^6.0.1", diff --git a/yarn.lock b/yarn.lock index 4b4fd7f27bc9..dc01a3898eba 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8219,17 +8219,10 @@ __metadata: languageName: node linkType: hard -"@rocket.chat/fuselage-tokens@npm:^0.31.25": - version: 0.31.25 - resolution: "@rocket.chat/fuselage-tokens@npm:0.31.25" - checksum: d05460f2f7b7f01b1498aab6fb7d932b7d752d55ce5a6bad6e7a42f2c1f056164ff8caa7dd8ec11bc0f4441a83d8aad0b8aab5e02c03f3452c4583d159b1a2f7 - languageName: node - linkType: hard - -"@rocket.chat/fuselage-tokens@npm:next": - version: 0.32.0-dev.379 - resolution: "@rocket.chat/fuselage-tokens@npm:0.32.0-dev.379" - checksum: c5cf40295c4ae1a5918651b9e156629d6400d5823b8cf5f81a14c66da986a9302d79392b45e991c2fc37aad9633f3d8e2f7f29c68969592340b05968265244e6 +"@rocket.chat/fuselage-tokens@npm:^0.32.0": + version: 0.32.0 + resolution: "@rocket.chat/fuselage-tokens@npm:0.32.0" + checksum: 8da7836877ba93462f90d13de6d3d3add8b2758b58c7988e14a8f0deffd1ceef0547f26d4c60a7ddc881e21e3327b5a04cbf17336e5ca8ab9c19789d8e6af3c0 languageName: node linkType: hard @@ -8239,7 +8232,7 @@ __metadata: dependencies: "@rocket.chat/apps-engine": 1.41.0-alpha.290 "@rocket.chat/eslint-config": "workspace:^" - "@rocket.chat/fuselage": ^0.34.0 + "@rocket.chat/fuselage": ^0.35.0 "@rocket.chat/fuselage-hooks": ^0.32.1 "@rocket.chat/fuselage-polyfills": next "@rocket.chat/gazzodown": "workspace:^" @@ -8288,13 +8281,13 @@ __metadata: languageName: unknown linkType: soft -"@rocket.chat/fuselage@npm:^0.34.0": - version: 0.34.0 - resolution: "@rocket.chat/fuselage@npm:0.34.0" +"@rocket.chat/fuselage@npm:^0.35.0": + version: 0.35.0 + resolution: "@rocket.chat/fuselage@npm:0.35.0" dependencies: "@rocket.chat/css-in-js": ^0.31.25 "@rocket.chat/css-supports": ^0.31.25 - "@rocket.chat/fuselage-tokens": ^0.31.25 + "@rocket.chat/fuselage-tokens": ^0.32.0 "@rocket.chat/memo": ^0.31.25 "@rocket.chat/styled": ^0.31.25 invariant: ^2.2.4 @@ -8308,7 +8301,7 @@ __metadata: react: ^17.0.2 react-dom: ^17.0.2 react-virtuoso: 1.2.4 - checksum: 72cd1dd7ef13cc3b69fadac5c064a45cd2b65b8a221cde2e8149fa873ac6de89648c677caedb10979e5cf08d39b79f1d7a30caa6378bdeeb873414c7fbac5e6e + checksum: 46deea587a1ab4c80a25f4e93882905e2f24778c0e612b7cdd18bfb0c72b2c079d4eee6fe7ad4c52a62354197ebed0a62eaf939b5714859b7086c923668f3f05 languageName: node linkType: hard @@ -8319,8 +8312,8 @@ __metadata: "@babel/core": ~7.22.9 "@rocket.chat/core-typings": "workspace:^" "@rocket.chat/css-in-js": next - "@rocket.chat/fuselage": ^0.34.0 - "@rocket.chat/fuselage-tokens": next + "@rocket.chat/fuselage": ^0.35.0 + "@rocket.chat/fuselage-tokens": ^0.32.0 "@rocket.chat/message-parser": next "@rocket.chat/styled": next "@rocket.chat/ui-client": "workspace:^" @@ -8468,9 +8461,9 @@ __metadata: "@rocket.chat/core-typings": "workspace:^" "@rocket.chat/ddp-client": "workspace:^" "@rocket.chat/eslint-config": "workspace:^" - "@rocket.chat/fuselage-tokens": next + "@rocket.chat/fuselage-tokens": ^0.32.0 "@rocket.chat/gazzodown": "workspace:^" - "@rocket.chat/logo": ^0.31.27 + "@rocket.chat/logo": ^0.31.28 "@rocket.chat/message-parser": next "@rocket.chat/random": "workspace:~" "@rocket.chat/sdk": ^1.0.0-alpha.42 @@ -8581,16 +8574,16 @@ __metadata: languageName: unknown linkType: soft -"@rocket.chat/logo@npm:^0.31.27": - version: 0.31.27 - resolution: "@rocket.chat/logo@npm:0.31.27" +"@rocket.chat/logo@npm:^0.31.28": + version: 0.31.28 + resolution: "@rocket.chat/logo@npm:0.31.28" dependencies: "@rocket.chat/fuselage-hooks": ^0.32.1 "@rocket.chat/styled": ^0.31.25 peerDependencies: react: 17.0.2 react-dom: 17.0.2 - checksum: acc56410813a0d4f634f9e847bc4b49275c26aff4e2f285720818cb012a2ad42554982fcc4078c485222a9c9a78244d1a4b16b60588b5c50441b8928c3957efb + checksum: 2ba185326fadb0d1ccf7d2767435204dd3cd857400d18e59eb8a07055ac0183c6e780d0e8e45436410c551aef516ecea7491a5c87b59406252b2be4694034af8 languageName: node linkType: hard @@ -8665,11 +8658,11 @@ __metadata: "@rocket.chat/favicon": "workspace:^" "@rocket.chat/forked-matrix-appservice-bridge": ^4.0.1 "@rocket.chat/forked-matrix-bot-sdk": ^0.6.0-beta.2 - "@rocket.chat/fuselage": ^0.34.0 + "@rocket.chat/fuselage": ^0.35.0 "@rocket.chat/fuselage-hooks": ^0.32.1 "@rocket.chat/fuselage-polyfills": next "@rocket.chat/fuselage-toastbar": next - "@rocket.chat/fuselage-tokens": next + "@rocket.chat/fuselage-tokens": ^0.32.0 "@rocket.chat/fuselage-ui-kit": "workspace:^" "@rocket.chat/gazzodown": "workspace:^" "@rocket.chat/i18n": "workspace:^" @@ -8681,7 +8674,7 @@ __metadata: "@rocket.chat/livechat": "workspace:^" "@rocket.chat/log-format": "workspace:^" "@rocket.chat/logger": "workspace:^" - "@rocket.chat/logo": ^0.31.27 + "@rocket.chat/logo": ^0.31.28 "@rocket.chat/memo": next "@rocket.chat/message-parser": next "@rocket.chat/mock-providers": "workspace:^" @@ -9175,7 +9168,7 @@ __metadata: dependencies: "@react-pdf/renderer": ^3.1.12 "@rocket.chat/core-typings": "workspace:^" - "@rocket.chat/fuselage-tokens": next + "@rocket.chat/fuselage-tokens": ^0.32.0 "@storybook/addon-essentials": ~6.5.16 "@storybook/react": ~6.5.16 "@testing-library/jest-dom": ^5.16.5 @@ -9528,7 +9521,7 @@ __metadata: dependencies: "@babel/core": ~7.22.9 "@rocket.chat/css-in-js": next - "@rocket.chat/fuselage": ^0.34.0 + "@rocket.chat/fuselage": ^0.35.0 "@rocket.chat/fuselage-hooks": ^0.32.1 "@rocket.chat/icons": ^0.32.0 "@rocket.chat/mock-providers": "workspace:^" @@ -9579,7 +9572,7 @@ __metadata: dependencies: "@babel/core": ~7.22.9 "@rocket.chat/eslint-config": "workspace:^" - "@rocket.chat/fuselage": ^0.34.0 + "@rocket.chat/fuselage": ^0.35.0 "@rocket.chat/icons": ^0.32.0 "@storybook/addon-actions": ~6.5.16 "@storybook/addon-docs": ~6.5.16 @@ -9650,7 +9643,7 @@ __metadata: resolution: "@rocket.chat/ui-theming@workspace:ee/packages/ui-theming" dependencies: "@rocket.chat/css-in-js": next - "@rocket.chat/fuselage": ^0.34.0 + "@rocket.chat/fuselage": ^0.35.0 "@rocket.chat/fuselage-hooks": ^0.32.1 "@rocket.chat/icons": ^0.32.0 "@rocket.chat/ui-contexts": "workspace:~" @@ -9693,7 +9686,7 @@ __metadata: "@rocket.chat/css-in-js": next "@rocket.chat/emitter": next "@rocket.chat/eslint-config": "workspace:^" - "@rocket.chat/fuselage": ^0.34.0 + "@rocket.chat/fuselage": ^0.35.0 "@rocket.chat/fuselage-hooks": ^0.32.1 "@rocket.chat/icons": ^0.32.0 "@rocket.chat/styled": next @@ -9736,13 +9729,13 @@ __metadata: "@codemirror/tooltip": ^0.19.16 "@lezer/highlight": ^1.1.6 "@rocket.chat/css-in-js": next - "@rocket.chat/fuselage": ^0.34.0 + "@rocket.chat/fuselage": ^0.35.0 "@rocket.chat/fuselage-hooks": ^0.32.1 "@rocket.chat/fuselage-polyfills": next - "@rocket.chat/fuselage-tokens": next + "@rocket.chat/fuselage-tokens": ^0.32.0 "@rocket.chat/fuselage-ui-kit": "workspace:~" "@rocket.chat/icons": ^0.32.0 - "@rocket.chat/logo": ^0.31.27 + "@rocket.chat/logo": ^0.31.28 "@rocket.chat/styled": next "@rocket.chat/ui-contexts": "workspace:~" "@types/react": ~17.0.62