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

Commit

Permalink
Move mx_EventTile_body out of mx_EventTile:not([data-layout=bubble]) (#…
Browse files Browse the repository at this point in the history
…8958)

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

Signed-off-by: Suguru Hirahara <[email protected]>

* Enable overflow scroll on expanded ReplyChain on bubble layout

Signed-off-by: Suguru Hirahara <[email protected]>
  • Loading branch information
luixxiul authored Jul 1, 2022
1 parent e72598e commit bf281c1
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 16 deletions.
11 changes: 0 additions & 11 deletions res/css/views/elements/_ReplyChain.scss
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,3 @@ limitations under the License.
border-left-color: $username-variant8-color;
}
}

.mx_ReplyChain--expanded {
.mx_EventTile_body {
display: block;
overflow-y: scroll !important;
}
.mx_EventTile_collapsedCodeBlock {
// !important needed due to .mx_ReplyTile .mx_EventTile_content .mx_EventTile_pre_container > pre
display: block !important;
}
}
20 changes: 15 additions & 5 deletions res/css/views/rooms/_EventTile.scss
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@ $threadInfoLineHeight: calc(2 * $font-12px); // See: _commons.scss
user-select: none;
}

.mx_EventTile_body {
overflow-y: hidden;
}

.mx_EventTile_receiptSent,
.mx_EventTile_receiptSending {
position: relative;
Expand Down Expand Up @@ -114,6 +118,17 @@ $threadInfoLineHeight: calc(2 * $font-12px); // See: _commons.scss
gap: $spacing-4;
}

.mx_ReplyChain--expanded {
.mx_EventTile_body {
display: block;
overflow-y: scroll;
}

.mx_EventTile_collapsedCodeBlock {
display: block !important; // !important needed due to .mx_ReplyTile .mx_EventTile_content .mx_EventTile_pre_container > pre
}
}

&[data-layout=irc],
&[data-layout=group] {
&.mx_EventTile_highlight,
Expand Down Expand Up @@ -302,11 +317,6 @@ $threadInfoLineHeight: calc(2 * $font-12px); // See: _commons.scss
}
}

/* De-zalgoing */
.mx_EventTile_body {
overflow-y: hidden;
}

&:hover.mx_EventTile_verified .mx_EventTile_line {
box-shadow: inset calc(50px + $selected-message-border-width) 0 0 -50px $e2e-verified-color;
}
Expand Down

0 comments on commit bf281c1

Please sign in to comment.