diff --git a/package.json b/package.json index 52d9131786..ae663b11a4 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "@matrix-org/spec": "^1.7.0", "@sentry/browser": "^8.0.0", "@testing-library/react-hooks": "^8.0.1", - "@vector-im/compound-design-tokens": "^1.6.1", + "@vector-im/compound-design-tokens": "^1.8.0", "@vector-im/compound-web": "^5.5.0", "@zxcvbn-ts/core": "^3.0.4", "@zxcvbn-ts/language-common": "^3.0.4", diff --git a/playwright/snapshots/app-loading/feature-detection.spec.ts/unsupported-browser-CompatibilityView-linux.png b/playwright/snapshots/app-loading/feature-detection.spec.ts/unsupported-browser-CompatibilityView-linux.png index 5b52d00d77..dd8b24beea 100644 Binary files a/playwright/snapshots/app-loading/feature-detection.spec.ts/unsupported-browser-CompatibilityView-linux.png and b/playwright/snapshots/app-loading/feature-detection.spec.ts/unsupported-browser-CompatibilityView-linux.png differ diff --git a/playwright/snapshots/chat-export/html-export.spec.ts/html-export-linux.png b/playwright/snapshots/chat-export/html-export.spec.ts/html-export-linux.png index 9a877e0718..9d301e7919 100644 Binary files a/playwright/snapshots/chat-export/html-export.spec.ts/html-export-linux.png and b/playwright/snapshots/chat-export/html-export.spec.ts/html-export-linux.png differ diff --git a/playwright/snapshots/polls/polls.spec.ts/ThreadView-with-a-poll-on-bubble-layout-linux.png b/playwright/snapshots/polls/polls.spec.ts/ThreadView-with-a-poll-on-bubble-layout-linux.png index 9992923226..3936b29fdf 100644 Binary files a/playwright/snapshots/polls/polls.spec.ts/ThreadView-with-a-poll-on-bubble-layout-linux.png and b/playwright/snapshots/polls/polls.spec.ts/ThreadView-with-a-poll-on-bubble-layout-linux.png differ diff --git a/playwright/snapshots/polls/polls.spec.ts/ThreadView-with-a-poll-on-group-layout-linux.png b/playwright/snapshots/polls/polls.spec.ts/ThreadView-with-a-poll-on-group-layout-linux.png index 050a82a8af..c1007f06e7 100644 Binary files a/playwright/snapshots/polls/polls.spec.ts/ThreadView-with-a-poll-on-group-layout-linux.png and b/playwright/snapshots/polls/polls.spec.ts/ThreadView-with-a-poll-on-group-layout-linux.png differ diff --git a/playwright/snapshots/release-announcement/releaseAnnouncement.spec.ts/release-announcement-Threads-Activity-Centre-linux.png b/playwright/snapshots/release-announcement/releaseAnnouncement.spec.ts/release-announcement-Threads-Activity-Centre-linux.png index 62316fd312..f21145e02c 100644 Binary files a/playwright/snapshots/release-announcement/releaseAnnouncement.spec.ts/release-announcement-Threads-Activity-Centre-linux.png and b/playwright/snapshots/release-announcement/releaseAnnouncement.spec.ts/release-announcement-Threads-Activity-Centre-linux.png differ diff --git a/playwright/snapshots/right-panel/notification-panel.spec.ts/empty-linux.png b/playwright/snapshots/right-panel/notification-panel.spec.ts/empty-linux.png index d18266534d..cc1ea27dfc 100644 Binary files a/playwright/snapshots/right-panel/notification-panel.spec.ts/empty-linux.png and b/playwright/snapshots/right-panel/notification-panel.spec.ts/empty-linux.png differ diff --git a/playwright/snapshots/settings/account-user-settings-tab.spec.ts/account-linux.png b/playwright/snapshots/settings/account-user-settings-tab.spec.ts/account-linux.png index 17cf808383..ec4a0f030c 100644 Binary files a/playwright/snapshots/settings/account-user-settings-tab.spec.ts/account-linux.png and b/playwright/snapshots/settings/account-user-settings-tab.spec.ts/account-linux.png differ diff --git a/playwright/snapshots/settings/appearance-user-settings-tab/appearance-user-settings-tab.spec.ts/appearance-tab-linux.png b/playwright/snapshots/settings/appearance-user-settings-tab/appearance-user-settings-tab.spec.ts/appearance-tab-linux.png index f891abaa16..76a9308b35 100644 Binary files a/playwright/snapshots/settings/appearance-user-settings-tab/appearance-user-settings-tab.spec.ts/appearance-tab-linux.png and b/playwright/snapshots/settings/appearance-user-settings-tab/appearance-user-settings-tab.spec.ts/appearance-tab-linux.png differ diff --git a/playwright/snapshots/settings/appearance-user-settings-tab/appearance-user-settings-tab.spec.ts/window-12px-linux.png b/playwright/snapshots/settings/appearance-user-settings-tab/appearance-user-settings-tab.spec.ts/window-12px-linux.png index edbc19aa22..bf47c91388 100644 Binary files a/playwright/snapshots/settings/appearance-user-settings-tab/appearance-user-settings-tab.spec.ts/window-12px-linux.png and b/playwright/snapshots/settings/appearance-user-settings-tab/appearance-user-settings-tab.spec.ts/window-12px-linux.png differ diff --git a/playwright/snapshots/settings/preferences-user-settings-tab.spec.ts/Preferences-user-settings-tab-should-be-rendered-properly-1-linux.png b/playwright/snapshots/settings/preferences-user-settings-tab.spec.ts/Preferences-user-settings-tab-should-be-rendered-properly-1-linux.png index 927af90d00..56745f9a19 100644 Binary files a/playwright/snapshots/settings/preferences-user-settings-tab.spec.ts/Preferences-user-settings-tab-should-be-rendered-properly-1-linux.png and b/playwright/snapshots/settings/preferences-user-settings-tab.spec.ts/Preferences-user-settings-tab-should-be-rendered-properly-1-linux.png differ diff --git a/playwright/snapshots/spaces/spaces.spec.ts/space-panel-expanded-linux.png b/playwright/snapshots/spaces/spaces.spec.ts/space-panel-expanded-linux.png index 3528d129be..ea9e428244 100644 Binary files a/playwright/snapshots/spaces/spaces.spec.ts/space-panel-expanded-linux.png and b/playwright/snapshots/spaces/spaces.spec.ts/space-panel-expanded-linux.png differ diff --git a/playwright/snapshots/spaces/threads-activity-centre/threadsActivityCentre.spec.ts/tac-button-expanded-linux.png b/playwright/snapshots/spaces/threads-activity-centre/threadsActivityCentre.spec.ts/tac-button-expanded-linux.png index 4c403627fa..7f76175fcf 100644 Binary files a/playwright/snapshots/spaces/threads-activity-centre/threadsActivityCentre.spec.ts/tac-button-expanded-linux.png and b/playwright/snapshots/spaces/threads-activity-centre/threadsActivityCentre.spec.ts/tac-button-expanded-linux.png differ diff --git a/playwright/snapshots/spaces/threads-activity-centre/threadsActivityCentre.spec.ts/tac-hovered-expanded-linux.png b/playwright/snapshots/spaces/threads-activity-centre/threadsActivityCentre.spec.ts/tac-hovered-expanded-linux.png index 3dfe328de2..7f76175fcf 100644 Binary files a/playwright/snapshots/spaces/threads-activity-centre/threadsActivityCentre.spec.ts/tac-hovered-expanded-linux.png and b/playwright/snapshots/spaces/threads-activity-centre/threadsActivityCentre.spec.ts/tac-hovered-expanded-linux.png differ diff --git a/playwright/snapshots/threads/threads.spec.ts/Reply-to-the-location-on-ThreadView-linux.png b/playwright/snapshots/threads/threads.spec.ts/Reply-to-the-location-on-ThreadView-linux.png index d30d8e98a8..ab4ec4ec3b 100644 Binary files a/playwright/snapshots/threads/threads.spec.ts/Reply-to-the-location-on-ThreadView-linux.png and b/playwright/snapshots/threads/threads.spec.ts/Reply-to-the-location-on-ThreadView-linux.png differ diff --git a/playwright/snapshots/user-onboarding/user-onboarding-new.spec.ts/User-Onboarding-new-user-page-is-shown-and-preference-exists-1-linux.png b/playwright/snapshots/user-onboarding/user-onboarding-new.spec.ts/User-Onboarding-new-user-page-is-shown-and-preference-exists-1-linux.png index ea1fa63bde..3112b0fcf2 100644 Binary files a/playwright/snapshots/user-onboarding/user-onboarding-new.spec.ts/User-Onboarding-new-user-page-is-shown-and-preference-exists-1-linux.png and b/playwright/snapshots/user-onboarding/user-onboarding-new.spec.ts/User-Onboarding-new-user-page-is-shown-and-preference-exists-1-linux.png differ diff --git a/playwright/snapshots/user-view/user-view.spec.ts/user-info-linux.png b/playwright/snapshots/user-view/user-view.spec.ts/user-info-linux.png index b6883c218e..2cedb4d1f5 100644 Binary files a/playwright/snapshots/user-view/user-view.spec.ts/user-info-linux.png and b/playwright/snapshots/user-view/user-view.spec.ts/user-info-linux.png differ diff --git a/res/css/structures/_ToastContainer.pcss b/res/css/structures/_ToastContainer.pcss index 65a171b496..f8f15bca40 100644 --- a/res/css/structures/_ToastContainer.pcss +++ b/res/css/structures/_ToastContainer.pcss @@ -119,8 +119,7 @@ limitations under the License. h2 { margin: 0; - font: var(--cpd-font-heading-sm-medium); - font-weight: var(--cpd-font-weight-medium); + font: var(--cpd-font-body-lg-semibold); display: inline; width: auto; } diff --git a/res/css/views/right_panel/_BaseCard.pcss b/res/css/views/right_panel/_BaseCard.pcss index 47092c124f..12a0abda1b 100644 --- a/res/css/views/right_panel/_BaseCard.pcss +++ b/res/css/views/right_panel/_BaseCard.pcss @@ -60,10 +60,11 @@ limitations under the License. flex: 1; .mx_BaseCard_header_title_heading { - color: $primary-content; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; + font: var(--cpd-font-body-md-medium); + color: var(--cpd-color-text-secondary); } .mx_BaseCard_header_title_button--option { diff --git a/res/css/views/right_panel/_UserInfo.pcss b/res/css/views/right_panel/_UserInfo.pcss index a2e156e0e5..186eb78a32 100644 --- a/res/css/views/right_panel/_UserInfo.pcss +++ b/res/css/views/right_panel/_UserInfo.pcss @@ -97,7 +97,7 @@ limitations under the License. h2 { text-transform: uppercase; color: $tertiary-content; - font: var(--cpd-font-heading-sm-semibold); + font: var(--cpd-font-body-md-semibold); font-weight: var(--cpd-font-weight-semibold); margin: $spacing-4 0; } diff --git a/res/css/views/user-onboarding/_UserOnboardingTask.pcss b/res/css/views/user-onboarding/_UserOnboardingTask.pcss index 05232da8c5..6bb54207b7 100644 --- a/res/css/views/user-onboarding/_UserOnboardingTask.pcss +++ b/res/css/views/user-onboarding/_UserOnboardingTask.pcss @@ -44,6 +44,10 @@ limitations under the License. transition: all 500ms; + .mx_UserOnboardingTask_title { + font: var(--cpd-font-body-md-medium); + } + .mx_UserOnboardingTask_description { font-size: $font-12px; } diff --git a/test/components/views/dialogs/__snapshots__/UserSettingsDialog-test.tsx.snap b/test/components/views/dialogs/__snapshots__/UserSettingsDialog-test.tsx.snap index a6114fdaca..871d937681 100644 --- a/test/components/views/dialogs/__snapshots__/UserSettingsDialog-test.tsx.snap +++ b/test/components/views/dialogs/__snapshots__/UserSettingsDialog-test.tsx.snap @@ -102,7 +102,7 @@ NodeList [ xmlns="http://www.w3.org/2000/svg" > has button to edit topic 1`] = ` xmlns="http://www.w3.org/2000/svg" > @@ -219,7 +219,7 @@ exports[` has button to edit topic 1`] = ` xmlns="http://www.w3.org/2000/svg" > @@ -244,7 +244,7 @@ exports[` has button to edit topic 1`] = ` xmlns="http://www.w3.org/2000/svg" > has button to edit topic 1`] = ` xmlns="http://www.w3.org/2000/svg" > @@ -299,7 +299,7 @@ exports[` has button to edit topic 1`] = ` xmlns="http://www.w3.org/2000/svg" > @@ -329,7 +329,7 @@ exports[` has button to edit topic 1`] = ` xmlns="http://www.w3.org/2000/svg" > @@ -369,7 +369,7 @@ exports[` has button to edit topic 1`] = ` xmlns="http://www.w3.org/2000/svg" > @@ -415,7 +415,7 @@ exports[` has button to edit topic 1`] = ` xmlns="http://www.w3.org/2000/svg" > @@ -574,7 +574,7 @@ exports[` renders the room summary 1`] = ` xmlns="http://www.w3.org/2000/svg" > @@ -617,7 +617,7 @@ exports[` renders the room summary 1`] = ` xmlns="http://www.w3.org/2000/svg" > @@ -642,7 +642,7 @@ exports[` renders the room summary 1`] = ` xmlns="http://www.w3.org/2000/svg" > renders the room summary 1`] = ` xmlns="http://www.w3.org/2000/svg" > @@ -697,7 +697,7 @@ exports[` renders the room summary 1`] = ` xmlns="http://www.w3.org/2000/svg" > @@ -727,7 +727,7 @@ exports[` renders the room summary 1`] = ` xmlns="http://www.w3.org/2000/svg" > @@ -767,7 +767,7 @@ exports[` renders the room summary 1`] = ` xmlns="http://www.w3.org/2000/svg" > @@ -813,7 +813,7 @@ exports[` renders the room summary 1`] = ` xmlns="http://www.w3.org/2000/svg" > @@ -999,7 +999,7 @@ exports[` renders the room topic in the summary 1`] = ` xmlns="http://www.w3.org/2000/svg" > @@ -1042,7 +1042,7 @@ exports[` renders the room topic in the summary 1`] = ` xmlns="http://www.w3.org/2000/svg" > @@ -1067,7 +1067,7 @@ exports[` renders the room topic in the summary 1`] = ` xmlns="http://www.w3.org/2000/svg" > renders the room topic in the summary 1`] = ` xmlns="http://www.w3.org/2000/svg" > @@ -1122,7 +1122,7 @@ exports[` renders the room topic in the summary 1`] = ` xmlns="http://www.w3.org/2000/svg" > @@ -1152,7 +1152,7 @@ exports[` renders the room topic in the summary 1`] = ` xmlns="http://www.w3.org/2000/svg" > @@ -1192,7 +1192,7 @@ exports[` renders the room topic in the summary 1`] = ` xmlns="http://www.w3.org/2000/svg" > @@ -1238,7 +1238,7 @@ exports[` renders the room topic in the summary 1`] = ` xmlns="http://www.w3.org/2000/svg" > diff --git a/test/components/views/right_panel/__snapshots__/UserInfo-test.tsx.snap b/test/components/views/right_panel/__snapshots__/UserInfo-test.tsx.snap index 22794e9d8b..e8155096f1 100644 --- a/test/components/views/right_panel/__snapshots__/UserInfo-test.tsx.snap +++ b/test/components/views/right_panel/__snapshots__/UserInfo-test.tsx.snap @@ -233,7 +233,7 @@ exports[` with crypto enabled renders 1`] = ` xmlns="http://www.w3.org/2000/svg" > with crypto enabled renders 1`] = ` xmlns="http://www.w3.org/2000/svg" > @@ -271,7 +271,7 @@ exports[` with crypto enabled renders 1`] = ` xmlns="http://www.w3.org/2000/svg" > with crypto enabled renders 1`] = ` xmlns="http://www.w3.org/2000/svg" > @@ -308,7 +308,7 @@ exports[` with crypto enabled renders 1`] = ` xmlns="http://www.w3.org/2000/svg" > with crypto enabled renders 1`] = ` xmlns="http://www.w3.org/2000/svg" > @@ -367,7 +367,7 @@ exports[` with crypto enabled renders 1`] = ` xmlns="http://www.w3.org/2000/svg" > @@ -541,7 +541,7 @@ exports[` with crypto enabled should render a deactivate button for xmlns="http://www.w3.org/2000/svg" > with crypto enabled should render a deactivate button for xmlns="http://www.w3.org/2000/svg" > @@ -579,7 +579,7 @@ exports[` with crypto enabled should render a deactivate button for xmlns="http://www.w3.org/2000/svg" > with crypto enabled should render a deactivate button for xmlns="http://www.w3.org/2000/svg" > @@ -616,7 +616,7 @@ exports[` with crypto enabled should render a deactivate button for xmlns="http://www.w3.org/2000/svg" > with crypto enabled should render a deactivate button for xmlns="http://www.w3.org/2000/svg" > @@ -675,7 +675,7 @@ exports[` with crypto enabled should render a deactivate button for xmlns="http://www.w3.org/2000/svg" > @@ -716,7 +716,7 @@ exports[` with crypto enabled should render a deactivate button for xmlns="http://www.w3.org/2000/svg" > diff --git a/test/components/views/spaces/__snapshots__/ThreadsActivityCentre-test.tsx.snap b/test/components/views/spaces/__snapshots__/ThreadsActivityCentre-test.tsx.snap index 1e1ed87e6c..ceddf215f1 100644 --- a/test/components/views/spaces/__snapshots__/ThreadsActivityCentre-test.tsx.snap +++ b/test/components/views/spaces/__snapshots__/ThreadsActivityCentre-test.tsx.snap @@ -62,7 +62,7 @@ exports[`ThreadsActivityCentre renders notifications matching the snapshot 1`] = xmlns="http://www.w3.org/2000/svg" >