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

Fix hover tile border #7117

Merged
merged 2 commits into from
Nov 11, 2021
Merged

Fix hover tile border #7117

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
b914c5d
Revert "Update highlighted event line to prevent content jumping (#70…
SimonBrandner Nov 11, 2021
692ab90
Fix message jumps
SimonBrandner Nov 11, 2021
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
1 change: 0 additions & 1 deletion res/css/views/right_panel/_ThreadPanel.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,6 @@ limitations under the License.

.mx_EventTile, .mx_EventListSummary {
// Account for scrollbar when hovering
margin: 0 2px;
padding-top: 0;

.mx_ThreadInfo {
Expand Down
26 changes: 15 additions & 11 deletions res/css/views/rooms/_EventTile.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,25 +221,25 @@ $left-gutter: 64px;
&:hover.mx_EventTile_verified .mx_EventTile_line,
&:hover.mx_EventTile_unverified .mx_EventTile_line,
&:hover.mx_EventTile_unknown .mx_EventTile_line {
padding-left: calc($left-gutter);
padding-left: calc($left-gutter - $selected-message-border-width);
}

&:hover.mx_EventTile_verified .mx_EventTile_line {
box-shadow: inset $selected-message-border-width 0 0 0 $e2e-verified-color;
border-left: $e2e-verified-color $selected-message-border-width solid;
}

&:hover.mx_EventTile_unverified .mx_EventTile_line {
box-shadow: inset $selected-message-border-width 0 0 0 $e2e-verified-color;
border-left: $e2e-unverified-color $selected-message-border-width solid;
}

&:hover.mx_EventTile_unknown .mx_EventTile_line {
box-shadow: inset $selected-message-border-width 0 0 0 $e2e-verified-color;
border-left: $e2e-unknown-color $selected-message-border-width solid;
}

&:hover.mx_EventTile_verified.mx_EventTile_info .mx_EventTile_line,
&:hover.mx_EventTile_unverified.mx_EventTile_info .mx_EventTile_line,
&:hover.mx_EventTile_unknown.mx_EventTile_info .mx_EventTile_line {
padding-left: calc($left-gutter + 18px);
padding-left: calc($left-gutter + 18px - $selected-message-border-width);
}

/* End to end encryption stuff */
Expand Down Expand Up @@ -822,7 +822,7 @@ $left-gutter: 64px;
.mx_EventTile_senderDetails {
display: flex;
align-items: center;
gap: 6px;
gap: calc(6px + $selected-message-border-width);

a {
flex: 1;
Expand All @@ -846,17 +846,21 @@ $left-gutter: 64px;
display: none;
}

.mx_EventTile_line {
padding-left: 0 !important;
order: 10 !important;
}

.mx_EventTile {
width: 100%;
display: flex;
flex-direction: column;
padding-top: 0;

.mx_EventTile_line {
padding-left: $selected-message-border-width !important;
order: 10 !important;
}

&:hover .mx_EventTile_line {
padding-left: 0 !important;
}

.mx_MessageTimestamp {
left: auto;
right: 2px !important;
Expand Down