PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Make sure to use mx_DisambiguatedProfile everywhere (#8121)

Browse source 
* `mx_SenderProfile` -> `mx_DisambiguatedProfile`

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Delete duplicate

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
This commit is contained in:
Šimon Brandner 2022-03-23 06:45:53 +01:00 committed by GitHub
parent fce36ec826
commit d0f8cfc376
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
res/css/views/right_panel/_TimelineCard.scss
View file

@ -64,7 +64,7 @@ limitations under the License.
max-width: min(calc(100% - 36px), 600px); max-width: min(calc(100% - 36px), 600px);
} }
.mx_GroupLayout .mx_EventTile > .mx_SenderProfile { .mx_GroupLayout .mx_EventTile > .mx_DisambiguatedProfile {
margin-left: 36px; margin-left: 36px;
} }

29
res/css/views/rooms/_EventTile.scss
View file

@ -112,26 +112,11 @@ $left-gutter: 64px;
background-color: $header-panel-bg-color; background-color: $header-panel-bg-color;
} }
.mx_SenderProfile {
color: $primary-content;
font-size: $font-14px;
display: inline-block; /* anti-zalgo, with overflow hidden */
overflow: hidden;
padding-bottom: 0px;
padding-top: 0px;
margin: 0px;
/* the next three lines, along with overflow hidden, truncate long display names */
white-space: nowrap;
text-overflow: ellipsis;
max-width: calc(100% - $left-gutter);
}
.mx_DisambiguatedProfile { .mx_DisambiguatedProfile {
color: $primary-content; color: $primary-content;
font-size: $font-14px; font-size: $font-14px;
display: inline-block; /* anti-zalgo, with overflow hidden */ display: inline-block; /* anti-zalgo, with overflow hidden */
overflow: hidden; overflow: hidden;
cursor: pointer;
padding-bottom: 0px; padding-bottom: 0px;
padding-top: 0px; padding-top: 0px;
margin: 0px; margin: 0px;
@ -331,7 +316,7 @@ $left-gutter: 64px;
// on ELS we need the margin to allow interaction with the expand/collapse button which is normally in the RR gutter // on ELS we need the margin to allow interaction with the expand/collapse button which is normally in the RR gutter
} }
.mx_SenderProfile { .mx_DisambiguatedProfile {
cursor: pointer; cursor: pointer;
} }
@ -876,7 +861,7 @@ $threadInfoLineHeight: calc(2 * $font-12px);
left: 0; left: 0;
} }
.mx_SenderProfile { .mx_DisambiguatedProfile {
margin-left: var(--leftOffset) !important; margin-left: var(--leftOffset) !important;
flex: 1; flex: 1;
margin-right: 12px; margin-right: 12px;
@ -887,19 +872,19 @@ $threadInfoLineHeight: calc(2 * $font-12px);
max-width: calc(100% - 96px); max-width: calc(100% - 96px);
} }
.mx_SenderProfile_displayName, .mx_DisambiguatedProfile_displayName,
.mx_SenderProfile_mxid { .mx_DisambiguatedProfile_mxid {
display: block; display: block;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.mx_SenderProfile_displayName { .mx_DisambiguatedProfile_displayName {
flex: none; flex: none;
max-width: 100%; max-width: 100%;
} }
.mx_SenderProfile_mxid { .mx_DisambiguatedProfile_mxid {
flex: 1; flex: 1;
} }
@ -1020,7 +1005,7 @@ $threadInfoLineHeight: calc(2 * $font-12px);
display: flex; display: flex;
align-items: center; align-items: center;
.mx_SenderProfile { .mx_DisambiguatedProfile {
flex: 1; flex: 1;
} }
} }

2
res/css/views/rooms/_ReplyTile.scss
View file

@ -104,7 +104,7 @@ limitations under the License.
padding-top: 0; padding-top: 0;
} }
.mx_SenderProfile { .mx_DisambiguatedProfile {
font-size: $font-14px; font-size: $font-14px;
line-height: $font-17px; line-height: $font-17px;