OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Move mx_DisambiguatedProfile out of mx_EventTile:not([data-layout=bubble]) (#8899) 

* Move mx_DisambiguatedProfile out of mx_EventTile:not([data-layout=bubble])

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Remove declarations which have not worked due to 'mx_EventTile:not([data-layout=bubble])'

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Remove a redundant declaration - inline-block

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Include mx_DisambiguatedProfile

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Include mx_DisambiguatedProfile:hover

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* yarn run lint:style --fix

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Move mx_DisambiguatedProfile out of mx_EventTile:not([data-layout=bubble]) on TimelineCard

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Remove duplicate declarations on ReplyTile inherited from mx_EventTile .mx_DisambiguatedProfile

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Remove redundant declarations - FilePanel

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
pull/28788/head^2
Suguru Hirahara 2022-06-29 22:38:23 +00:00 committed by GitHub
parent 731776d189
commit 2a4992c56a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 48 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/css/structures/_FilePanel.scss
View File

@ -92,8 +92,6 @@ limitations under the License.
.mx_FilePanel .mx_EventTile .mx_DisambiguatedProfile {
flex: 1 1 auto;
line-height: initial;
padding: 0px;
font-size: $font-14px;
opacity: 1.0;
color: $event-timestamp-color;
}

16
res/css/views/rooms/_EventTile.scss
View File

@ -72,6 +72,14 @@ $threadInfoLineHeight: calc(2 * $font-12px); // See: _commons.scss
}
}
.mx_DisambiguatedProfile {
color: $primary-content;
font-size: $font-14px;
display: inline-block;
padding-bottom: 0px;
padding-top: 0px;
}
.mx_ReactionsRow {
display: flex;
flex-flow: wrap;
@ -194,14 +202,6 @@ $threadInfoLineHeight: calc(2 * $font-12px); // See: _commons.scss
padding-top: 0px !important;
}
.mx_DisambiguatedProfile {
color: $primary-content;
font-size: $font-14px;
display: inline-block;
padding-bottom: 0px;
padding-top: 0px;
}
&.mx_EventTile_isEditing .mx_MessageTimestamp {
visibility: hidden;
}

83
res/css/views/rooms/_IRCLayout.scss
View File

@ -75,6 +75,46 @@ $irc-line-height: $font-18px;
}
}
.mx_DisambiguatedProfile {
width: var(--name-width);
margin-inline-end: 0; // override mx_EventTile > *
order: 2;
flex-shrink: 0;
> .mx_DisambiguatedProfile_displayName {
width: 100%;
text-align: end;
overflow: hidden;
text-overflow: ellipsis;
}
> .mx_DisambiguatedProfile_mxid {
visibility: collapse;
// Override the inherited margin.
margin-left: 0;
padding: 0 5px;
}
&:hover {
overflow: visible;
z-index: 10;
> .mx_DisambiguatedProfile_displayName {
overflow: visible;
display: inline;
background-color: $event-selected-color;
border-radius: 8px 0 0 8px;
padding-right: 8px;
}
> .mx_DisambiguatedProfile_mxid {
visibility: visible;
opacity: 1;
background-color: $event-selected-color;
}
}
}
.mx_MessageTimestamp {
font-size: $font-10px;
text-align: right;
@ -147,49 +187,6 @@ $irc-line-height: $font-18px;
border-left: 0;
}
.mx_DisambiguatedProfile {
width: var(--name-width);
margin-inline-end: 0; // override mx_EventTile > *
display: flex;
order: 2;
flex-shrink: 0;
justify-content: flex-start;
align-items: center;
> .mx_DisambiguatedProfile_displayName {
width: 100%;
text-align: end;
overflow: hidden;
text-overflow: ellipsis;
}
> .mx_DisambiguatedProfile_mxid {
visibility: collapse;
// Override the inherited margin.
margin-left: 0;
padding: 0 5px;
}
}
.mx_DisambiguatedProfile:hover {
overflow: visible;
z-index: 10;
> .mx_DisambiguatedProfile_displayName {
overflow: visible;
display: inline;
background-color: $event-selected-color;
border-radius: 8px 0 0 8px;
padding-right: 8px;
}
> .mx_DisambiguatedProfile_mxid {
visibility: visible;
opacity: 1;
background-color: $event-selected-color;
}
}
.mx_ReplyChain {
margin: 0;
.mx_DisambiguatedProfile {

5
res/css/views/rooms/_ReplyTile.scss
View File

@ -102,11 +102,6 @@ limitations under the License.
}
.mx_DisambiguatedProfile {
font-size: $font-14px;
line-height: $font-17px;
display: inline-block; // anti-zalgo, with overflow hidden
padding: 0;
margin: 0;
}
}