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

Commit c30029a

Browse files
Soften border-radius on selected/hovered messages (#6525)
1 parent 2ee732b commit c30029a

File tree

2 files changed

+18
-13
lines changed

2 files changed

+18
-13
lines changed

res/css/_common.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ limitations under the License.
2222

2323
$hover-transition: 0.08s cubic-bezier(.46, .03, .52, .96); // quadratic
2424

25-
$EventTile_e2e_state_indicator_width: 4px;
25+
$selected-message-border-width: 4px;
2626

2727
$MessageTimestamp_width: 46px; /* 8 + 30 (avatar) + 8 */
28-
$MessageTimestamp_width_hover: calc($MessageTimestamp_width - 2 * $EventTile_e2e_state_indicator_width);
28+
$MessageTimestamp_width_hover: calc($MessageTimestamp_width - 2 * $selected-message-border-width);
2929

3030
$slider-dot-size: 1em;
3131
$slider-selection-dot-size: 2.4em;

res/css/views/rooms/_EventTile.scss

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ limitations under the License.
1616
*/
1717

1818
$left-gutter: 64px;
19-
$hover-select-border: 4px;
2019

2120
.mx_EventTile:not([data-layout=bubble]) {
2221
max-width: 100%;
@@ -110,15 +109,15 @@ $hover-select-border: 4px;
110109
}
111110

112111
&.mx_EventTile_selected > div > a > .mx_MessageTimestamp {
113-
left: calc(-$hover-select-border);
112+
left: calc(-$selected-message-border-width);
114113
}
115114

116115
/* this is used for the tile for the event which is selected via the URL.
117116
* TODO: ultimately we probably want some transition on here.
118117
*/
119118
&.mx_EventTile_selected > .mx_EventTile_line {
120-
border-left: $accent-color 4px solid;
121-
padding-left: calc($left-gutter - $hover-select-border);
119+
border-left: $accent-color $selected-message-border-width solid;
120+
padding-left: calc($left-gutter - $selected-message-border-width);
122121
background-color: $event-selected-color;
123122
}
124123

@@ -132,7 +131,7 @@ $hover-select-border: 4px;
132131
}
133132

134133
&.mx_EventTile_selected.mx_EventTile_info .mx_EventTile_line {
135-
padding-left: calc($left-gutter + 18px - $hover-select-border);
134+
padding-left: calc($left-gutter + 18px - $selected-message-border-width);
136135
}
137136

138137
&.mx_EventTile:hover .mx_EventTile_line,
@@ -208,28 +207,34 @@ $hover-select-border: 4px;
208207
overflow-y: hidden;
209208
}
210209

210+
&.mx_EventTile_selected .mx_EventTile_line,
211+
&:hover .mx_EventTile_line {
212+
border-top-left-radius: 4px;
213+
border-bottom-left-radius: 4px;
214+
}
215+
211216
&:hover.mx_EventTile_verified .mx_EventTile_line,
212217
&:hover.mx_EventTile_unverified .mx_EventTile_line,
213218
&:hover.mx_EventTile_unknown .mx_EventTile_line {
214-
padding-left: calc($left-gutter - $hover-select-border);
219+
padding-left: calc($left-gutter - $selected-message-border-width);
215220
}
216221

217222
&:hover.mx_EventTile_verified .mx_EventTile_line {
218-
border-left: $e2e-verified-color $EventTile_e2e_state_indicator_width solid;
223+
border-left: $e2e-verified-color $selected-message-border-width solid;
219224
}
220225

221226
&:hover.mx_EventTile_unverified .mx_EventTile_line {
222-
border-left: $e2e-unverified-color $EventTile_e2e_state_indicator_width solid;
227+
border-left: $e2e-unverified-color $selected-message-border-width solid;
223228
}
224229

225230
&:hover.mx_EventTile_unknown .mx_EventTile_line {
226-
border-left: $e2e-unknown-color $EventTile_e2e_state_indicator_width solid;
231+
border-left: $e2e-unknown-color $selected-message-border-width solid;
227232
}
228233

229234
&:hover.mx_EventTile_verified.mx_EventTile_info .mx_EventTile_line,
230235
&:hover.mx_EventTile_unverified.mx_EventTile_info .mx_EventTile_line,
231236
&:hover.mx_EventTile_unknown.mx_EventTile_info .mx_EventTile_line {
232-
padding-left: calc($left-gutter + 18px - $hover-select-border);
237+
padding-left: calc($left-gutter + 18px - $selected-message-border-width);
233238
}
234239

235240
/* End to end encryption stuff */
@@ -241,7 +246,7 @@ $hover-select-border: 4px;
241246
&:hover.mx_EventTile_verified .mx_EventTile_line > a > .mx_MessageTimestamp,
242247
&:hover.mx_EventTile_unverified .mx_EventTile_line > a > .mx_MessageTimestamp,
243248
&:hover.mx_EventTile_unknown .mx_EventTile_line > a > .mx_MessageTimestamp {
244-
left: calc(-$hover-select-border);
249+
left: calc(-$selected-message-border-width);
245250
}
246251

247252
// Explicit relationships so that it doesn't apply to nested EventTile components (e.g in Replies)

0 commit comments

Comments
 (0)