sorb/ThreadNet-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Replace legacy $spacing-X vars with Compound Design Tokens (#34380)

Browse Source 
* Replace legacy `$spacing-X` vars with Compound Design Tokens

* Remove unused font size vars

* Use calc to get negative spacing vars
This commit is contained in:
Michael Telatynski
2026-07-22 10:10:57 +00:00
committed by GitHub
parent ef8cfda6fe
commit 49a2bdd7e4
87 changed files with 343 additions and 380 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/web/res/css/views/settings/_FontScalingPanel.pcss
+1 -1
View File
@@ -11,7 +11,7 @@ Please see LICENSE files in the repository root for full details.
border: 1px solid $quinary-content;
border-radius: 10px;
padding: 0 $spacing-16 var(--FontScalingPanel_preview-padding-block) $spacing-16;
padding: 0 var(--cpd-space-4x) var(--FontScalingPanel_preview-padding-block) var(--cpd-space-4x);
pointer-events: none;
display: flow-root;
apps/web/res/css/views/settings/_ImageSizePanel.pcss
+1 -1
View File
@@ -9,7 +9,7 @@ Please see LICENSE files in the repository root for full details.
.mx_ImageSizePanel_radios {
display: flex;
flex-direction: row;
gap: $spacing-16;
gap: var(--cpd-space-4x);
> label {
margin-right: 68px; /* keep the boxes separate */
apps/web/res/css/views/settings/_IntegrationManager.pcss
+1 -1
View File
@@ -28,7 +28,7 @@ Please see LICENSE files in the repository root for full details.
}
h3 {
margin-block: $spacing-20;
margin-block: var(--cpd-space-5x);
}
.mx_IntegrationManager_loading,
apps/web/res/css/views/settings/_Notifications.pcss
+1 -1
View File
@@ -58,7 +58,7 @@ Please see LICENSE files in the repository root for full details.
justify-self: start;
padding-right: 30%;
/* collapse half of the grid-gap */
margin-top: -$spacing-4;
margin-top: calc(-1 * var(--cpd-space-1x));
}
.mx_UserNotifSettings_floatingSection {
apps/web/res/css/views/settings/_RoomProfileSettings.pcss
+4 -4
View File
@@ -17,11 +17,11 @@ Please see LICENSE files in the repository root for full details.
margin-inline-end: 54px;
.mx_Field {
margin-top: $spacing-8;
margin-top: var(--cpd-space-2x);
}
.mx_RoomProfileSettings_profile_controls_topic {
margin-top: $spacing-8;
margin-top: var(--cpd-space-2x);
& > textarea {
font-family: inherit;
@@ -34,7 +34,7 @@ Please see LICENSE files in the repository root for full details.
}
.mx_RoomProfileSettings_profile_controls_userId {
margin-inline-end: $spacing-20;
margin-inline-end: var(--cpd-space-5x);
}
}
}
@@ -43,6 +43,6 @@ Please see LICENSE files in the repository root for full details.
display: flex;
gap: var(--cpd-space-4x);
margin-top: 10px; /* 18px is already accounted for by the <p> above the buttons */
margin-bottom: $spacing-28;
margin-bottom: var(--cpd-space-7x);
}
}
apps/web/res/css/views/settings/_SetIntegrationManager.pcss
+1 -1
View File
@@ -11,7 +11,7 @@ Please see LICENSE files in the repository root for full details.
display: flex;
align-items: center;
flex-wrap: wrap;
column-gap: $spacing-4;
column-gap: var(--cpd-space-1x);
}
form {
margin-top: var(--cpd-space-3x);
apps/web/res/css/views/settings/_SettingsFieldset.pcss
+1 -1
View File
@@ -37,5 +37,5 @@ Please see LICENSE files in the repository root for full details.
.mx_SettingsFieldset_content {
display: flex;
flex-direction: column;
gap: $spacing-8;
gap: var(--cpd-space-2x);
}
apps/web/res/css/views/settings/_SpellCheckLanguages.pcss
+1 -1
View File
@@ -17,5 +17,5 @@ Please see LICENSE files in the repository root for full details.
}
.mx_GeneralUserSettingsTab_spellCheckLanguageInput {
margin-bottom: $spacing-8;
margin-bottom: var(--cpd-space-2x);
}
apps/web/res/css/views/settings/tabs/_SettingsSection.pcss
+2 -2
View File
@@ -35,7 +35,7 @@ Please see LICENSE files in the repository root for full details.
.mx_SettingsSection_subSections {
display: grid;
grid-template-columns: minmax(0, 1fr);
gap: $spacing-32;
gap: var(--cpd-space-8x);
margin: $spacing-16 0;
margin: var(--cpd-space-4x) 0;
}
apps/web/res/css/views/settings/tabs/_SettingsTab.pcss
+3 -3
View File
@@ -52,7 +52,7 @@ Please see LICENSE files in the repository root for full details.
.mx_SettingsTab_section {
$end-gutter: 80px;
margin-bottom: $spacing-24;
margin-bottom: var(--cpd-space-6x);
.mx_SettingsFlag {
margin-inline-end: $end-gutter;
@@ -82,7 +82,7 @@ Please see LICENSE files in the repository root for full details.
.mx_SettingsTab_sections {
display: grid;
grid-template-columns: 1fr;
gap: $spacing-32;
gap: var(--cpd-space-8x);
padding-bottom: $spacing-16;
padding-bottom: var(--cpd-space-4x);
}
apps/web/res/css/views/settings/tabs/room/_SecurityRoomSettingsTab.pcss
+2 -2
View File
@@ -6,13 +6,13 @@ Please see LICENSE files in the repository root for full details.
*/
.mx_SecurityRoomSettingsTab_advancedSection {
margin-top: $spacing-16;
margin-top: var(--cpd-space-4x);
}
.mx_SecurityRoomSettingsTab_warning {
display: flex;
align-items: center;
column-gap: $spacing-4;
column-gap: var(--cpd-space-1x);
svg {
color: #ff0064; /* Match legacy icon colour until redesign */
apps/web/res/css/views/settings/tabs/user/_KeyboardUserSettingsTab.pcss
+3 -3
View File
@@ -12,7 +12,7 @@ Please see LICENSE files in the repository root for full details.
padding: 0;
width: 100%;
display: grid;
gap: $spacing-4;
gap: var(--cpd-space-1x);
}
.mx_KeyboardShortcut_shortcutRow,
@@ -23,10 +23,10 @@ Please see LICENSE files in the repository root for full details.
}
.mx_KeyboardShortcut_shortcutRow {
column-gap: $spacing-8;
column-gap: var(--cpd-space-2x);
}
.mx_KeyboardShortcut {
flex-wrap: nowrap;
column-gap: $spacing-4;
column-gap: var(--cpd-space-1x);
}
apps/web/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.pcss
+3 -3
View File
@@ -8,7 +8,7 @@ Please see LICENSE files in the repository root for full details.
.mx_SecurityUserSettingsTab_bulkOptions {
display: flex;
flex-direction: row;
column-gap: $spacing-8;
column-gap: var(--cpd-space-2x);
}
.mx_SecurityUserSettingsTab_ignoredUsers {
@@ -18,11 +18,11 @@ Please see LICENSE files in the repository root for full details.
}
.mx_SecurityUserSettingsTab_ignoredUser {
margin-bottom: $spacing-4;
margin-bottom: var(--cpd-space-1x);
}
.mx_SecurityUserSettingsTab_ignoredUser .mx_AccessibleButton {
margin-right: $spacing-8;
margin-right: var(--cpd-space-2x);
}
.mx_SecurityUserSettingsTab_warning {