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

Commit addd6a7

Browse files
committed
Fix regressions: chat panel with a maximized widget
Signed-off-by: Suguru Hirahara <[email protected]>
1 parent ef33183 commit addd6a7

File tree

3 files changed

+36
-18
lines changed

3 files changed

+36
-18
lines changed

res/css/views/right_panel/_ThreadPanel.scss

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,32 @@ limitations under the License.
111111
overflow-y: scroll; // set gap between the thread tile and the right border
112112
}
113113

114+
.mx_GroupLayout {
115+
.mx_EventTile {
116+
> .mx_DisambiguatedProfile {
117+
margin-inline-start: 0;
118+
line-height: normal;
119+
}
120+
121+
.mx_MessageTimestamp {
122+
position: initial;
123+
width: auto;
124+
}
125+
}
126+
}
127+
128+
// chat panel with a maximized widget
129+
&.mx_TimelineCard {
130+
.mx_GroupLayout {
131+
.mx_EventTile {
132+
.mx_MessageTimestamp {
133+
position: absolute;
134+
width: $MessageTimestamp_width;
135+
}
136+
}
137+
}
138+
}
139+
114140
&.mx_ThreadView .mx_ThreadView_timelinePanelWrapper {
115141
position: relative;
116142
min-height: 0; // don't displace the composer

res/css/views/right_panel/_TimelineCard.scss

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,6 @@ limitations under the License.
4242
border-radius: 8px;
4343
}
4444

45-
.mx_AutoHideScrollbar {
46-
padding-right: 10px;
47-
width: calc(100% - 10px);
48-
}
49-
5045
.mx_NewRoomIntro {
5146
margin-left: 36px;
5247
}

res/css/views/rooms/_GroupLayout.scss

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,30 +19,27 @@ $left-gutter: 64px;
1919

2020
.mx_GroupLayout {
2121
.mx_EventTile {
22+
> .mx_DisambiguatedProfile {
23+
line-height: $font-20px;
24+
margin-left: $left-gutter;
25+
}
26+
2227
> .mx_EventTile_avatar {
2328
position: absolute;
2429
z-index: 9;
2530
}
2631

32+
.mx_MessageTimestamp {
33+
position: absolute;
34+
width: $MessageTimestamp_width;
35+
}
36+
2737
.mx_EventTile_line,
2838
.mx_EventTile_reply {
2939
padding-top: 1px;
3040
padding-bottom: 3px;
3141
line-height: $font-22px;
3242
}
33-
34-
// See: _EventTile.scss
35-
&:not([data-shape="ThreadsList"]) {
36-
.mx_MessageTimestamp {
37-
position: absolute;
38-
width: $MessageTimestamp_width;
39-
}
40-
41-
> .mx_DisambiguatedProfile {
42-
line-height: $font-20px;
43-
margin-left: $left-gutter;
44-
}
45-
}
4643
}
4744
}
4845

0 commit comments

Comments
 (0)