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

Fix some issues with threads rendering #8305

Merged
merged 6 commits into from
Apr 13, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 10 additions & 4 deletions res/css/views/right_panel/_ThreadPanel.scss
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,10 @@ limitations under the License.
}
}

.mx_GenericEventListSummary > .mx_EventTile_line {
padding-left: 30px !important; // Override main timeline styling - align summary text with message text
}

.mx_EventTile:not([data-layout=bubble]) {
.mx_EventTile_e2eIcon {
left: 8px;
Expand Down Expand Up @@ -212,19 +216,21 @@ limitations under the License.
}

// handling for hidden events (e.g reactions) in the thread view
&.mx_ThreadView .mx_GenericEventListSummary_unstyledList .mx_EventTile_info {
&.mx_ThreadView .mx_EventTile_info {
padding-top: 0 !important; // override main timeline padding

.mx_EventTile_line {
padding-left: 0 !important; // override main timeline padding

.mx_EventTile_content {
margin-left: 54px; // align with text
width: calc(100% - 54px - 8px); // match width of parent
margin-left: 48px; // align with text
width: calc(100% - 48px - 8px); // match width of parent
}
}

.mx_EventTile_avatar {
position: absolute;
left: 36px !important; // override main timeline positioning
left: 30px !important; // override main timeline positioning
z-index: 9; // position above the hover styling
}

Expand Down
3 changes: 2 additions & 1 deletion res/css/views/rooms/_EventTile.scss
Original file line number Diff line number Diff line change
Expand Up @@ -762,7 +762,8 @@ $left-gutter: 64px;
bottom: 0;
width: 60px;
box-sizing: border-box;
background: linear-gradient(270deg, $system 52.6%, transparent 100%);
// XXX: We use `$system-transparent` instead of `transparent` to work around a Safari <15.4 bug
background: linear-gradient(270deg, $system 50%, $system-transparent 100%);

opacity: 0;
transform: translateX(60px);
Expand Down
1 change: 1 addition & 0 deletions res/themes/dark/css/_dark.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ $quaternary-content: #6F7882;
$quinary-content: #394049;

$system: #21262C;
$system-transparent: rgba($system, 0.0); // XXX: workaround for Safari 15.3 linear-gradient bug
$background: #15191E;
$overlay-background: rgba($background, 0.85);

Expand Down
2 changes: 2 additions & 0 deletions res/themes/legacy-dark/css/_legacy-dark.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// Colors from Figma Compound https://www.figma.com/file/X4XTH9iS2KGJ2wFKDqkyed/Compound?node-id=559%3A741
$system: #21262C;
$system-transparent: rgba($system, 0.0); // XXX: workaround for Safari 15.3 linear-gradient bug

// unified palette
// try to use these colors when possible
Expand Down Expand Up @@ -97,6 +98,7 @@ $tertiary-content: $tertiary-fg-color;
$quaternary-content: #6F7882;
$quinary-content: $quaternary-content;
$system: #21262C;
$system-transparent: rgba($system, 0.0); // XXX: workaround for Safari 15.3 linear-gradient bug
$background: $primary-bg-color;
$overlay-background: rgba($background, 0.85);

Expand Down
1 change: 1 addition & 0 deletions res/themes/legacy-light/css/_legacy-light.scss
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ $tertiary-content: $tertiary-fg-color;
$quaternary-content: #6F7882;
$quinary-content: $quaternary-content;
$system: #F4F6FA;
$system-transparent: rgba($system, 0.0); // XXX: workaround for Safari 15.3 linear-gradient bug
$background: $primary-bg-color;
$overlay-background: rgba($background, 0.85);

Expand Down
2 changes: 2 additions & 0 deletions res/themes/light-custom/css/_custom.scss
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ $secondary-content: var(--secondary-content, $secondary-content);
$tertiary-content: var(--tertiary-content, $tertiary-content);
$quaternary-content: var(--quaternary-content, $quaternary-content);
$quinary-content: var(--quinary-content, $quinary-content);
// XXX: workaround for Safari 15.3 linear-gradient bug https://github.com/vector-im/element-web/issues/21670
$system-transparent: var(--system-transparent, rgba($system, 0.0));
$system: var(--system, $system);
$background: var(--background, $background);
$panels: rgba($system, 0.9);
Expand Down
1 change: 1 addition & 0 deletions res/themes/light/css/_light.scss
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ $quaternary-content: #c1c6cd;
$quinary-content: #E3E8F0;

$system: #F4F6FA;
$system-transparent: rgba($system, 0.0); // XXX: workaround for Safari 15.3 linear-gradient bug
$background: #ffffff;
$overlay-background: rgba($background, 0.85);

Expand Down