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

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

Merged
merged 2 commits into from
Jul 1, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28af396
Move mx_EventTile_body out of mx_EventTile:not([data-layout=bubble])
luixxiul Jul 1, 2022
d5aae38
Enable overflow scroll on expanded ReplyChain on bubble layout
luixxiul Jul 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions res/css/views/elements/_ReplyChain.scss
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,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 @@ -92,6 +96,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 @@ -280,11 +295,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