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

Commit 2fadeef

Browse files
author
Germain
authored
Port #8240 to release (#8241)
* fix uneven gutter size in thread panel * Fix indicator positioning * fix gutter sizing * fix dropdown inner padding and spacing * lint fix
1 parent e4df547 commit 2fadeef

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

res/css/structures/_RoomView.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,8 +326,8 @@ hr.mx_RoomView_myReadMarker {
326326

327327
.mx_Indicator {
328328
position: absolute;
329-
right: 0;
330-
top: 0;
329+
right: -3px;
330+
top: -3px;
331331
width: $dot-size;
332332
height: $dot-size;
333333
border-radius: 50%;

res/css/views/right_panel/_ThreadPanel.scss

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ limitations under the License.
2020
height: 100px;
2121
overflow: visible;
2222

23-
&.mx_BaseCard {
24-
padding-right: 0;
23+
&:not(.mx_ThreadView).mx_BaseCard {
24+
padding-right: 2px;
2525
}
2626

2727
.mx_BaseCard_header {
@@ -48,7 +48,7 @@ limitations under the License.
4848
}
4949

5050
.mx_ThreadPanel__header {
51-
width: calc(100% - 30px);
51+
width: calc(100% - 38px);
5252
height: 24px;
5353
display: flex;
5454
flex: 1;
@@ -118,7 +118,7 @@ limitations under the License.
118118
&.mx_ThreadView .mx_ThreadView_timelinePanelWrapper {
119119
/* the scrollbar is 8px wide, and we want a 12px gap with the side of the
120120
panel. Hence the magic number, 8+4=12 */
121-
width: calc(100% - 4px);
121+
width: calc(100% + 6px);
122122
padding-right: 4px;
123123
position: relative;
124124
min-height: 0; // don't displace the composer
@@ -184,7 +184,7 @@ limitations under the License.
184184
}
185185

186186
.mx_ThreadPanel_dropdown {
187-
padding: 3px 8px;
187+
padding: 3px 4px 3px 8px;
188188
border-radius: 4px;
189189
line-height: 1.5;
190190
user-select: none;
@@ -294,7 +294,7 @@ limitations under the License.
294294
top: 0;
295295
bottom: 0;
296296
left: 0;
297-
right: 0;
297+
right: 6px;
298298
padding: 20px;
299299

300300
h2 {

0 commit comments

Comments
 (0)