From 603d1dedce65d8578b8b3c029f7059c7150f6f7e Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Sun, 9 Apr 2023 16:24:36 +0900 Subject: [PATCH 1/3] Replace `$font-normal` and `$font-semi-bold` Signed-off-by: Suguru Hirahara --- res/css/_common.pcss | 2 +- res/css/_font-weights.pcss | 6 ++++-- res/css/components/views/beacon/_BeaconListItem.pcss | 2 +- res/css/components/views/beacon/_OwnBeaconStatus.pcss | 2 +- res/css/components/views/elements/_FilterDropdown.pcss | 2 +- res/css/components/views/elements/_FilterTabGroup.pcss | 2 +- res/css/components/views/pips/_WidgetPip.pcss | 2 +- .../components/views/spaces/_QuickThemeSwitcher.pcss | 2 +- res/css/structures/_GenericDropdownMenu.pcss | 2 +- res/css/structures/_HomePage.pcss | 4 ++-- res/css/structures/_QuickSettingsButton.pcss | 4 ++-- res/css/structures/_RightPanel.pcss | 2 +- res/css/structures/_RoomSearch.pcss | 4 ++-- res/css/structures/_SpaceHierarchy.pcss | 8 ++++---- res/css/structures/_SpacePanel.pcss | 6 +++--- res/css/structures/_SpaceRoomView.pcss | 6 +++--- res/css/structures/_ToastContainer.pcss | 6 +++--- res/css/structures/_UserMenu.pcss | 2 +- res/css/views/auth/_AuthBody.pcss | 10 +++++----- res/css/views/beta/_BetaCard.pcss | 4 ++-- res/css/views/context_menus/_IconizedContextMenu.pcss | 2 +- res/css/views/dialogs/_AddExistingToSpaceDialog.pcss | 6 +++--- res/css/views/dialogs/_CreateRoomDialog.pcss | 2 +- res/css/views/dialogs/_ExportDialog.pcss | 2 +- res/css/views/dialogs/_FeedbackDialog.pcss | 2 +- res/css/views/dialogs/_ForwardDialog.pcss | 2 +- res/css/views/dialogs/_InviteDialog.pcss | 2 +- .../views/dialogs/_ManageRestrictedJoinRuleDialog.pcss | 2 +- res/css/views/dialogs/_RoomSettingsDialogBridges.pcss | 2 +- res/css/views/dialogs/_ServerPickerDialog.pcss | 2 +- res/css/views/dialogs/_SpaceSettingsDialog.pcss | 4 ++-- res/css/views/dialogs/_SpotlightDialog.pcss | 2 +- res/css/views/elements/_SSOButtons.pcss | 2 +- res/css/views/elements/_ServerPicker.pcss | 2 +- res/css/views/messages/_CallEvent.pcss | 2 +- res/css/views/right_panel/_BaseCard.pcss | 6 +++--- res/css/views/right_panel/_RoomSummaryCard.pcss | 2 +- res/css/views/right_panel/_ThreadPanel.pcss | 4 ++-- res/css/views/rooms/_DecryptionFailureBar.pcss | 2 +- res/css/views/rooms/_PinnedEventTile.pcss | 2 +- res/css/views/rooms/_RoomHeader.pcss | 2 +- res/css/views/rooms/_RoomList.pcss | 2 +- res/css/views/rooms/_RoomListHeader.pcss | 2 +- res/css/views/rooms/_RoomPreviewCard.pcss | 2 +- res/css/views/rooms/_ThreadSummary.pcss | 2 +- res/css/views/settings/_JoinRuleSettings.pcss | 4 ++-- res/css/views/settings/_Notifications.pcss | 6 +++--- res/css/views/settings/_SettingsFieldset.pcss | 2 +- .../settings/tabs/room/_NotificationSettingsTab.pcss | 2 +- res/css/views/spaces/_SpaceCreateMenu.pcss | 2 +- res/css/views/toasts/_AnalyticsToast.pcss | 4 ++-- res/css/views/toasts/_IncomingCallToast.pcss | 2 +- res/css/views/typography/_Heading.pcss | 8 ++++---- res/css/voice-broadcast/atoms/_LiveBadge.pcss | 2 +- .../voice-broadcast/atoms/_VoiceBroadcastHeader.pcss | 2 +- 55 files changed, 88 insertions(+), 86 deletions(-) diff --git a/res/css/_common.pcss b/res/css/_common.pcss index 77ffe8116be..0ef2a68bb33 100644 --- a/res/css/_common.pcss +++ b/res/css/_common.pcss @@ -816,7 +816,7 @@ legend { @define-mixin ThreadRepliesAmount { color: $secondary-content; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); white-space: nowrap; position: relative; padding: 0 $spacing-12 0 $spacing-8; diff --git a/res/css/_font-weights.pcss b/res/css/_font-weights.pcss index 6999aa31507..7931d6a56a5 100644 --- a/res/css/_font-weights.pcss +++ b/res/css/_font-weights.pcss @@ -14,5 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -$font-normal: 400; -$font-semi-bold: 600; +:root { + --font-normal: 400; + --font-semi-bold: 600; +} diff --git a/res/css/components/views/beacon/_BeaconListItem.pcss b/res/css/components/views/beacon/_BeaconListItem.pcss index 19ac4148cca..c9b39bbebf4 100644 --- a/res/css/components/views/beacon/_BeaconListItem.pcss +++ b/res/css/components/views/beacon/_BeaconListItem.pcss @@ -55,7 +55,7 @@ limitations under the License. margin-bottom: $spacing-8; .mx_BeaconStatus_label { - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); } } diff --git a/res/css/components/views/beacon/_OwnBeaconStatus.pcss b/res/css/components/views/beacon/_OwnBeaconStatus.pcss index f007124216a..dedf02da7a6 100644 --- a/res/css/components/views/beacon/_OwnBeaconStatus.pcss +++ b/res/css/components/views/beacon/_OwnBeaconStatus.pcss @@ -27,5 +27,5 @@ limitations under the License. .mx_OwnBeaconStatus_destructiveButton { /* override button link_inline styles */ color: $alert !important; - font-weight: $font-semi-bold !important; + font-weight: var(--font-semi-bold) !important; } diff --git a/res/css/components/views/elements/_FilterDropdown.pcss b/res/css/components/views/elements/_FilterDropdown.pcss index 6a9fe3dc7c0..a73a45c03ee 100644 --- a/res/css/components/views/elements/_FilterDropdown.pcss +++ b/res/css/components/views/elements/_FilterDropdown.pcss @@ -72,7 +72,7 @@ limitations under the License. } .mx_FilterDropdown_optionLabel { - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); display: block; } diff --git a/res/css/components/views/elements/_FilterTabGroup.pcss b/res/css/components/views/elements/_FilterTabGroup.pcss index bbf1a279ad4..05329cb7d00 100644 --- a/res/css/components/views/elements/_FilterTabGroup.pcss +++ b/res/css/components/views/elements/_FilterTabGroup.pcss @@ -38,7 +38,7 @@ limitations under the License. &:checked + span { color: $accent; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); // underline box-shadow: 0 1.5px 0 0 currentColor; } diff --git a/res/css/components/views/pips/_WidgetPip.pcss b/res/css/components/views/pips/_WidgetPip.pcss index 80c47719251..cecc0e1365a 100644 --- a/res/css/components/views/pips/_WidgetPip.pcss +++ b/res/css/components/views/pips/_WidgetPip.pcss @@ -42,7 +42,7 @@ limitations under the License. padding: $spacing-12; display: flex; font-size: $font-12px; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); background: linear-gradient(rgba(0, 0, 0, 0.9), rgba(0, 0, 0, 0)); } diff --git a/res/css/components/views/spaces/_QuickThemeSwitcher.pcss b/res/css/components/views/spaces/_QuickThemeSwitcher.pcss index c0ca83eb177..a729134c124 100644 --- a/res/css/components/views/spaces/_QuickThemeSwitcher.pcss +++ b/res/css/components/views/spaces/_QuickThemeSwitcher.pcss @@ -30,7 +30,7 @@ limitations under the License. } .mx_QuickThemeSwitcher_heading { - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); font-size: $font-12px; line-height: $font-15px; color: $secondary-content; diff --git a/res/css/structures/_GenericDropdownMenu.pcss b/res/css/structures/_GenericDropdownMenu.pcss index 75805f11468..c3740cc847d 100644 --- a/res/css/structures/_GenericDropdownMenu.pcss +++ b/res/css/structures/_GenericDropdownMenu.pcss @@ -92,7 +92,7 @@ limitations under the License. span:first-child { color: $primary-content; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); } } diff --git a/res/css/structures/_HomePage.pcss b/res/css/structures/_HomePage.pcss index a1757869533..75f560e2958 100644 --- a/res/css/structures/_HomePage.pcss +++ b/res/css/structures/_HomePage.pcss @@ -37,7 +37,7 @@ limitations under the License. } h1 { - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); font-size: $font-32px; line-height: $font-44px; margin-bottom: 4px; @@ -45,7 +45,7 @@ limitations under the License. h2 { margin-top: 4px; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); font-size: $font-18px; line-height: $font-25px; color: $muted-fg-color; diff --git a/res/css/structures/_QuickSettingsButton.pcss b/res/css/structures/_QuickSettingsButton.pcss index d6686938ad4..128c8e0fbbe 100644 --- a/res/css/structures/_QuickSettingsButton.pcss +++ b/res/css/structures/_QuickSettingsButton.pcss @@ -59,7 +59,7 @@ limitations under the License. contain: unset; /* let the dropdown paint beyond the context menu */ > div > h2 { - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); font-size: $font-15px; line-height: $font-24px; color: $primary-content; @@ -72,7 +72,7 @@ limitations under the License. } > div > h4 { - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); font-size: $font-12px; line-height: $font-15px; text-transform: uppercase; diff --git a/res/css/structures/_RightPanel.pcss b/res/css/structures/_RightPanel.pcss index 27a8b2caa2e..3c6a292c9cd 100644 --- a/res/css/structures/_RightPanel.pcss +++ b/res/css/structures/_RightPanel.pcss @@ -251,7 +251,7 @@ $pulse-color: $alert; .mx_RightPanel_scopeHeader { margin: 24px; text-align: center; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); font-size: $font-18px; line-height: $font-22px; diff --git a/res/css/structures/_RoomSearch.pcss b/res/css/structures/_RoomSearch.pcss index ddad7b6a40b..8252d2d9b9a 100644 --- a/res/css/structures/_RoomSearch.pcss +++ b/res/css/structures/_RoomSearch.pcss @@ -51,7 +51,7 @@ limitations under the License. /* the following rules are to match that of a real input field */ overflow: hidden; margin: 9px; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); } .mx_RoomSearch_shortcutPrompt { @@ -62,7 +62,7 @@ limitations under the License. font-size: $font-12px; line-height: $font-15px; font-family: inherit; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); color: $light-fg-color; margin-right: 6px; white-space: nowrap; diff --git a/res/css/structures/_SpaceHierarchy.pcss b/res/css/structures/_SpaceHierarchy.pcss index 20649e9ea53..2dedf2099c9 100644 --- a/res/css/structures/_SpaceHierarchy.pcss +++ b/res/css/structures/_SpaceHierarchy.pcss @@ -46,7 +46,7 @@ limitations under the License. .mx_SpaceHierarchy_listHeader_header { grid-column-start: 1; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); margin: 0; } @@ -71,7 +71,7 @@ limitations under the License. .mx_SpaceHierarchy_error { position: relative; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); color: $alert; font-size: $font-15px; line-height: $font-18px; @@ -94,7 +94,7 @@ limitations under the License. .mx_SpaceHierarchy_roomCount { > h3 { display: inline; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); font-size: $font-18px; line-height: $font-22px; color: $primary-content; @@ -167,7 +167,7 @@ limitations under the License. gap: 6px 12px; .mx_SpaceHierarchy_roomTile_item { - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); font-size: $font-15px; line-height: $font-18px; display: grid; diff --git a/res/css/structures/_SpacePanel.pcss b/res/css/structures/_SpacePanel.pcss index c4a90b2eaea..73f6fde570a 100644 --- a/res/css/structures/_SpacePanel.pcss +++ b/res/css/structures/_SpacePanel.pcss @@ -276,7 +276,7 @@ $activeBorderColor: $primary-content; border-radius: 8px; background-color: $panel-actions; font-size: $font-15px !important; /* override inline style */ - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); line-height: $font-18px; & + .mx_BaseAvatar_image { @@ -380,7 +380,7 @@ $activeBorderColor: $primary-content; .mx_SpacePanel_contextMenu_header { margin: 12px 16px 12px; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); font-size: $font-15px; line-height: $font-18px; overflow: hidden; @@ -432,7 +432,7 @@ $activeBorderColor: $primary-content; color: $tertiary-content; font-size: $font-10px; line-height: $font-12px; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); //margin-left: 8px; } } diff --git a/res/css/structures/_SpaceRoomView.pcss b/res/css/structures/_SpaceRoomView.pcss index 433febae48d..287724de561 100644 --- a/res/css/structures/_SpaceRoomView.pcss +++ b/res/css/structures/_SpaceRoomView.pcss @@ -27,7 +27,7 @@ $SpaceRoomViewInnerWidth: 428px; margin: 20px 0; > h3 { - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); margin: 0 0 4px; } @@ -74,7 +74,7 @@ $SpaceRoomViewInnerWidth: 428px; h1 { margin: 0; font-size: $font-24px; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); color: $primary-content; width: max-content; } @@ -121,7 +121,7 @@ $SpaceRoomViewInnerWidth: 428px; } .mx_SpaceRoomView_errorText { - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); font-size: $font-12px; line-height: $font-15px; color: $alert; diff --git a/res/css/structures/_ToastContainer.pcss b/res/css/structures/_ToastContainer.pcss index 65a92e552f1..5508fec63ea 100644 --- a/res/css/structures/_ToastContainer.pcss +++ b/res/css/structures/_ToastContainer.pcss @@ -115,7 +115,7 @@ limitations under the License. color: $primary-content; margin: 0; font-size: $font-18px; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); } .mx_Toast_title_countIndicator { @@ -142,7 +142,7 @@ limitations under the License. .mx_Toast_description { color: $primary-content; font-size: $font-15px; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); max-width: 300px; a { @@ -152,7 +152,7 @@ limitations under the License. .mx_Toast_detail { display: block; - font-weight: $font-normal; + font-weight: var(--font-normal); margin-top: $spacing-4; max-width: 300px; } diff --git a/res/css/structures/_UserMenu.pcss b/res/css/structures/_UserMenu.pcss index 9c9e1ce529e..8a6796b96c9 100644 --- a/res/css/structures/_UserMenu.pcss +++ b/res/css/structures/_UserMenu.pcss @@ -47,7 +47,7 @@ limitations under the License. } .mx_UserMenu_name { - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); font-size: $font-15px; line-height: $font-24px; margin-left: 10px; diff --git a/res/css/views/auth/_AuthBody.pcss b/res/css/views/auth/_AuthBody.pcss index e1abe24d230..b88d6ff1051 100644 --- a/res/css/views/auth/_AuthBody.pcss +++ b/res/css/views/auth/_AuthBody.pcss @@ -35,14 +35,14 @@ limitations under the License. h1 { font-size: $font-24px; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); margin-top: $spacing-8; color: $authpage-primary-color; } h2 { font-size: $font-14px; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); color: $authpage-secondary-color; } @@ -155,7 +155,7 @@ limitations under the License. } .mx_Login_submit { - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); margin: 0 0 $spacing-16; } @@ -168,7 +168,7 @@ limitations under the License. } .mx_AuthBody_sign-in-instead-button { - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); padding: $spacing-4; } @@ -262,7 +262,7 @@ limitations under the License. text-align: center; > a { - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); } } diff --git a/res/css/views/beta/_BetaCard.pcss b/res/css/views/beta/_BetaCard.pcss index e4e4db01e56..591fff2d954 100644 --- a/res/css/views/beta/_BetaCard.pcss +++ b/res/css/views/beta/_BetaCard.pcss @@ -32,7 +32,7 @@ limitations under the License. flex: 1; .mx_BetaCard_title { - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); font-size: $font-18px; line-height: $font-22px; color: $primary-content; @@ -126,7 +126,7 @@ limitations under the License. border-radius: 8px; text-transform: uppercase; font-size: $font-12px; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); line-height: 15px; color: $button-primary-fg-color; display: inline-block; diff --git a/res/css/views/context_menus/_IconizedContextMenu.pcss b/res/css/views/context_menus/_IconizedContextMenu.pcss index 29b2eef7a4f..3a1bb0eba24 100644 --- a/res/css/views/context_menus/_IconizedContextMenu.pcss +++ b/res/css/views/context_menus/_IconizedContextMenu.pcss @@ -27,7 +27,7 @@ limitations under the License. .mx_IconizedContextMenu_optionList_label { font-size: $font-15px; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); } /* the notFirst class is for cases where the optionList might be under a header of sorts. */ diff --git a/res/css/views/dialogs/_AddExistingToSpaceDialog.pcss b/res/css/views/dialogs/_AddExistingToSpaceDialog.pcss index 9a6372a5adb..f71d43ba0b0 100644 --- a/res/css/views/dialogs/_AddExistingToSpaceDialog.pcss +++ b/res/css/views/dialogs/_AddExistingToSpaceDialog.pcss @@ -48,7 +48,7 @@ limitations under the License. margin: 0; color: $secondary-content; font-size: $font-12px; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); line-height: $font-15px; } @@ -96,7 +96,7 @@ limitations under the License. } .mx_AddExistingToSpace_errorHeading { - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); font-size: $font-15px; line-height: $font-18px; color: $alert; @@ -171,7 +171,7 @@ limitations under the License. > div { > h1 { - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); font-size: $font-18px; line-height: $font-22px; margin: 0; diff --git a/res/css/views/dialogs/_CreateRoomDialog.pcss b/res/css/views/dialogs/_CreateRoomDialog.pcss index cca4c4f3cf3..b3c61c3995f 100644 --- a/res/css/views/dialogs/_CreateRoomDialog.pcss +++ b/res/css/views/dialogs/_CreateRoomDialog.pcss @@ -19,7 +19,7 @@ limitations under the License. .mx_CreateRoomDialog_details_summary { list-style: none; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); cursor: pointer; color: $accent; diff --git a/res/css/views/dialogs/_ExportDialog.pcss b/res/css/views/dialogs/_ExportDialog.pcss index ef96ed63818..64599c669c7 100644 --- a/res/css/views/dialogs/_ExportDialog.pcss +++ b/res/css/views/dialogs/_ExportDialog.pcss @@ -19,7 +19,7 @@ limitations under the License. font-size: $font-16px; display: block; font-family: $font-family; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); color: $primary-content; margin-top: 18px; margin-bottom: 12px; diff --git a/res/css/views/dialogs/_FeedbackDialog.pcss b/res/css/views/dialogs/_FeedbackDialog.pcss index ef7bce0cf27..aa778e1776d 100644 --- a/res/css/views/dialogs/_FeedbackDialog.pcss +++ b/res/css/views/dialogs/_FeedbackDialog.pcss @@ -41,7 +41,7 @@ limitations under the License. > h3 { margin-top: 0; margin-bottom: 8px; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); font-size: $font-18px; line-height: $font-22px; } diff --git a/res/css/views/dialogs/_ForwardDialog.pcss b/res/css/views/dialogs/_ForwardDialog.pcss index f1818721f13..4190c052e5b 100644 --- a/res/css/views/dialogs/_ForwardDialog.pcss +++ b/res/css/views/dialogs/_ForwardDialog.pcss @@ -27,7 +27,7 @@ limitations under the License. margin: 0 0 6px; color: $secondary-content; font-size: $font-12px; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); line-height: $font-15px; } diff --git a/res/css/views/dialogs/_InviteDialog.pcss b/res/css/views/dialogs/_InviteDialog.pcss index 86de19b5ab8..5e2a197bf4b 100644 --- a/res/css/views/dialogs/_InviteDialog.pcss +++ b/res/css/views/dialogs/_InviteDialog.pcss @@ -429,7 +429,7 @@ limitations under the License. .mx_InviteDialog_tile_nameStack_name { font-size: $font-15px; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); color: $primary-content; } diff --git a/res/css/views/dialogs/_ManageRestrictedJoinRuleDialog.pcss b/res/css/views/dialogs/_ManageRestrictedJoinRuleDialog.pcss index d99072648f6..8a2d079399c 100644 --- a/res/css/views/dialogs/_ManageRestrictedJoinRuleDialog.pcss +++ b/res/css/views/dialogs/_ManageRestrictedJoinRuleDialog.pcss @@ -54,7 +54,7 @@ limitations under the License. margin: 0; color: $secondary-content; font-size: $font-12px; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); line-height: $font-15px; } diff --git a/res/css/views/dialogs/_RoomSettingsDialogBridges.pcss b/res/css/views/dialogs/_RoomSettingsDialogBridges.pcss index 72fc912ca67..681a76e9e41 100644 --- a/res/css/views/dialogs/_RoomSettingsDialogBridges.pcss +++ b/res/css/views/dialogs/_RoomSettingsDialogBridges.pcss @@ -94,7 +94,7 @@ limitations under the License. .mx_RoomSettingsDialog_workspace_channel_details { color: $primary-content; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); .mx_RoomSettingsDialog_channel { margin-inline-start: 5px; diff --git a/res/css/views/dialogs/_ServerPickerDialog.pcss b/res/css/views/dialogs/_ServerPickerDialog.pcss index 4d246512539..440ddbf5f62 100644 --- a/res/css/views/dialogs/_ServerPickerDialog.pcss +++ b/res/css/views/dialogs/_ServerPickerDialog.pcss @@ -37,7 +37,7 @@ limitations under the License. > h2 { font-size: $font-15px; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); color: $secondary-content; margin: 16px 0 16px 8px; } diff --git a/res/css/views/dialogs/_SpaceSettingsDialog.pcss b/res/css/views/dialogs/_SpaceSettingsDialog.pcss index e0887d1b76f..78c4e42c077 100644 --- a/res/css/views/dialogs/_SpaceSettingsDialog.pcss +++ b/res/css/views/dialogs/_SpaceSettingsDialog.pcss @@ -18,7 +18,7 @@ limitations under the License. color: $primary-content; .mx_SpaceSettings_errorText { - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); font-size: $font-12px; line-height: $font-15px; color: $alert; @@ -48,7 +48,7 @@ limitations under the License. margin-bottom: 4px; .mx_StyledRadioButton_content { - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); line-height: $font-18px; color: $primary-content; } diff --git a/res/css/views/dialogs/_SpotlightDialog.pcss b/res/css/views/dialogs/_SpotlightDialog.pcss index b9fa6348254..1bff0c71053 100644 --- a/res/css/views/dialogs/_SpotlightDialog.pcss +++ b/res/css/views/dialogs/_SpotlightDialog.pcss @@ -158,7 +158,7 @@ limitations under the License. .mx_SpotlightDialog_section { > h4, > .mx_SpotlightDialog_sectionHeader > h4 { - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); font-size: $font-12px; line-height: $font-15px; color: $secondary-content; diff --git a/res/css/views/elements/_SSOButtons.pcss b/res/css/views/elements/_SSOButtons.pcss index ed09ac31e54..d91e448b491 100644 --- a/res/css/views/elements/_SSOButtons.pcss +++ b/res/css/views/elements/_SSOButtons.pcss @@ -33,7 +33,7 @@ limitations under the License. border-radius: 8px; display: inline-block; font-size: $font-14px; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); border: 1px solid $input-border-color; color: $primary-content; diff --git a/res/css/views/elements/_ServerPicker.pcss b/res/css/views/elements/_ServerPicker.pcss index d640a1e7f27..582e5d7bb5b 100644 --- a/res/css/views/elements/_ServerPicker.pcss +++ b/res/css/views/elements/_ServerPicker.pcss @@ -25,7 +25,7 @@ limitations under the License. line-height: $font-20px; > h2 { - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); margin: 0 0 20px; grid-column: 1; grid-row: 1; diff --git a/res/css/views/messages/_CallEvent.pcss b/res/css/views/messages/_CallEvent.pcss index 599b2b86fe0..7749440963e 100644 --- a/res/css/views/messages/_CallEvent.pcss +++ b/res/css/views/messages/_CallEvent.pcss @@ -67,7 +67,7 @@ limitations under the License. } .mx_CallEvent_active .mx_CallEvent_title { - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); } .mx_CallEvent_columns { diff --git a/res/css/views/right_panel/_BaseCard.pcss b/res/css/views/right_panel/_BaseCard.pcss index 22720a99e03..1895c28f206 100644 --- a/res/css/views/right_panel/_BaseCard.pcss +++ b/res/css/views/right_panel/_BaseCard.pcss @@ -34,7 +34,7 @@ limitations under the License. > h2 { margin: 0 44px; /* TODO: Use a spacing variable */ font-size: $font-18px; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); overflow: hidden; text-overflow: ellipsis; white-space: nowrap; @@ -198,7 +198,7 @@ limitations under the License. .mx_AccessibleButton_kind_secondary { color: $secondary-content; background-color: rgba(141, 151, 165, 0.2); - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); font-size: $font-14px; } @@ -226,7 +226,7 @@ limitations under the License. position: initial; span:first-of-type { - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); font-size: inherit; color: $primary-content; } diff --git a/res/css/views/right_panel/_RoomSummaryCard.pcss b/res/css/views/right_panel/_RoomSummaryCard.pcss index f75743037b0..d2aa4a2fb46 100644 --- a/res/css/views/right_panel/_RoomSummaryCard.pcss +++ b/res/css/views/right_panel/_RoomSummaryCard.pcss @@ -236,7 +236,7 @@ limitations under the License. margin-top: 12px; margin-bottom: 12px; font-size: $font-13px; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); } } diff --git a/res/css/views/right_panel/_ThreadPanel.pcss b/res/css/views/right_panel/_ThreadPanel.pcss index 74d6a3175bf..470494df524 100644 --- a/res/css/views/right_panel/_ThreadPanel.pcss +++ b/res/css/views/right_panel/_ThreadPanel.pcss @@ -174,7 +174,7 @@ limitations under the License. h2 { color: $primary-content; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); font-size: $font-18px; margin-top: 24px; margin-bottom: 10px; @@ -204,7 +204,7 @@ limitations under the License. line-height: $font-15px; > b { - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); } } } diff --git a/res/css/views/rooms/_DecryptionFailureBar.pcss b/res/css/views/rooms/_DecryptionFailureBar.pcss index 57dc71b7311..f32b0b2bfea 100644 --- a/res/css/views/rooms/_DecryptionFailureBar.pcss +++ b/res/css/views/rooms/_DecryptionFailureBar.pcss @@ -73,7 +73,7 @@ limitations under the License. .mx_DecryptionFailureBar_start_headline { grid-area: headline; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); font-size: $font-16px; align-self: center; } diff --git a/res/css/views/rooms/_PinnedEventTile.pcss b/res/css/views/rooms/_PinnedEventTile.pcss index aa4fe7c02dd..c3960447831 100644 --- a/res/css/views/rooms/_PinnedEventTile.pcss +++ b/res/css/views/rooms/_PinnedEventTile.pcss @@ -48,7 +48,7 @@ limitations under the License. .mx_PinnedEventTile_sender { grid-area: name; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); font-size: $font-15px; line-height: $font-24px; text-overflow: ellipsis; diff --git a/res/css/views/rooms/_RoomHeader.pcss b/res/css/views/rooms/_RoomHeader.pcss index 38e8124b9f1..f0df6366f85 100644 --- a/res/css/views/rooms/_RoomHeader.pcss +++ b/res/css/views/rooms/_RoomHeader.pcss @@ -94,7 +94,7 @@ limitations under the License. flex: 0 1 auto; overflow: hidden; color: $primary-content; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); font-size: $font-15px; min-height: 24px; align-items: center; diff --git a/res/css/views/rooms/_RoomList.pcss b/res/css/views/rooms/_RoomList.pcss index eb2cc9c4ee7..93a8fc09946 100644 --- a/res/css/views/rooms/_RoomList.pcss +++ b/res/css/views/rooms/_RoomList.pcss @@ -50,7 +50,7 @@ limitations under the License. font-size: $font-14px; div:first-child { - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); line-height: $font-18px; color: $primary-content; } diff --git a/res/css/views/rooms/_RoomListHeader.pcss b/res/css/views/rooms/_RoomListHeader.pcss index 0954685fde2..7abb9d7599a 100644 --- a/res/css/views/rooms/_RoomListHeader.pcss +++ b/res/css/views/rooms/_RoomListHeader.pcss @@ -22,7 +22,7 @@ limitations under the License. .mx_RoomListHeader_contextMenuButton { font-size: $font-15px; line-height: $font-24px; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); padding: 1px 24px 1px 4px; position: relative; overflow: hidden; diff --git a/res/css/views/rooms/_RoomPreviewCard.pcss b/res/css/views/rooms/_RoomPreviewCard.pcss index b7acfb1a321..383e24582e9 100644 --- a/res/css/views/rooms/_RoomPreviewCard.pcss +++ b/res/css/views/rooms/_RoomPreviewCard.pcss @@ -26,7 +26,7 @@ limitations under the License. font-size: $font-14px; .mx_RoomPreviewCard_notice { - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); line-height: $font-24px; color: $primary-content; margin-top: $spacing-24; diff --git a/res/css/views/rooms/_ThreadSummary.pcss b/res/css/views/rooms/_ThreadSummary.pcss index b4e7dd5f3c6..f57bde39bcd 100644 --- a/res/css/views/rooms/_ThreadSummary.pcss +++ b/res/css/views/rooms/_ThreadSummary.pcss @@ -107,7 +107,7 @@ limitations under the License. } .mx_ThreadSummary_sender { - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); } .mx_ThreadSummary_content { diff --git a/res/css/views/settings/_JoinRuleSettings.pcss b/res/css/views/settings/_JoinRuleSettings.pcss index a55432b25a8..18c4395efec 100644 --- a/res/css/views/settings/_JoinRuleSettings.pcss +++ b/res/css/views/settings/_JoinRuleSettings.pcss @@ -27,7 +27,7 @@ limitations under the License. .mx_JoinRuleSettings_spacesWithAccess { > h4 { color: $secondary-content; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); font-size: $font-12px; line-height: $font-15px; text-transform: uppercase; @@ -61,7 +61,7 @@ limitations under the License. .mx_StyledRadioButton_content { margin-left: 14px; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); font-size: $font-15px; line-height: $font-24px; color: $primary-content; diff --git a/res/css/views/settings/_Notifications.pcss b/res/css/views/settings/_Notifications.pcss index 45a5b4529d8..635627e0b02 100644 --- a/res/css/views/settings/_Notifications.pcss +++ b/res/css/views/settings/_Notifications.pcss @@ -53,13 +53,13 @@ limitations under the License. } .mx_UserNotifSettings_gridRowHeading { font-size: $font-18px; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); } .mx_UserNotifSettings_gridColumnLabel { color: $secondary-content; font-size: $font-12px; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); } .mx_UserNotifSettings_gridRowError { // occupy full row @@ -79,7 +79,7 @@ limitations under the License. & > div:first-child { /* section header */ font-size: $font-18px; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); } > table { diff --git a/res/css/views/settings/_SettingsFieldset.pcss b/res/css/views/settings/_SettingsFieldset.pcss index fbb192a4bc5..5e2d466568d 100644 --- a/res/css/views/settings/_SettingsFieldset.pcss +++ b/res/css/views/settings/_SettingsFieldset.pcss @@ -22,7 +22,7 @@ limitations under the License. .mx_SettingsFieldset_legend { font-size: $font-16px; display: block; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); color: $primary-content; margin-bottom: 10px; margin-top: 12px; diff --git a/res/css/views/settings/tabs/room/_NotificationSettingsTab.pcss b/res/css/views/settings/tabs/room/_NotificationSettingsTab.pcss index 7d978cb5f76..780401e8f1b 100644 --- a/res/css/views/settings/tabs/room/_NotificationSettingsTab.pcss +++ b/res/css/views/settings/tabs/room/_NotificationSettingsTab.pcss @@ -22,7 +22,7 @@ limitations under the License. color: $primary-content; font-size: $font-15px; line-height: $font-18px; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); margin-top: 16px; position: relative; padding-left: 8px; diff --git a/res/css/views/spaces/_SpaceCreateMenu.pcss b/res/css/views/spaces/_SpaceCreateMenu.pcss index 972c7461f34..3b04be9ff4d 100644 --- a/res/css/views/spaces/_SpaceCreateMenu.pcss +++ b/res/css/views/spaces/_SpaceCreateMenu.pcss @@ -33,7 +33,7 @@ $spacePanelWidth: 68px; > div { > h2 { - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); font-size: $font-18px; margin-top: 4px; } diff --git a/res/css/views/toasts/_AnalyticsToast.pcss b/res/css/views/toasts/_AnalyticsToast.pcss index 80e95535a5d..130dff4db97 100644 --- a/res/css/views/toasts/_AnalyticsToast.pcss +++ b/res/css/views/toasts/_AnalyticsToast.pcss @@ -19,13 +19,13 @@ limitations under the License. background-color: $accent; color: #ffffff; border: 1px solid $accent; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); } .mx_AccessibleButton_kind_primary { background-color: $accent; color: #ffffff; border: 1px solid $accent; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); } } diff --git a/res/css/views/toasts/_IncomingCallToast.pcss b/res/css/views/toasts/_IncomingCallToast.pcss index 4d879f4f958..dc006208261 100644 --- a/res/css/views/toasts/_IncomingCallToast.pcss +++ b/res/css/views/toasts/_IncomingCallToast.pcss @@ -36,7 +36,7 @@ limitations under the License. .mx_IncomingCallToast_room { display: inline-block; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); font-size: $font-15px; line-height: $font-24px; diff --git a/res/css/views/typography/_Heading.pcss b/res/css/views/typography/_Heading.pcss index 84a008c18f8..a61174ec086 100644 --- a/res/css/views/typography/_Heading.pcss +++ b/res/css/views/typography/_Heading.pcss @@ -16,7 +16,7 @@ limitations under the License. .mx_Heading_h1 { font-size: $font-32px; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); line-height: $font-39px; margin-inline: unset; margin-block: unset; @@ -24,7 +24,7 @@ limitations under the License. .mx_Heading_h2 { font-size: $font-24px; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); line-height: $font-29px; margin-inline: unset; margin-block: unset; @@ -32,7 +32,7 @@ limitations under the License. .mx_Heading_h3 { font-size: $font-18px; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); line-height: $font-22px; margin-inline: unset; margin-block: unset; @@ -40,7 +40,7 @@ limitations under the License. .mx_Heading_h4 { font-size: $font-15px; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); line-height: $font-20px; margin-inline: unset; margin-block: unset; diff --git a/res/css/voice-broadcast/atoms/_LiveBadge.pcss b/res/css/voice-broadcast/atoms/_LiveBadge.pcss index eb0dbd8e4b3..0a1c15de2cc 100644 --- a/res/css/voice-broadcast/atoms/_LiveBadge.pcss +++ b/res/css/voice-broadcast/atoms/_LiveBadge.pcss @@ -21,7 +21,7 @@ limitations under the License. color: $live-badge-color; display: inline-flex; font-size: $font-12px; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); gap: $spacing-4; padding: 2px 4px; } diff --git a/res/css/voice-broadcast/atoms/_VoiceBroadcastHeader.pcss b/res/css/voice-broadcast/atoms/_VoiceBroadcastHeader.pcss index a30beb27b6a..4b8bcff47c7 100644 --- a/res/css/voice-broadcast/atoms/_VoiceBroadcastHeader.pcss +++ b/res/css/voice-broadcast/atoms/_VoiceBroadcastHeader.pcss @@ -34,7 +34,7 @@ limitations under the License. .mx_VoiceBroadcastHeader_room { font-size: $font-12px; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); min-width: 0; overflow: hidden; text-overflow: ellipsis; From a33b9c2182a2cd97377c2427c3891fc9fafb82fb Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Sun, 9 Apr 2023 21:16:21 +0900 Subject: [PATCH 2/3] Replace `font-weight: 600` with the custom property Signed-off-by: Suguru Hirahara --- res/css/_common.pcss | 6 +++--- res/css/structures/_HomePage.pcss | 2 +- res/css/structures/_LargeLoader.pcss | 2 +- res/css/structures/_UserMenu.pcss | 2 +- res/css/structures/auth/_Login.pcss | 2 +- res/css/views/auth/_AuthBody.pcss | 2 +- res/css/views/auth/_CompleteSecurityBody.pcss | 4 ++-- res/css/views/auth/_LanguageSelector.pcss | 2 +- res/css/views/auth/_LoginWithQR.pcss | 2 +- res/css/views/dialogs/_CompoundDialog.pcss | 2 +- res/css/views/dialogs/_CreateRoomDialog.pcss | 2 +- res/css/views/dialogs/_InviteDialog.pcss | 4 ++-- res/css/views/dialogs/_NewSessionReviewDialog.pcss | 2 +- res/css/views/dialogs/_PollCreateDialog.pcss | 2 +- res/css/views/dialogs/_VerifyEMailDialog.pcss | 2 +- .../views/dialogs/security/_CreateSecretStorageDialog.pcss | 4 ++-- res/css/views/elements/_AccessibleButton.pcss | 2 +- res/css/views/elements/_RoomAliasField.pcss | 2 +- res/css/views/elements/_Tooltip.pcss | 2 +- res/css/views/elements/_UseCaseSelection.pcss | 2 +- res/css/views/emojipicker/_EmojiPicker.pcss | 2 +- res/css/views/messages/_DisambiguatedProfile.pcss | 4 ++-- res/css/views/messages/_EventTileBubble.pcss | 2 +- res/css/views/messages/_LegacyCallEvent.pcss | 2 +- res/css/views/messages/_MPollBody.pcss | 2 +- res/css/views/right_panel/_UserInfo.pcss | 4 ++-- res/css/views/room_settings/_AliasSettings.pcss | 2 +- res/css/views/rooms/_AppsDrawer.pcss | 2 +- res/css/views/rooms/_MemberInfo.pcss | 2 +- res/css/views/rooms/_MemberList.pcss | 4 ++-- res/css/views/rooms/_MessageComposerFormatBar.pcss | 2 +- res/css/views/rooms/_NewRoomIntro.pcss | 2 +- res/css/views/rooms/_ReadReceiptGroup.pcss | 2 +- res/css/views/rooms/_RoomBreadcrumbs.pcss | 2 +- res/css/views/rooms/_RoomCallBanner.pcss | 2 +- res/css/views/rooms/_RoomPreviewBar.pcss | 4 ++-- res/css/views/rooms/_RoomSublist.pcss | 4 ++-- res/css/views/rooms/_RoomTile.pcss | 2 +- res/css/views/rooms/_SearchBar.pcss | 2 +- res/css/views/rooms/_WhoIsTypingTile.pcss | 2 +- res/css/views/settings/_DevicesPanel.pcss | 2 +- res/css/views/settings/_ThemeChoicePanel.pcss | 2 +- res/css/views/settings/tabs/_SettingsTab.pcss | 4 ++-- res/css/views/voip/_DialPad.pcss | 2 +- res/css/views/voip/_DialPadContextMenu.pcss | 6 +++--- res/css/views/voip/_DialPadModal.pcss | 4 ++-- 46 files changed, 60 insertions(+), 60 deletions(-) diff --git a/res/css/_common.pcss b/res/css/_common.pcss index 0ef2a68bb33..dae1f8c601c 100644 --- a/res/css/_common.pcss +++ b/res/css/_common.pcss @@ -132,7 +132,7 @@ input[type="password"] { font-family: inherit; padding: 9px; font-size: $font-14px; - font-weight: 600; + font-weight: var(--font-semi-bold); min-width: 0; } @@ -575,7 +575,7 @@ legend { margin-bottom: 5px; /* flip colours for the secondary ones */ - font-weight: 600; + font-weight: var(--font-semi-bold); border: 1px solid $accent; color: $accent; background-color: $button-secondary-bg-color; @@ -794,7 +794,7 @@ legend { @define-mixin LegacyCallButton { box-sizing: border-box; - font-weight: 600; + font-weight: var(--font-semi-bold); height: $font-24px; line-height: $font-24px; margin-right: 0; diff --git a/res/css/structures/_HomePage.pcss b/res/css/structures/_HomePage.pcss index 75f560e2958..b2495634357 100644 --- a/res/css/structures/_HomePage.pcss +++ b/res/css/structures/_HomePage.pcss @@ -73,7 +73,7 @@ limitations under the License. word-break: break-word; box-sizing: border-box; - font-weight: 600; + font-weight: var(--font-semi-bold); font-size: $font-15px; line-height: $font-20px; color: #fff; /* on all themes */ diff --git a/res/css/structures/_LargeLoader.pcss b/res/css/structures/_LargeLoader.pcss index ba95ea56b65..555eb4bee55 100644 --- a/res/css/structures/_LargeLoader.pcss +++ b/res/css/structures/_LargeLoader.pcss @@ -29,7 +29,7 @@ limitations under the License. .mx_LargeLoader_text { font-size: 24px; - font-weight: 600; + font-weight: var(--font-semi-bold); padding: 0 16px; position: relative; text-align: center; diff --git a/res/css/structures/_UserMenu.pcss b/res/css/structures/_UserMenu.pcss index 8a6796b96c9..4c23bf23c0d 100644 --- a/res/css/structures/_UserMenu.pcss +++ b/res/css/structures/_UserMenu.pcss @@ -147,7 +147,7 @@ limitations under the License. display: inline-block; > span { - font-weight: 600; + font-weight: var(--font-semi-bold); display: block; & + span { diff --git a/res/css/structures/auth/_Login.pcss b/res/css/structures/auth/_Login.pcss index f57346a7073..2eba8cf3d14 100644 --- a/res/css/structures/auth/_Login.pcss +++ b/res/css/structures/auth/_Login.pcss @@ -18,7 +18,7 @@ limitations under the License. .mx_Login_submit { @mixin mx_DialogButton; font-size: 15px; - font-weight: 600; + font-weight: var(--font-semi-bold); width: 100%; margin-top: 24px; margin-bottom: 24px; diff --git a/res/css/views/auth/_AuthBody.pcss b/res/css/views/auth/_AuthBody.pcss index b88d6ff1051..0c55637df63 100644 --- a/res/css/views/auth/_AuthBody.pcss +++ b/res/css/views/auth/_AuthBody.pcss @@ -25,7 +25,7 @@ limitations under the License. box-sizing: border-box; b { - font-weight: 600; + font-weight: var(--font-semi-bold); } &.mx_AuthBody_flex { diff --git a/res/css/views/auth/_CompleteSecurityBody.pcss b/res/css/views/auth/_CompleteSecurityBody.pcss index c23f53bd21c..dbc6849c13b 100644 --- a/res/css/views/auth/_CompleteSecurityBody.pcss +++ b/res/css/views/auth/_CompleteSecurityBody.pcss @@ -25,13 +25,13 @@ limitations under the License. h2 { font-size: $font-24px; - font-weight: 600; + font-weight: var(--font-semi-bold); margin-top: 0; } h3 { font-size: $font-14px; - font-weight: 600; + font-weight: var(--font-semi-bold); } a:link, diff --git a/res/css/views/auth/_LanguageSelector.pcss b/res/css/views/auth/_LanguageSelector.pcss index 885ee7f30d5..8a762e0de3c 100644 --- a/res/css/views/auth/_LanguageSelector.pcss +++ b/res/css/views/auth/_LanguageSelector.pcss @@ -21,7 +21,7 @@ limitations under the License. .mx_AuthBody_language .mx_Dropdown_input { border: none; font-size: $font-14px; - font-weight: 600; + font-weight: var(--font-semi-bold); color: $authpage-lang-color; width: auto; } diff --git a/res/css/views/auth/_LoginWithQR.pcss b/res/css/views/auth/_LoginWithQR.pcss index f1259fde0fa..699d7b0f38e 100644 --- a/res/css/views/auth/_LoginWithQR.pcss +++ b/res/css/views/auth/_LoginWithQR.pcss @@ -111,7 +111,7 @@ limitations under the License. .mx_LoginWithQR_confirmationDigits { text-align: center; margin: $spacing-48 auto; - font-weight: 600; + font-weight: var(--font-semi-bold); font-size: $font-24px; color: $primary-content; } diff --git a/res/css/views/dialogs/_CompoundDialog.pcss b/res/css/views/dialogs/_CompoundDialog.pcss index 15df4f39511..b9ddf7837a8 100644 --- a/res/css/views/dialogs/_CompoundDialog.pcss +++ b/res/css/views/dialogs/_CompoundDialog.pcss @@ -37,7 +37,7 @@ limitations under the License. h1 { display: inline-block; - font-weight: 600; + font-weight: var(--font-semi-bold); font-size: $font-24px; margin: 0; /* managed by header class */ } diff --git a/res/css/views/dialogs/_CreateRoomDialog.pcss b/res/css/views/dialogs/_CreateRoomDialog.pcss index b3c61c3995f..de0dba9a1e0 100644 --- a/res/css/views/dialogs/_CreateRoomDialog.pcss +++ b/res/css/views/dialogs/_CreateRoomDialog.pcss @@ -96,7 +96,7 @@ limitations under the License. .mx_SettingsFlag_label { flex: 1 1 0; min-width: 0; - font-weight: 600; + font-weight: var(--font-semi-bold); } .mx_ToggleSwitch { diff --git a/res/css/views/dialogs/_InviteDialog.pcss b/res/css/views/dialogs/_InviteDialog.pcss index 5e2a197bf4b..a7c1346951a 100644 --- a/res/css/views/dialogs/_InviteDialog.pcss +++ b/res/css/views/dialogs/_InviteDialog.pcss @@ -114,7 +114,7 @@ limitations under the License. > span { color: $primary-content; - font-weight: 600; + font-weight: var(--font-semi-bold); } > p { @@ -277,7 +277,7 @@ limitations under the License. input { font-size: 18px; - font-weight: 600; + font-weight: var(--font-semi-bold); padding-top: 0; } diff --git a/res/css/views/dialogs/_NewSessionReviewDialog.pcss b/res/css/views/dialogs/_NewSessionReviewDialog.pcss index 0016b5b91ba..0992c980f32 100644 --- a/res/css/views/dialogs/_NewSessionReviewDialog.pcss +++ b/res/css/views/dialogs/_NewSessionReviewDialog.pcss @@ -28,7 +28,7 @@ limitations under the License. } .mx_NewSessionReviewDialog_deviceName { - font-weight: 600; + font-weight: var(--font-semi-bold); } .mx_NewSessionReviewDialog_deviceID { diff --git a/res/css/views/dialogs/_PollCreateDialog.pcss b/res/css/views/dialogs/_PollCreateDialog.pcss index e50af35a41a..476ac964b78 100644 --- a/res/css/views/dialogs/_PollCreateDialog.pcss +++ b/res/css/views/dialogs/_PollCreateDialog.pcss @@ -26,7 +26,7 @@ limitations under the License. } h2 { - font-weight: 600; + font-weight: var(--font-semi-bold); font-size: $font-15px; line-height: $font-24px; margin-top: 0; diff --git a/res/css/views/dialogs/_VerifyEMailDialog.pcss b/res/css/views/dialogs/_VerifyEMailDialog.pcss index 47541dc452a..a8db4a3d0a6 100644 --- a/res/css/views/dialogs/_VerifyEMailDialog.pcss +++ b/res/css/views/dialogs/_VerifyEMailDialog.pcss @@ -27,7 +27,7 @@ limitations under the License. h1 { font-size: $font-24px; - font-weight: 600; + font-weight: var(--font-semi-bold); } .mx_VerifyEMailDialog_text-light { diff --git a/res/css/views/dialogs/security/_CreateSecretStorageDialog.pcss b/res/css/views/dialogs/security/_CreateSecretStorageDialog.pcss index 5dc40898623..e695992008e 100644 --- a/res/css/views/dialogs/security/_CreateSecretStorageDialog.pcss +++ b/res/css/views/dialogs/security/_CreateSecretStorageDialog.pcss @@ -38,7 +38,7 @@ limitations under the License. .mx_SettingsFlag_label { flex: 1 1 0; min-width: 0; - font-weight: 600; + font-weight: var(--font-semi-bold); } .mx_ToggleSwitch { @@ -103,7 +103,7 @@ limitations under the License. .mx_CreateSecretStorageDialog_optionTitle { color: $dialog-title-fg-color; - font-weight: 600; + font-weight: var(--font-semi-bold); font-size: $font-18px; padding-bottom: 10px; } diff --git a/res/css/views/elements/_AccessibleButton.pcss b/res/css/views/elements/_AccessibleButton.pcss index 4285cb218fd..5d2d765c669 100644 --- a/res/css/views/elements/_AccessibleButton.pcss +++ b/res/css/views/elements/_AccessibleButton.pcss @@ -90,7 +90,7 @@ limitations under the License. &.mx_AccessibleButton_kind_primary, &.mx_AccessibleButton_kind_primary_outline, &.mx_AccessibleButton_kind_secondary { - font-weight: 600; + font-weight: var(--font-semi-bold); } &.mx_AccessibleButton_kind_primary, diff --git a/res/css/views/elements/_RoomAliasField.pcss b/res/css/views/elements/_RoomAliasField.pcss index 94f6c12a143..b05f8a9e0cd 100644 --- a/res/css/views/elements/_RoomAliasField.pcss +++ b/res/css/views/elements/_RoomAliasField.pcss @@ -39,7 +39,7 @@ limitations under the License. color: $info-plinth-fg-color; border-left: none; border-right: none; - font-weight: 600; + font-weight: var(--font-semi-bold); padding: 9px 10px; flex: 0 0 auto; } diff --git a/res/css/views/elements/_Tooltip.pcss b/res/css/views/elements/_Tooltip.pcss index 84274e3e5ef..23c5089ab59 100644 --- a/res/css/views/elements/_Tooltip.pcss +++ b/res/css/views/elements/_Tooltip.pcss @@ -102,7 +102,7 @@ limitations under the License. } .mx_Tooltip_title { - font-weight: 600; + font-weight: var(--font-semi-bold); } .mx_Tooltip_sub { diff --git a/res/css/views/elements/_UseCaseSelection.pcss b/res/css/views/elements/_UseCaseSelection.pcss index 26b2c5652fc..32aa208ccc4 100644 --- a/res/css/views/elements/_UseCaseSelection.pcss +++ b/res/css/views/elements/_UseCaseSelection.pcss @@ -26,7 +26,7 @@ limitations under the License. justify-content: flex-end; h1 { - font-weight: 600; + font-weight: var(--font-semi-bold); font-size: $font-32px; text-align: center; } diff --git a/res/css/views/emojipicker/_EmojiPicker.pcss b/res/css/views/emojipicker/_EmojiPicker.pcss index c9169dbe7d8..242fb23e766 100644 --- a/res/css/views/emojipicker/_EmojiPicker.pcss +++ b/res/css/views/emojipicker/_EmojiPicker.pcss @@ -205,7 +205,7 @@ limitations under the License. .mx_EmojiPicker_category_label, .mx_EmojiPicker_preview_name { font-size: $font-16px; - font-weight: 600; + font-weight: var(--font-semi-bold); margin: 0; } diff --git a/res/css/views/messages/_DisambiguatedProfile.pcss b/res/css/views/messages/_DisambiguatedProfile.pcss index ab173f27b1c..1d577a3923c 100644 --- a/res/css/views/messages/_DisambiguatedProfile.pcss +++ b/res/css/views/messages/_DisambiguatedProfile.pcss @@ -22,12 +22,12 @@ limitations under the License. cursor: pointer; .mx_DisambiguatedProfile_displayName { - font-weight: 600; + font-weight: var(--font-semi-bold); margin-inline-end: 0; } .mx_DisambiguatedProfile_mxid { - font-weight: 600; + font-weight: var(--font-semi-bold); font-size: 1.1rem; margin-inline-start: 5px; opacity: 0.5; /* Match mx_TextualEvent */ diff --git a/res/css/views/messages/_EventTileBubble.pcss b/res/css/views/messages/_EventTileBubble.pcss index bbf346cab16..b2741ac59f6 100644 --- a/res/css/views/messages/_EventTileBubble.pcss +++ b/res/css/views/messages/_EventTileBubble.pcss @@ -48,7 +48,7 @@ limitations under the License. } .mx_EventTileBubble_title { - font-weight: 600; + font-weight: var(--font-semi-bold); font-size: $font-15px; grid-row: 1; } diff --git a/res/css/views/messages/_LegacyCallEvent.pcss b/res/css/views/messages/_LegacyCallEvent.pcss index 8d0f5abbc30..a8f6c83a13f 100644 --- a/res/css/views/messages/_LegacyCallEvent.pcss +++ b/res/css/views/messages/_LegacyCallEvent.pcss @@ -118,7 +118,7 @@ limitations under the License. min-width: 0; .mx_LegacyCallEvent_sender { - font-weight: 600; + font-weight: var(--font-semi-bold); font-size: 1.5rem; line-height: 1.8rem; margin-bottom: $spacing-4; diff --git a/res/css/views/messages/_MPollBody.pcss b/res/css/views/messages/_MPollBody.pcss index e7f3118d571..b86804e9253 100644 --- a/res/css/views/messages/_MPollBody.pcss +++ b/res/css/views/messages/_MPollBody.pcss @@ -18,7 +18,7 @@ limitations under the License. margin-top: 8px; h2 { - font-weight: 600; + font-weight: var(--font-semi-bold); font-size: $font-15px; line-height: $font-24px; margin-top: 0; diff --git a/res/css/views/right_panel/_UserInfo.pcss b/res/css/views/right_panel/_UserInfo.pcss index 6d3c397f3f5..fd017d8a07c 100644 --- a/res/css/views/right_panel/_UserInfo.pcss +++ b/res/css/views/right_panel/_UserInfo.pcss @@ -43,7 +43,7 @@ limitations under the License. h2 { font-size: $font-18px; - font-weight: 600; + font-weight: var(--font-semi-bold); margin: 18px 0 0 0; /* TODO: Use a variable */ } @@ -145,7 +145,7 @@ limitations under the License. h3 { text-transform: uppercase; color: $tertiary-content; - font-weight: 600; + font-weight: var(--font-semi-bold); font-size: $font-12px; margin: $spacing-4 0; } diff --git a/res/css/views/room_settings/_AliasSettings.pcss b/res/css/views/room_settings/_AliasSettings.pcss index a218e29e1dc..66ac17d8422 100644 --- a/res/css/views/room_settings/_AliasSettings.pcss +++ b/res/css/views/room_settings/_AliasSettings.pcss @@ -31,7 +31,7 @@ limitations under the License. summary { cursor: pointer; color: $accent; - font-weight: 600; + font-weight: var(--font-semi-bold); list-style: none; /* list-style doesn't do it for webkit */ diff --git a/res/css/views/rooms/_AppsDrawer.pcss b/res/css/views/rooms/_AppsDrawer.pcss index 91b84ef445a..bb11e92acd1 100644 --- a/res/css/views/rooms/_AppsDrawer.pcss +++ b/res/css/views/rooms/_AppsDrawer.pcss @@ -329,7 +329,7 @@ $MinWidth: 240px; } .mx_AppPermissionWarning_bolder { - font-weight: 600; + font-weight: var(--font-semi-bold); } .mx_AppPermissionWarning h4 { diff --git a/res/css/views/rooms/_MemberInfo.pcss b/res/css/views/rooms/_MemberInfo.pcss index 6fc2ff072b6..021bf54f25e 100644 --- a/res/css/views/rooms/_MemberInfo.pcss +++ b/res/css/views/rooms/_MemberInfo.pcss @@ -50,7 +50,7 @@ limitations under the License. .mx_MemberInfo h2 { font-size: $font-18px; - font-weight: 600; + font-weight: var(--font-semi-bold); margin: 16px 0 16px 15px; } diff --git a/res/css/views/rooms/_MemberList.pcss b/res/css/views/rooms/_MemberList.pcss index 07cf8de33a4..ab4d436a4f2 100644 --- a/res/css/views/rooms/_MemberList.pcss +++ b/res/css/views/rooms/_MemberList.pcss @@ -31,7 +31,7 @@ limitations under the License. h2 { text-transform: uppercase; color: $h3-color; - font-weight: 600; + font-weight: var(--font-semi-bold); font-size: $font-13px; padding-left: 3px; padding-right: 12px; @@ -85,7 +85,7 @@ limitations under the License. display: flex; justify-content: center; color: $button-fg-color; - font-weight: 600; + font-weight: var(--font-semi-bold); } .mx_MemberList_invite.mx_AccessibleButton_disabled { diff --git a/res/css/views/rooms/_MessageComposerFormatBar.pcss b/res/css/views/rooms/_MessageComposerFormatBar.pcss index 214d9a90a42..38aac6fe123 100644 --- a/res/css/views/rooms/_MessageComposerFormatBar.pcss +++ b/res/css/views/rooms/_MessageComposerFormatBar.pcss @@ -99,7 +99,7 @@ limitations under the License. .mx_MessageComposerFormatBar_buttonTooltip { white-space: nowrap; font-size: $font-13px; - font-weight: 600; + font-weight: var(--font-semi-bold); min-width: 54px; text-align: center; diff --git a/res/css/views/rooms/_NewRoomIntro.pcss b/res/css/views/rooms/_NewRoomIntro.pcss index d6eaa84fd00..efb7abddc4d 100644 --- a/res/css/views/rooms/_NewRoomIntro.pcss +++ b/res/css/views/rooms/_NewRoomIntro.pcss @@ -55,7 +55,7 @@ limitations under the License. > h2 { margin-top: 24px; font-size: $font-24px; - font-weight: 600; + font-weight: var(--font-semi-bold); } > p { diff --git a/res/css/views/rooms/_ReadReceiptGroup.pcss b/res/css/views/rooms/_ReadReceiptGroup.pcss index c61ec9f68eb..8b5ae78942b 100644 --- a/res/css/views/rooms/_ReadReceiptGroup.pcss +++ b/res/css/views/rooms/_ReadReceiptGroup.pcss @@ -86,7 +86,7 @@ limitations under the License. font-size: 12px; line-height: 15px; margin: 16px 16px 8px; - font-weight: 600; + font-weight: var(--font-semi-bold); /* shouldn’t be actually focusable */ outline: none; } diff --git a/res/css/views/rooms/_RoomBreadcrumbs.pcss b/res/css/views/rooms/_RoomBreadcrumbs.pcss index 531d9b12713..48daf72bd87 100644 --- a/res/css/views/rooms/_RoomBreadcrumbs.pcss +++ b/res/css/views/rooms/_RoomBreadcrumbs.pcss @@ -44,7 +44,7 @@ limitations under the License. } .mx_RoomBreadcrumbs_placeholder { - font-weight: 600; + font-weight: var(--font-semi-bold); font-size: $font-14px; line-height: 32px; /* specifically to match the height this is not scaled */ height: 32px; diff --git a/res/css/views/rooms/_RoomCallBanner.pcss b/res/css/views/rooms/_RoomCallBanner.pcss index ec26807bb18..67244b57e37 100644 --- a/res/css/views/rooms/_RoomCallBanner.pcss +++ b/res/css/views/rooms/_RoomCallBanner.pcss @@ -36,7 +36,7 @@ limitations under the License. .mx_RoomCallBanner_label { color: $primary-content; - font-weight: 600; + font-weight: var(--font-semi-bold); padding-right: $spacing-8; &::before { diff --git a/res/css/views/rooms/_RoomPreviewBar.pcss b/res/css/views/rooms/_RoomPreviewBar.pcss index bccdf426dca..8d35cab7173 100644 --- a/res/css/views/rooms/_RoomPreviewBar.pcss +++ b/res/css/views/rooms/_RoomPreviewBar.pcss @@ -24,7 +24,7 @@ limitations under the License. h3 { font-size: $font-18px; - font-weight: 600; + font-weight: var(--font-semi-bold); &.mx_RoomPreviewBar_spinnerTitle { display: flex; @@ -141,7 +141,7 @@ limitations under the License. } .mx_RoomPreviewBar_inviter { - font-weight: 600; + font-weight: var(--font-semi-bold); } a.mx_RoomPreviewBar_inviter { diff --git a/res/css/views/rooms/_RoomSublist.pcss b/res/css/views/rooms/_RoomSublist.pcss index 9c41bb2ccf7..1dbfe956ef9 100644 --- a/res/css/views/rooms/_RoomSublist.pcss +++ b/res/css/views/rooms/_RoomSublist.pcss @@ -147,7 +147,7 @@ limitations under the License. max-width: calc(100% - 16px); /* 16px is the badge width */ line-height: $font-16px; font-size: $font-13px; - font-weight: 600; + font-weight: var(--font-semi-bold); /* Ellipsize any text overflow */ text-overflow: ellipsis; @@ -399,7 +399,7 @@ limitations under the License. .mx_RoomSublist_contextMenu_title { font-size: $font-15px; line-height: $font-20px; - font-weight: 600; + font-weight: var(--font-semi-bold); margin-bottom: 4px; } diff --git a/res/css/views/rooms/_RoomTile.pcss b/res/css/views/rooms/_RoomTile.pcss index 700c55b0462..d0db686da81 100644 --- a/res/css/views/rooms/_RoomTile.pcss +++ b/res/css/views/rooms/_RoomTile.pcss @@ -70,7 +70,7 @@ limitations under the License. line-height: $font-18px; &.mx_RoomTile_titleHasUnreadEvents { - font-weight: 600; + font-weight: var(--font-semi-bold); } } diff --git a/res/css/views/rooms/_SearchBar.pcss b/res/css/views/rooms/_SearchBar.pcss index 95aa57df0e8..9bde17a71c5 100644 --- a/res/css/views/rooms/_SearchBar.pcss +++ b/res/css/views/rooms/_SearchBar.pcss @@ -49,7 +49,7 @@ limitations under the License. cursor: pointer; color: $primary-content; border-bottom: 2px solid $accent; - font-weight: 600; + font-weight: var(--font-semi-bold); } .mx_SearchBar_unselected { diff --git a/res/css/views/rooms/_WhoIsTypingTile.pcss b/res/css/views/rooms/_WhoIsTypingTile.pcss index 7157d18f2e5..b260723c7b9 100644 --- a/res/css/views/rooms/_WhoIsTypingTile.pcss +++ b/res/css/views/rooms/_WhoIsTypingTile.pcss @@ -58,7 +58,7 @@ limitations under the License. .mx_WhoIsTypingTile_label { flex: 1; font-size: $font-14px; - font-weight: 600; + font-weight: var(--font-semi-bold); color: $roomtopic-color; } diff --git a/res/css/views/settings/_DevicesPanel.pcss b/res/css/views/settings/_DevicesPanel.pcss index 8a7842d4d0f..69b0d0a664a 100644 --- a/res/css/views/settings/_DevicesPanel.pcss +++ b/res/css/views/settings/_DevicesPanel.pcss @@ -31,7 +31,7 @@ limitations under the License. .mx_DevicesPanel_header_title { font-size: $font-18px; - font-weight: 600; + font-weight: var(--font-semi-bold); color: $primary-content; } diff --git a/res/css/views/settings/_ThemeChoicePanel.pcss b/res/css/views/settings/_ThemeChoicePanel.pcss index 8dfd00e867d..367191430a4 100644 --- a/res/css/views/settings/_ThemeChoicePanel.pcss +++ b/res/css/views/settings/_ThemeChoicePanel.pcss @@ -40,7 +40,7 @@ limitations under the License. margin-right: 15px; margin-top: 10px; - font-weight: 600; + font-weight: var(--font-semi-bold); > span { justify-content: center; diff --git a/res/css/views/settings/tabs/_SettingsTab.pcss b/res/css/views/settings/tabs/_SettingsTab.pcss index 544b5c623b2..4f240109c18 100644 --- a/res/css/views/settings/tabs/_SettingsTab.pcss +++ b/res/css/views/settings/tabs/_SettingsTab.pcss @@ -33,7 +33,7 @@ limitations under the License. .mx_SettingsTab_heading { font-size: $font-20px; - font-weight: 600; + font-weight: var(--font-semi-bold); color: $primary-content; margin-top: 10px; /* TODO: Use a spacing variable */ margin-bottom: 10px; /* TODO: Use a spacing variable */ @@ -47,7 +47,7 @@ limitations under the License. .mx_SettingsTab_subheading { font-size: $font-16px; display: block; - font-weight: 600; + font-weight: var(--font-semi-bold); color: $primary-content; margin-top: $spacing-12; margin-bottom: 10px; /* TODO: Use a spacing variable */ diff --git a/res/css/views/voip/_DialPad.pcss b/res/css/views/voip/_DialPad.pcss index 05d1b57eeba..3a54e5b5d4f 100644 --- a/res/css/views/voip/_DialPad.pcss +++ b/res/css/views/voip/_DialPad.pcss @@ -36,7 +36,7 @@ limitations under the License. background-color: $quinary-content; border-radius: 40px; font-size: 18px; - font-weight: 600; + font-weight: var(--font-semi-bold); text-align: center; vertical-align: middle; margin-left: auto; diff --git a/res/css/views/voip/_DialPadContextMenu.pcss b/res/css/views/voip/_DialPadContextMenu.pcss index 046db3133e9..ebed03985f7 100644 --- a/res/css/views/voip/_DialPadContextMenu.pcss +++ b/res/css/views/voip/_DialPadContextMenu.pcss @@ -48,19 +48,19 @@ limitations under the License. .mx_DialPadContextMenu_title { color: $muted-fg-color; font-size: 12px; - font-weight: 600; + font-weight: var(--font-semi-bold); } .mx_DialPadContextMenu_dialled { height: 1.5em; font-size: 18px; - font-weight: 600; + font-weight: var(--font-semi-bold); border: none; margin: 0px; } .mx_DialPadContextMenu_dialled input { font-size: 18px; - font-weight: 600; + font-weight: var(--font-semi-bold); overflow: hidden; max-width: 185px; text-align: left; diff --git a/res/css/views/voip/_DialPadModal.pcss b/res/css/views/voip/_DialPadModal.pcss index 75ad8a19029..1b57220e0ff 100644 --- a/res/css/views/voip/_DialPadModal.pcss +++ b/res/css/views/voip/_DialPadModal.pcss @@ -41,7 +41,7 @@ limitations under the License. .mx_DialPadModal_title { color: $muted-fg-color; font-size: 12px; - font-weight: 600; + font-weight: var(--font-semi-bold); } .mx_DialPadModal_cancel { @@ -65,7 +65,7 @@ limitations under the License. .mx_DialPadModal_field input { font-size: 18px; - font-weight: 600; + font-weight: var(--font-semi-bold); } .mx_DialPadModal_dialPad { From 9e30d1b96ca8d65835a8d43cfa67d82fe24bdd07 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Fri, 21 Apr 2023 14:33:05 +0000 Subject: [PATCH 3/3] Replace the existing variables Signed-off-by: Suguru Hirahara --- res/css/structures/_SpaceRoomView.pcss | 2 +- res/css/views/right_panel/_RoomSummaryCard.pcss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/res/css/structures/_SpaceRoomView.pcss b/res/css/structures/_SpaceRoomView.pcss index 3ee280a5a50..3487253ee7a 100644 --- a/res/css/structures/_SpaceRoomView.pcss +++ b/res/css/structures/_SpaceRoomView.pcss @@ -24,7 +24,7 @@ $SpaceRoomViewInnerWidth: 428px; border-radius: 8px; border: 1px solid $input-border-color; font-size: $font-17px; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); margin: 20px 0; > div { diff --git a/res/css/views/right_panel/_RoomSummaryCard.pcss b/res/css/views/right_panel/_RoomSummaryCard.pcss index e898a52e33c..d25f5c09b17 100644 --- a/res/css/views/right_panel/_RoomSummaryCard.pcss +++ b/res/css/views/right_panel/_RoomSummaryCard.pcss @@ -21,7 +21,7 @@ limitations under the License. h1 { margin: $spacing-12 0 $spacing-4; - font-weight: $font-semi-bold; + font-weight: var(--font-semi-bold); } .mx_RoomSummaryCard_alias {