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

Commit 52b578f

Browse files
authored
Merge pull request #6193 from SimonBrandner/fix/irc-layout-mxid/17648
Fix IRC layout regressions
2 parents 494f4d3 + 21a960a commit 52b578f

File tree

2 files changed

+22
-32
lines changed

2 files changed

+22
-32
lines changed

res/css/views/rooms/_IRCLayout.scss

Lines changed: 21 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ $irc-line-height: $font-18px;
2929
// timestamps are links which shouldn't be underlined
3030
> a {
3131
text-decoration: none;
32+
min-width: 45px;
3233
}
3334

3435
display: flex;
@@ -49,18 +50,6 @@ $irc-line-height: $font-18px;
4950
}
5051
}
5152

52-
> .mx_SenderProfile {
53-
order: 2;
54-
flex-shrink: 0;
55-
width: var(--name-width);
56-
text-overflow: ellipsis;
57-
text-align: left;
58-
display: flex;
59-
align-items: center;
60-
overflow: visible;
61-
justify-content: flex-end;
62-
}
63-
6453
.mx_EventTile_line, .mx_EventTile_reply {
6554
padding: 0;
6655
display: flex;
@@ -173,44 +162,45 @@ $irc-line-height: $font-18px;
173162
border-left: 0;
174163
}
175164

176-
.mx_SenderProfile_hover {
177-
background-color: $primary-bg-color;
178-
overflow: hidden;
165+
.mx_SenderProfile {
166+
width: var(--name-width);
179167
display: flex;
168+
order: 2;
169+
flex-shrink: 0;
170+
justify-content: flex-start;
171+
align-items: center;
180172

181173
> .mx_SenderProfile_displayName {
174+
width: 100%;
175+
text-align: end;
182176
overflow: hidden;
183177
text-overflow: ellipsis;
184-
min-width: var(--name-width);
185-
text-align: end;
186178
}
187-
}
188179

189-
.mx_SenderProfile:hover {
190-
justify-content: flex-start;
180+
> .mx_SenderProfile_mxid {
181+
visibility: collapse;
182+
}
191183
}
192184

193-
.mx_SenderProfile_hover:hover {
185+
.mx_SenderProfile:hover {
194186
overflow: visible;
195-
width: max(auto, 100%);
196187
z-index: 10;
188+
189+
> .mx_SenderProfile_displayName {
190+
overflow: visible;
191+
}
192+
193+
> .mx_SenderProfile_mxid {
194+
visibility: visible;
195+
}
197196
}
198197

199198
.mx_ReplyThread {
200199
margin: 0;
201200
.mx_SenderProfile {
202201
width: unset;
203202
max-width: var(--name-width);
204-
}
205-
206-
.mx_SenderProfile_hover {
207203
background: transparent;
208-
209-
> span {
210-
> .mx_SenderProfile_displayName {
211-
min-width: inherit;
212-
}
213-
}
214204
}
215205

216206
.mx_EventTile_emote {

src/components/views/messages/SenderProfile.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ export default class SenderProfile extends React.Component<IProps, IState> {
140140
}
141141

142142
return (
143-
<div className="mx_SenderProfile mx_SenderProfile_hover" dir="auto" onClick={this.props.onClick}>
143+
<div className="mx_SenderProfile" dir="auto" onClick={this.props.onClick}>
144144
<span className={`mx_SenderProfile_displayName ${colorClass}`}>
145145
{ displayName }
146146
</span>

0 commit comments

Comments
 (0)