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

Commit b1fb609

Browse files
authored
Specify spacing around EventTileBubble for each layout (#9001)
* Apply margin to EventTileBubble on each layout Use a variable to ensure alignment of EventTileBubble on IRC layout Signed-off-by: Suguru Hirahara <[email protected]> * Improve style rules Signed-off-by: Suguru Hirahara <[email protected]> * Apply the same block margin to every layout Signed-off-by: Suguru Hirahara <[email protected]>
1 parent e3fda73 commit b1fb609

File tree

3 files changed

+38
-19
lines changed

3 files changed

+38
-19
lines changed

res/css/views/messages/_EventTileBubble.scss

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

1717
.mx_EventTileBubble {
1818
background-color: $dark-panel-bg-color;
19-
padding: 10px;
19+
padding: 10px; // TODO: Use a spacing variable
2020
border-radius: 8px;
21-
margin: 10px auto;
2221
// Reserve space for external timestamps, but also cap the width
2322
max-width: min(calc(100% - 2 * $MessageTimestamp_width), 600px);
2423
box-sizing: border-box;
2524
display: grid;
2625
grid-template-columns: 24px minmax(0, 1fr) min-content min-content;
2726

28-
.mx_EventTile[data-layout=bubble] & {
29-
// Timestamps are inside the tile, so the width can be less constrained
30-
max-width: 600px;
31-
}
32-
33-
&::before, &::after {
27+
&::before,
28+
&::after {
3429
position: relative;
3530
grid-column: 1;
3631
grid-row: 1 / 3;
3732
width: 16px;
3833
height: 16px;
3934
content: "";
40-
top: 0;
41-
bottom: 0;
42-
left: 0;
43-
right: 0;
35+
inset: 0;
4436
mask-repeat: no-repeat;
4537
mask-position: center;
4638
mask-size: contain;
47-
margin-top: 4px;
39+
margin-top: $spacing-4;
4840
}
4941

50-
.mx_EventTileBubble_title, .mx_EventTileBubble_subtitle {
42+
.mx_EventTileBubble_title,
43+
.mx_EventTileBubble_subtitle {
44+
grid-column: 2;
5145
overflow-wrap: break-word;
5246
}
5347

5448
.mx_EventTileBubble_title {
5549
font-weight: 600;
5650
font-size: $font-15px;
57-
grid-column: 2;
5851
grid-row: 1;
5952
}
6053

6154
.mx_EventTileBubble_subtitle {
6255
font-size: $font-12px;
63-
grid-column: 2;
6456
grid-row: 2;
6557
}
6658

6759
.mx_MessageTimestamp {
6860
grid-column: 4;
6961
grid-row: 1 / 3;
7062
align-self: center;
71-
margin-left: 16px;
63+
margin-left: $spacing-16;
7264
}
7365
}

res/css/views/rooms/_EventTile.scss

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,10 @@ $left-gutter: 64px;
7373
}
7474
}
7575

76+
.mx_EventTileBubble {
77+
margin-block: 10px; // TODO: Use a spacing variable
78+
}
79+
7680
.mx_MImageBody {
7781
.mx_MImageBody_thumbnail_container {
7882
display: flex;
@@ -217,10 +221,28 @@ $left-gutter: 64px;
217221
}
218222
}
219223

224+
&[data-layout=bubble],
225+
&[data-layout=group] {
226+
.mx_EventTileBubble {
227+
margin-inline: auto;
228+
}
229+
}
230+
220231
&[data-layout=irc] {
232+
--EventTile_irc_line_info-inset-inline-start: calc(var(--name-width) + 10px + var(--icon-width));
233+
221234
.mx_MessageTimestamp {
222235
text-align: right;
223236
}
237+
238+
.mx_EventTileBubble {
239+
position: relative;
240+
left: var(--EventTile_irc_line_info-inset-inline-start);
241+
}
242+
243+
.mx_ReplyTile .mx_EventTileBubble {
244+
left: unset; // Cancel the value specified above for the tile inside ReplyTile
245+
}
224246
}
225247

226248
&[data-layout=group] {
@@ -306,6 +328,11 @@ $left-gutter: 64px;
306328
}
307329

308330
&[data-layout=bubble] {
331+
.mx_EventTileBubble {
332+
// Timestamps are inside the tile, so the width can be less constrained
333+
max-width: 600px;
334+
}
335+
309336
&.mx_EventTile_continuation {
310337
margin-top: 2px;
311338
}

res/css/views/rooms/_IRCLayout.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,13 +163,13 @@ $irc-line-height: $font-18px;
163163

164164
.mx_EventTile.mx_EventTile_info {
165165
.mx_EventTile_avatar {
166-
left: calc(var(--name-width) + 10px + var(--icon-width));
166+
left: var(--EventTile_irc_line_info-inset-inline-start);
167167
top: 0;
168168
margin-right: var(--right-padding);
169169
}
170170

171171
.mx_EventTile_line {
172-
left: calc(var(--name-width) + 10px + var(--icon-width));
172+
left: var(--EventTile_irc_line_info-inset-inline-start);
173173
}
174174

175175
.mx_TextualEvent {

0 commit comments

Comments
 (0)