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

Commit 035786a

Browse files
authored
Move mx_EventTile_line and mx_EventTile_reply out of mx_EventTile:not([data-layout=bubble]) (#8910)
Signed-off-by: Suguru Hirahara <[email protected]>
1 parent 80be02b commit 035786a

File tree

3 files changed

+30
-30
lines changed

3 files changed

+30
-30
lines changed

res/css/views/right_panel/_TimelineCard.scss

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,25 @@ limitations under the License.
3434
.mx_EventTile {
3535
&[data-layout=irc],
3636
&[data-layout=group] {
37+
&.mx_EventTile_info .mx_EventTile_line,
38+
.mx_EventTile_line {
39+
padding: var(--BaseCard_EventTile_line-padding-block) var(--BaseCard_EventTile-spacing-inline);
40+
padding-inline-end: $MessageTimestamp_width; // ensure timestamp is not hidden
41+
42+
.mx_EventTile_e2eIcon {
43+
inset-inline-start: $spacing-8;
44+
}
45+
}
46+
47+
&.mx_EventTile_info {
48+
.mx_EventTile_avatar {
49+
inset-inline-start: 18px;
50+
}
51+
}
52+
3753
.mx_EventTile_avatar {
3854
position: absolute; // for IRC layout
39-
left: -3px;
55+
inset-inline-start: -3px;
4056
}
4157

4258
.mx_EventTile_msgOption {
@@ -83,27 +99,11 @@ limitations under the License.
8399
}
84100

85101
&:not([data-layout="bubble"]) {
86-
&.mx_EventTile_info .mx_EventTile_line,
87-
.mx_EventTile_line {
88-
padding: var(--BaseCard_EventTile_line-padding-block) var(--BaseCard_EventTile-spacing-inline);
89-
padding-inline-end: $MessageTimestamp_width; // ensure timestamp is not hidden
90-
91-
.mx_EventTile_e2eIcon {
92-
inset-inline-start: 8px;
93-
}
94-
}
95-
96102
.mx_MessageTimestamp {
97103
position: absolute; // for modern layout and IRC layout
98104
inset-inline-start: auto;
99105
inset-inline-end: 0;
100106
}
101-
102-
&.mx_EventTile_info {
103-
.mx_EventTile_avatar {
104-
left: 18px;
105-
}
106-
}
107107
}
108108
}
109109

res/css/views/rooms/_EventTile.scss

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,16 @@ $threadInfoLineHeight: calc(2 * $font-12px); // See: _commons.scss
8686
.mx_MImageBody {
8787
margin-right: 34px;
8888
}
89+
90+
.mx_EventTile_line,
91+
.mx_EventTile_reply {
92+
position: relative;
93+
border-radius: 8px;
94+
}
95+
96+
.mx_EventTile_reply {
97+
margin-right: 10px;
98+
}
8999
}
90100

91101
&[data-layout=group] {
@@ -113,6 +123,7 @@ $threadInfoLineHeight: calc(2 * $font-12px); // See: _commons.scss
113123
.mx_EventTile_reply {
114124
padding-top: 1px;
115125
padding-bottom: 3px;
126+
padding-left: $left-gutter;
116127
line-height: $font-22px;
117128
}
118129

@@ -197,17 +208,6 @@ $threadInfoLineHeight: calc(2 * $font-12px); // See: _commons.scss
197208
clear: both;
198209
}
199210

200-
.mx_EventTile_line,
201-
.mx_EventTile_reply {
202-
position: relative;
203-
padding-left: $left-gutter;
204-
border-radius: 8px;
205-
}
206-
207-
.mx_EventTile_reply {
208-
margin-right: 10px;
209-
}
210-
211211
/* this is used for the tile for the event which is selected via the URL.
212212
* TODO: ultimately we probably want some transition on here.
213213
*/

res/css/views/rooms/_IRCLayout.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ $irc-line-height: $font-18px;
4848
}
4949
}
5050

51-
.mx_EventTile_line, .mx_EventTile_reply {
52-
padding: 0;
51+
.mx_EventTile_line,
52+
.mx_EventTile_reply {
5353
display: flex;
5454
flex-direction: column;
5555
order: 3;

0 commit comments

Comments
 (0)