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

Commit 2a1a180

Browse files
Fix hover tile border (#7117)
* Revert "Update highlighted event line to prevent content jumping (#7090)" This reverts commit 0f8272c. * Fix message jumps Signed-off-by: Šimon Brandner <[email protected]>
1 parent f87e9d8 commit 2a1a180

File tree

2 files changed

+15
-12
lines changed

2 files changed

+15
-12
lines changed

Diff for: res/css/views/right_panel/_ThreadPanel.scss

-1
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,6 @@ limitations under the License.
184184

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

190189
.mx_ThreadInfo {

Diff for: res/css/views/rooms/_EventTile.scss

+15-11
Original file line numberDiff line numberDiff line change
@@ -221,25 +221,25 @@ $left-gutter: 64px;
221221
&:hover.mx_EventTile_verified .mx_EventTile_line,
222222
&:hover.mx_EventTile_unverified .mx_EventTile_line,
223223
&:hover.mx_EventTile_unknown .mx_EventTile_line {
224-
padding-left: calc($left-gutter);
224+
padding-left: calc($left-gutter - $selected-message-border-width);
225225
}
226226

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

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

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

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

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

827827
a {
828828
flex: 1;
@@ -846,17 +846,21 @@ $left-gutter: 64px;
846846
display: none;
847847
}
848848

849-
.mx_EventTile_line {
850-
padding-left: 0 !important;
851-
order: 10 !important;
852-
}
853-
854849
.mx_EventTile {
855850
width: 100%;
856851
display: flex;
857852
flex-direction: column;
858853
padding-top: 0;
859854

855+
.mx_EventTile_line {
856+
padding-left: $selected-message-border-width !important;
857+
order: 10 !important;
858+
}
859+
860+
&:hover .mx_EventTile_line {
861+
padding-left: 0 !important;
862+
}
863+
860864
.mx_MessageTimestamp {
861865
left: auto;
862866
right: 2px !important;

0 commit comments

Comments
 (0)