Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit d340fa8

Browse files
luixxiulluixxiul
authored
Remove TODO comments about spacing variables (#10695)
The variables on _spacing.pcss have been deprecated by #10686
1 parent c42a776 commit d340fa8

18 files changed

+56
-56
lines changed

‎res/css/structures/_RoomView.pcss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ limitations under the License.
1515
*/
1616

1717
:root {
18-
--RoomView_MessageList-padding: 18px; /* TODO: use a variable */
18+
--RoomView_MessageList-padding: 18px;
1919
}
2020

2121
.mx_RoomView_wrapper {
@@ -212,7 +212,7 @@ limitations under the License.
212212
margin-bottom: 4px;
213213

214214
h2 {
215-
margin-top: 6px; /* TODO: Use a spacing variable */
215+
margin-top: 6px;
216216
}
217217
}
218218

‎res/css/views/beta/_BetaCard.pcss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ limitations under the License.
3535
font-size: $font-18px;
3636
line-height: $font-22px;
3737
color: $primary-content;
38-
margin: $spacing-4 0 14px; // TODO: use a spacing variable
38+
margin: $spacing-4 0 14px;
3939

4040
display: flex;
4141
align-items: center;
@@ -117,7 +117,7 @@ limitations under the License.
117117

118118
.mx_BetaCard_betaPill {
119119
background-color: $accent-alt;
120-
padding: $spacing-4 10px; // TODO: use a spacing variable
120+
padding: $spacing-4 10px;
121121
border-radius: 8px;
122122
text-transform: uppercase;
123123
font-size: $font-12px;

‎res/css/views/dialogs/_InviteDialog.pcss

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ limitations under the License.
2828
flex-direction: row;
2929
/* Right margin for the design. We could apply this to the whole dialog, but then the scrollbar */
3030
/* for the user section gets weird. */
31-
margin: $spacing-8 45px 0 0; /* TODO: Use a spacing variable */
31+
margin: $spacing-8 45px 0 0;
3232

3333
.mx_InviteDialog_editor {
3434
flex: 1;
@@ -43,14 +43,14 @@ limitations under the License.
4343
flex-wrap: wrap;
4444

4545
.mx_InviteDialog_userTile {
46-
margin: 6px 6px 0 0; /* TODO: Use a spacing variable */
46+
margin: 6px 6px 0 0;
4747
display: inline-block;
4848
min-width: max-content; /* prevent manipulation by flexbox */
4949
}
5050

5151
/* overrides bunch of our default text input styles */
5252
> input[type="text"] {
53-
margin: 6px 0 !important; /* TODO: Use a spacing variable */
53+
margin: 6px 0 !important;
5454
height: 24px;
5555
line-height: $font-24px;
5656
font-size: $font-14px;
@@ -67,7 +67,7 @@ limitations under the License.
6767

6868
.mx_InviteDialog_goButton {
6969
min-width: 48px;
70-
margin-inline-start: 10px; /* TODO: Use a spacing variable */
70+
margin-inline-start: 10px;
7171
height: 25px;
7272
line-height: $font-25px;
7373
}
@@ -77,7 +77,7 @@ limitations under the License.
7777
/* Width and height are required to trick the layout engine. */
7878
width: 20px;
7979
height: 20px;
80-
margin-inline-start: 5px; /* TODO: Use a spacing variable */
80+
margin-inline-start: 5px;
8181
display: inline-block;
8282
vertical-align: middle;
8383
}
@@ -103,7 +103,7 @@ limitations under the License.
103103
}
104104

105105
.mx_InviteDialog_section_showMore {
106-
margin: 7px 18px; /* TODO: Use a spacing variable */
106+
margin: 7px 18px;
107107
display: block;
108108
}
109109
}
@@ -252,7 +252,7 @@ limitations under the License.
252252
.mx_InviteDialog_userSections {
253253
margin-top: $spacing-4;
254254
overflow-y: auto;
255-
padding: 0 45px $spacing-4 0; /* TODO: Use a spacing variable */
255+
padding: 0 45px $spacing-4 0;
256256
}
257257

258258
.mx_InviteDialog_helpText {
@@ -289,7 +289,7 @@ limitations under the License.
289289

290290
.mx_DialPad {
291291
row-gap: $spacing-16;
292-
column-gap: 48px; /* TODO: Use a spacing variable */
292+
column-gap: 48px;
293293
margin-inline: auto;
294294
}
295295
}
@@ -450,7 +450,7 @@ limitations under the License.
450450
}
451451

452452
.mx_InviteDialog_identityServer {
453-
margin-top: 1em; /* TODO: Use a spacing variable */
453+
margin-top: 1em;
454454
}
455455

456456
.mx_InviteDialog_oneThreepid {

‎res/css/views/dialogs/_SpotlightDialog.pcss

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ limitations under the License.
3636

3737
kbd {
3838
display: inline-block;
39-
padding: 2px $spacing-4; /* TODO: Use a spacing variable */
39+
padding: 2px $spacing-4;
4040
margin: 0 $spacing-4;
4141
border-radius: 6px;
4242
background-color: $quinary-content;
@@ -76,7 +76,7 @@ limitations under the License.
7676
vertical-align: middle;
7777
color: $primary-content;
7878
position: relative;
79-
padding: $spacing-4 $spacing-8 $spacing-4 37px; /* TODO: Use a spacing variable */
79+
padding: $spacing-4 $spacing-8 $spacing-4 37px;
8080

8181
&::before {
8282
background-color: $secondary-content;
@@ -234,7 +234,7 @@ limitations under the License.
234234
.mx_SpotlightDialog_otherSearches,
235235
.mx_SpotlightDialog_hiddenResults {
236236
.mx_SpotlightDialog_option {
237-
padding: 6px $spacing-4; /* TODO: Use a spacing variable */
237+
padding: 6px $spacing-4;
238238
border-radius: 8px;
239239
font-size: $font-15px;
240240
line-height: $font-24px;
@@ -258,11 +258,11 @@ limitations under the License.
258258

259259
.mx_AccessibleButton {
260260
padding: $spacing-4 $spacing-20;
261-
margin: 2px $spacing-4; /* TODO: Use a spacing variable */
261+
margin: 2px $spacing-4;
262262
}
263263

264264
.mx_SpotlightDialog_enterPrompt {
265-
margin-top: 9px; /* TODO: Use a spacing variable */
265+
margin-top: 9px;
266266
margin-right: $spacing-8;
267267
}
268268
}
@@ -379,7 +379,7 @@ limitations under the License.
379379
.mx_AccessibleButton {
380380
position: relative;
381381
margin: 0;
382-
padding: 3px $spacing-8 3px $spacing-28; /* TODO: Use a spacing variable */
382+
padding: 3px $spacing-8 3px $spacing-28;
383383

384384
&::before {
385385
content: "";
@@ -480,7 +480,7 @@ limitations under the License.
480480
}
481481

482482
.mx_SpotlightDialog_enterPrompt {
483-
padding: 2px $spacing-4; /* TODO: Use a spacing variable */
483+
padding: 2px $spacing-4;
484484
/* To avoid any styling inherent with <kbd> elements */
485485
font-family: inherit;
486486
font-weight: inherit;

‎res/css/views/dialogs/security/_AccessSecretStorageDialog.pcss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ limitations under the License.
2323
height: 24px;
2424
margin-inline-end: $spacing-8;
2525
position: relative;
26-
top: 5px; /* TODO: spacing variable */
26+
top: 5px;
2727
background-color: $primary-content;
2828
}
2929

@@ -81,7 +81,7 @@ limitations under the License.
8181
mask-repeat: no-repeat;
8282
mask-position: center;
8383
mask-size: 20px;
84-
margin-inline-end: 5px; /* TODO: spacing variable */
84+
margin-inline-end: 5px;
8585
}
8686

8787
&.mx_AccessSecretStorageDialog_recoveryKeyFeedback--valid {
@@ -109,7 +109,7 @@ limitations under the License.
109109
text-align: initial;
110110
display: flex;
111111
flex-flow: column;
112-
gap: 14px; /* TODO: spacing variable */
112+
gap: 14px;
113113

114114
.mx_Dialog_buttons_additive {
115115
float: none;

‎res/css/views/elements/_GenericEventListSummary.pcss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ limitations under the License.
2323

2424
.mx_GenericEventListSummary_spacer {
2525
border-bottom: 1px solid $primary-hairline-color;
26-
margin-left: 63px; /* TODO: Use a variable */
26+
margin-left: 63px;
2727
line-height: $font-30px; /* TODO: Use a variable */
2828

2929
.mx_IRCLayout & {

‎res/css/views/elements/_ReplyChain.pcss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ limitations under the License.
1616

1717
.mx_ReplyChain {
1818
margin: 0; // Reset default blockquote margin
19-
padding-left: 10px; // TODO: Use a spacing variable
20-
border-left: 2px solid var(--username-color); // TODO: Use a spacing variable
21-
border-radius: 2px; // TODO: Use a spacing variable
19+
padding-left: 10px;
20+
border-left: 2px solid var(--username-color);
21+
border-radius: 2px;
2222

2323
.mx_ReplyChain_show {
2424
&.mx_AccessibleButton_kind_link_inline {

‎res/css/views/messages/_EventTileBubble.pcss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ limitations under the License.
1515
*/
1616

1717
.mx_EventTileBubble {
18-
--EventTileBubble_margin-block: 10px; /* TODO: Use a spacing variable */
18+
--EventTileBubble_margin-block: 10px;
1919

2020
background-color: $dark-panel-bg-color;
21-
padding: 10px; /* TODO: Use a spacing variable */
21+
padding: 10px;
2222
border-radius: 8px;
2323
/* Reserve space for external timestamps, but also cap the width */
2424
max-width: min(calc(100% - 2 * var(--MessageTimestamp-width)), 600px);

‎res/css/views/messages/_ViewSourceEvent.pcss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ limitations under the License.
2929

3030
pre {
3131
line-height: 1.2;
32-
margin: 3.5px 0; /* TODO: use a variable */
32+
margin: 3.5px 0;
3333
}
3434

3535
.mx_ViewSourceEvent_toggle {
@@ -56,7 +56,7 @@ limitations under the License.
5656
align-self: flex-end;
5757
height: var(--ViewSourceEvent_toggle-size);
5858
mask-position: 0 bottom;
59-
margin-bottom: 5px; /* TODO: use a variable */
59+
margin-bottom: 5px;
6060
mask-image: url("$(res)/img/element-icons/minimise-collapse.svg");
6161
}
6262
}

‎res/css/views/right_panel/_BaseCard.pcss

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
.mx_BaseCard {
1818
--BaseCard_padding-inline: $spacing-8;
1919
--BaseCard_EventTile_line-padding-block: 2px;
20-
--BaseCard_EventTile-spacing-inline: 36px; /* TODO: Use a spacing variable */
20+
--BaseCard_EventTile-spacing-inline: 36px;
2121
--BaseCard_header-button-size: 24px;
2222

2323
padding: 0 var(--BaseCard_padding-inline);
@@ -32,7 +32,7 @@ limitations under the License.
3232
margin: $spacing-4 0 $spacing-12;
3333

3434
> h2 {
35-
margin: 0 44px; /* TODO: Use a spacing variable */
35+
margin: 0 44px;
3636
font-size: $font-18px;
3737
font-weight: var(--font-semi-bold);
3838
overflow: hidden;
@@ -79,7 +79,7 @@ limitations under the License.
7979
margin-inline-start: var(--BaseCard_header-button-size);
8080

8181
.mx_BaseCard_header_title_heading {
82-
margin-inline-start: 6px; /* TODO: Use a spacing variable */
82+
margin-inline-start: 6px;
8383
}
8484
}
8585
}
@@ -159,7 +159,7 @@ limitations under the License.
159159
}
160160

161161
.mx_BaseCard_Button {
162-
padding: 10px; /* TODO: Use a spacing variable */
162+
padding: 10px;
163163
padding-inline-start: $spacing-12;
164164
margin: 0;
165165
position: relative;
@@ -234,16 +234,16 @@ limitations under the License.
234234

235235
font-size: $font-12px;
236236
color: $secondary-content;
237-
padding-top: 10px; /* TODO: Use a spacing variable */
238-
padding-bottom: 10px; /* TODO: Use a spacing variable */
237+
padding-top: 10px;
238+
padding-bottom: 10px;
239239

240240
border: 1px solid $quinary-content;
241241
box-shadow: 0px 1px 3px rgba(23, 25, 28, 0.05);
242242
}
243243

244244
.mx_ContextualMenu_chevron_top {
245245
left: auto;
246-
right: 22px; /* TODO: Use a spacing variable */
246+
right: 22px;
247247
border-bottom-color: $quinary-content;
248248

249249
&::after {

‎res/css/views/right_panel/_ThreadPanel.pcss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ limitations under the License.
2626
}
2727

2828
.mx_ThreadPanel_dropdown {
29-
padding: 3px $spacing-4 3px $spacing-8; /* TODO: Use a spacing variable */
29+
padding: 3px $spacing-4 3px $spacing-8;
3030
border-radius: 4px;
3131
line-height: 1.5;
3232
user-select: none;

‎res/css/views/right_panel/_UserInfo.pcss

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ limitations under the License.
2727
top: 0;
2828
border-radius: 4px;
2929
background-color: $dark-panel-bg-color;
30-
margin: 9px; /* TODO: Use a variable */
30+
margin: 9px;
3131
z-index: 1; /* render on top of the right panel */
3232

3333
div {
@@ -44,7 +44,7 @@ limitations under the License.
4444
h2 {
4545
font-size: $font-18px;
4646
font-weight: var(--font-semi-bold);
47-
margin: 18px 0 0 0; /* TODO: Use a variable */
47+
margin: 18px 0 0 0;
4848
}
4949

5050
.mx_UserInfo_container {
@@ -151,7 +151,7 @@ limitations under the License.
151151
}
152152

153153
p {
154-
margin: 5px 0; /* TODO: Use a variable */
154+
margin: 5px 0;
155155
}
156156

157157
.mx_UserInfo_profile {
@@ -179,7 +179,7 @@ limitations under the License.
179179
}
180180

181181
.mx_E2EIcon {
182-
margin-top: 3px; /* visual vertical centering to the top line of text. TODO: Use a variable */
182+
margin-top: 3px; /* visual vertical centering to the top line of text. */
183183
margin-inline-end: $spacing-4; /* margin from displayName */
184184
min-width: 18px; /* convince flexbox to not collapse it */
185185
}
@@ -196,7 +196,7 @@ limitations under the License.
196196
justify-content: center;
197197
align-items: center;
198198

199-
margin: 6px 0; /* TODO: Use a variable */
199+
margin: 6px 0;
200200

201201
.mx_UserInfo_roleDescription {
202202
display: flex;

‎res/css/views/rooms/_EventTile.pcss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ limitations under the License.
1818
$left-gutter: 64px;
1919

2020
.mx_EventTile {
21-
--EventTile_content-margin-inline-end: 34px; /* TODO: Use a spacing variable */
21+
--EventTile_content-margin-inline-end: 34px;
2222
--EventTile_group_line-spacing-block-start: 1px;
2323
--EventTile_group_line-spacing-block-end: 3px;
2424
--EventTile_group_line-spacing-inline-start: $left-gutter;
@@ -347,7 +347,7 @@ $left-gutter: 64px;
347347
> .mx_DisambiguatedProfile_mxid {
348348
visibility: collapse;
349349
margin-left: 0; /* Override the inherited margin. */
350-
padding: 0 5px; /* TODO: Use a spacing variable */
350+
padding: 0 5px;
351351
}
352352

353353
&:hover {
@@ -537,7 +537,7 @@ $left-gutter: 64px;
537537
}
538538

539539
.mx_RoomView_timeline_rr_enabled & {
540-
$inline-end-margin: 80px; /* TODO: Use a spacing variable */
540+
$inline-end-margin: 80px;
541541

542542
.mx_ThreadSummary,
543543
.mx_ThreadSummary_icon,

0 commit comments

Comments
 (0)