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

Commit 3cf798d

Browse files
luixxiulluixxiul
authored
Merge branch 'develop' into AccessSecretStorageDialog
2 parents c317094 + 3c5942a commit 3cf798d

File tree

102 files changed

+863
-429
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+863
-429
lines changed

‎CHANGELOG.md

+74
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,77 @@
1+
Changes in [3.44.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.44.0) (2022-05-10)
2+
=====================================================================================================
3+
4+
## ✨ Features
5+
* Made the location map change the cursor to a pointer so it looks like it's clickable (https ([\#8451](https://github.com/matrix-org/matrix-react-sdk/pull/8451)). Fixes vector-im/element-web#21991. Contributed by @Odyssey346.
6+
* Implement improved spacing for the thread list and timeline ([\#8337](https://github.com/matrix-org/matrix-react-sdk/pull/8337)). Fixes vector-im/element-web#21759. Contributed by @luixxiul.
7+
* LLS: expose way to enable live sharing labs flag from location dialog ([\#8416](https://github.com/matrix-org/matrix-react-sdk/pull/8416)).
8+
* Fix source text boxes in View Source modal should have full width ([\#8425](https://github.com/matrix-org/matrix-react-sdk/pull/8425)). Fixes vector-im/element-web#21938. Contributed by @EECvision.
9+
* Read Receipts: never show +1, if it’s just 4, show all of them ([\#8428](https://github.com/matrix-org/matrix-react-sdk/pull/8428)). Fixes vector-im/element-web#21935.
10+
* Add opt-in analytics to onboarding tasks ([\#8409](https://github.com/matrix-org/matrix-react-sdk/pull/8409)). Fixes vector-im/element-web#21705.
11+
* Allow user to control if they are signed out of all devices when changing password ([\#8259](https://github.com/matrix-org/matrix-react-sdk/pull/8259)). Fixes vector-im/element-web#2671.
12+
* Implement new Read Receipt design ([\#8389](https://github.com/matrix-org/matrix-react-sdk/pull/8389)). Fixes vector-im/element-web#20574.
13+
* Stick connected video rooms to the top of the room list ([\#8353](https://github.com/matrix-org/matrix-react-sdk/pull/8353)).
14+
* LLS: fix jumpy maximised map ([\#8387](https://github.com/matrix-org/matrix-react-sdk/pull/8387)).
15+
* Persist audio and video mute state in video rooms ([\#8376](https://github.com/matrix-org/matrix-react-sdk/pull/8376)).
16+
* Forcefully disconnect from video rooms on logout and tab close ([\#8375](https://github.com/matrix-org/matrix-react-sdk/pull/8375)).
17+
* Add local echo of connected devices in video rooms ([\#8368](https://github.com/matrix-org/matrix-react-sdk/pull/8368)).
18+
* Improve text of account deactivation dialog ([\#8371](https://github.com/matrix-org/matrix-react-sdk/pull/8371)). Fixes vector-im/element-web#17421.
19+
* Live location sharing: own live beacon status on maximised view ([\#8374](https://github.com/matrix-org/matrix-react-sdk/pull/8374)).
20+
* Show a lobby screen in video rooms ([\#8287](https://github.com/matrix-org/matrix-react-sdk/pull/8287)).
21+
* Settings toggle to disable Composer Markdown ([\#8358](https://github.com/matrix-org/matrix-react-sdk/pull/8358)). Fixes vector-im/element-web#20321.
22+
* Cache localStorage objects for SettingsStore ([\#8366](https://github.com/matrix-org/matrix-react-sdk/pull/8366)).
23+
* Bring `View Source` back from behind developer mode ([\#8369](https://github.com/matrix-org/matrix-react-sdk/pull/8369)). Fixes vector-im/element-web#21771.
24+
25+
## 🐛 Bug Fixes
26+
* Fix race conditions around threads ([\#8448](https://github.com/matrix-org/matrix-react-sdk/pull/8448)). Fixes vector-im/element-web#21627.
27+
* Fix reading of cached room device setting values ([\#8495](https://github.com/matrix-org/matrix-react-sdk/pull/8495)).
28+
* Fix issue with dispatch happening mid-dispatch due to js-sdk emit ([\#8473](https://github.com/matrix-org/matrix-react-sdk/pull/8473)). Fixes vector-im/element-web#22019.
29+
* Match MSC behaviour for threads when disabled (thread-aware mode) ([\#8476](https://github.com/matrix-org/matrix-react-sdk/pull/8476)). Fixes vector-im/element-web#22033.
30+
* Specify position of DisambiguatedProfile inside a thread on bubble message layout ([\#8452](https://github.com/matrix-org/matrix-react-sdk/pull/8452)). Fixes vector-im/element-web#21998. Contributed by @luixxiul.
31+
* Location sharing: do not trackuserlocation in location picker ([\#8466](https://github.com/matrix-org/matrix-react-sdk/pull/8466)). Fixes vector-im/element-web#22013.
32+
* fix text and map indent in thread view ([\#8462](https://github.com/matrix-org/matrix-react-sdk/pull/8462)). Fixes vector-im/element-web#21997.
33+
* Live location sharing: don't group beacon info with room creation summary ([\#8468](https://github.com/matrix-org/matrix-react-sdk/pull/8468)).
34+
* Don't linkify code blocks ([\#7859](https://github.com/matrix-org/matrix-react-sdk/pull/7859)). Fixes vector-im/element-web#9613.
35+
* read receipts: improve tooltips to show names of users ([\#8438](https://github.com/matrix-org/matrix-react-sdk/pull/8438)). Fixes vector-im/element-web#21940.
36+
* Fix poll overflowing a reply tile on bubble message layout ([\#8459](https://github.com/matrix-org/matrix-react-sdk/pull/8459)). Fixes vector-im/element-web#22005. Contributed by @luixxiul.
37+
* Fix text link buttons on UserInfo panel ([\#8247](https://github.com/matrix-org/matrix-react-sdk/pull/8247)). Fixes vector-im/element-web#21702. Contributed by @luixxiul.
38+
* Clear local storage settings handler cache on logout ([\#8454](https://github.com/matrix-org/matrix-react-sdk/pull/8454)). Fixes vector-im/element-web#21994.
39+
* Fix jump to bottom button being always displayed in non-overflowing timelines ([\#8460](https://github.com/matrix-org/matrix-react-sdk/pull/8460)). Fixes vector-im/element-web#22003.
40+
* fix timeline search with empty text box should do nothing ([\#8262](https://github.com/matrix-org/matrix-react-sdk/pull/8262)). Fixes vector-im/element-web#21714. Contributed by @EECvision.
41+
* Fixes "space panel kebab menu is rendered out of view on sub spaces" ([\#8350](https://github.com/matrix-org/matrix-react-sdk/pull/8350)). Contributed by @yaya-usman.
42+
* Add margin to the location map inside ThreadView ([\#8442](https://github.com/matrix-org/matrix-react-sdk/pull/8442)). Fixes vector-im/element-web#21982. Contributed by @luixxiul.
43+
* Patch: "Reloading the registration page should warn about data loss" ([\#8377](https://github.com/matrix-org/matrix-react-sdk/pull/8377)). Contributed by @yaya-usman.
44+
* Live location sharing: fix safari timestamps pt 2 ([\#8443](https://github.com/matrix-org/matrix-react-sdk/pull/8443)).
45+
* Fix issue with thread notification state ignoring initial events ([\#8417](https://github.com/matrix-org/matrix-react-sdk/pull/8417)). Fixes vector-im/element-web#21927.
46+
* Fix event text overflow on bubble message layout ([\#8391](https://github.com/matrix-org/matrix-react-sdk/pull/8391)). Fixes vector-im/element-web#21882. Contributed by @luixxiul.
47+
* Disable the message action bar when hovering over the 1px border between threads on the list ([\#8429](https://github.com/matrix-org/matrix-react-sdk/pull/8429)). Fixes vector-im/element-web#21955. Contributed by @luixxiul.
48+
* correctly align read receipts to state events in bubble layout ([\#8419](https://github.com/matrix-org/matrix-react-sdk/pull/8419)). Fixes vector-im/element-web#21899.
49+
* Fix issue with underfilled timelines when barren of content ([\#8432](https://github.com/matrix-org/matrix-react-sdk/pull/8432)). Fixes vector-im/element-web#21930.
50+
* Fix baseline misalignment of thread panel summary by deduplication ([\#8413](https://github.com/matrix-org/matrix-react-sdk/pull/8413)).
51+
* Fix editing of non-html replies ([\#8418](https://github.com/matrix-org/matrix-react-sdk/pull/8418)). Fixes vector-im/element-web#21928.
52+
* Read Receipts "Fall from the Sky" ([\#8414](https://github.com/matrix-org/matrix-react-sdk/pull/8414)). Fixes vector-im/element-web#21888.
53+
* Make read receipts handle nullable roomMembers correctly ([\#8410](https://github.com/matrix-org/matrix-react-sdk/pull/8410)). Fixes vector-im/element-web#21896.
54+
* Don't form continuations on either side of a thread root ([\#8408](https://github.com/matrix-org/matrix-react-sdk/pull/8408)). Fixes vector-im/element-web#20908.
55+
* Fix centering issue with sticker placeholder ([\#8404](https://github.com/matrix-org/matrix-react-sdk/pull/8404)). Fixes vector-im/element-web#18014 and vector-im/element-web#6449.
56+
* Disable download option on <video/> , preferring dedicated download button ([\#8403](https://github.com/matrix-org/matrix-react-sdk/pull/8403)). Fixes vector-im/element-web#21902.
57+
* Fix infinite loop when pinning/unpinning persistent widgets ([\#8396](https://github.com/matrix-org/matrix-react-sdk/pull/8396)). Fixes vector-im/element-web#21864.
58+
* Tweak ReadReceiptGroup to better handle disambiguation ([\#8402](https://github.com/matrix-org/matrix-react-sdk/pull/8402)). Fixes vector-im/element-web#21897.
59+
* stop the bottom edge of buttons getting clipped in devtools ([\#8400](https://github.com/matrix-org/matrix-react-sdk/pull/8400)).
60+
* Fix issue with threads timelines with few events cropping events ([\#8392](https://github.com/matrix-org/matrix-react-sdk/pull/8392)). Fixes vector-im/element-web#20594.
61+
* Changed font-weight to 400 to support light weight font ([\#8345](https://github.com/matrix-org/matrix-react-sdk/pull/8345)). Fixes vector-im/element-web#21171. Contributed by @goelesha.
62+
* Fix issue with thread panel not updating when it loads on first render ([\#8382](https://github.com/matrix-org/matrix-react-sdk/pull/8382)). Fixes vector-im/element-web#21737.
63+
* fix: "Mention highlight and cursor hover highlight has different corner radius" ([\#8384](https://github.com/matrix-org/matrix-react-sdk/pull/8384)). Contributed by @yaya-usman.
64+
* Fix regression around haveRendererForEvent for hidden events ([\#8379](https://github.com/matrix-org/matrix-react-sdk/pull/8379)). Fixes vector-im/element-web#21862 and vector-im/element-web#21725.
65+
* Fix regression around the room list treeview keyboard a11y ([\#8385](https://github.com/matrix-org/matrix-react-sdk/pull/8385)). Fixes vector-im/element-web#21436.
66+
* Remove float property to let the margin between events appear on bubble message layout ([\#8373](https://github.com/matrix-org/matrix-react-sdk/pull/8373)). Fixes vector-im/element-web#21861. Contributed by @luixxiul.
67+
* Fix race in Registration between server change and flows fetch ([\#8359](https://github.com/matrix-org/matrix-react-sdk/pull/8359)). Fixes vector-im/element-web#21800.
68+
* fix rainbow breaks compound emojis ([\#8245](https://github.com/matrix-org/matrix-react-sdk/pull/8245)). Fixes vector-im/element-web#21371. Contributed by @EECvision.
69+
* Fix RightPanelStore handling first room on app launch wrong ([\#8370](https://github.com/matrix-org/matrix-react-sdk/pull/8370)). Fixes vector-im/element-web#21741.
70+
* Fix UnknownBody error message unalignment ([\#8346](https://github.com/matrix-org/matrix-react-sdk/pull/8346)). Fixes vector-im/element-web#21828. Contributed by @luixxiul.
71+
* Use -webkit-line-clamp for the room header topic overflow ([\#8367](https://github.com/matrix-org/matrix-react-sdk/pull/8367)). Fixes vector-im/element-web#21852. Contributed by @luixxiul.
72+
* Fix issue with ServerInfo crashing the modal ([\#8364](https://github.com/matrix-org/matrix-react-sdk/pull/8364)).
73+
* Fixes around threads beta in degraded mode ([\#8319](https://github.com/matrix-org/matrix-react-sdk/pull/8319)). Fixes vector-im/element-web#21762.
74+
175
Changes in [3.43.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.43.0) (2022-04-26)
276
=====================================================================================================
377

‎README.md

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[![npm](https://img.shields.io/npm/v/matrix-react-sdk)](https://www.npmjs.com/package/matrix-react-sdk)
22
![Tests](https://github.com/matrix-org/matrix-react-sdk/actions/workflows/tests.yml/badge.svg)
33
![Static Analysis](https://github.com/matrix-org/matrix-react-sdk/actions/workflows/static_analysis.yaml/badge.svg)
4+
[![matrix-react-sdk](https://img.shields.io/endpoint?url=https://dashboard.cypress.io/badge/simple/ppvnzg/develop&style=flat&logo=cypress)](https://dashboard.cypress.io/projects/ppvnzg/runs)
45
[![Weblate](https://translate.element.io/widgets/element-web/-/matrix-react-sdk/svg-badge.svg)](https://translate.element.io/engage/element-web/)
56
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=matrix-react-sdk&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=matrix-react-sdk)
67
[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=matrix-react-sdk&metric=coverage)](https://sonarcloud.io/summary/new_code?id=matrix-react-sdk)

‎package.json

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "matrix-react-sdk",
3-
"version": "3.43.0",
3+
"version": "3.44.0",
44
"description": "SDK for matrix.org using React",
55
"author": "matrix.org",
66
"repository": {
@@ -22,7 +22,7 @@
2222
"README.md",
2323
"package.json"
2424
],
25-
"main": "./lib/index.ts",
25+
"main": "./src/index.ts",
2626
"matrix_src_main": "./src/index.ts",
2727
"matrix_lib_main": "./lib/index.ts",
2828
"matrix_lib_typings": "./lib/index.d.ts",
@@ -88,7 +88,7 @@
8888
"linkifyjs": "4.0.0-beta.4",
8989
"lodash": "^4.17.20",
9090
"maplibre-gl": "^1.15.2",
91-
"matrix-analytics-events": "github:matrix-org/matrix-analytics-events.git#4aef17b56798639906f26a8739043a3c5c5fde7e",
91+
"matrix-analytics-events": "github:matrix-org/matrix-analytics-events.git#a0687ca6fbdb7258543d49b99fb88b9201e900b0",
9292
"matrix-encrypt-attachment": "^1.0.3",
9393
"matrix-events-sdk": "^0.0.1-beta.7",
9494
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
@@ -242,6 +242,5 @@
242242
"jestSonar": {
243243
"reportPath": "coverage",
244244
"sonar56x": true
245-
},
246-
"typings": "./lib/index.d.ts"
245+
}
247246
}

‎res/css/_components.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@
143143
@import "./views/elements/_AddressSelector.scss";
144144
@import "./views/elements/_AddressTile.scss";
145145
@import "./views/elements/_CopyableText.scss";
146-
@import "./views/elements/_DesktopBuildsNotice.scss";
146+
@import "./views/elements/_SearchWarning.scss";
147147
@import "./views/elements/_DesktopCapturerSourcePicker.scss";
148148
@import "./views/elements/_DialPadBackspaceButton.scss";
149149
@import "./views/elements/_DirectorySearchBox.scss";

‎res/css/views/beta/_BetaCard.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ limitations under the License.
119119
font-size: 12px;
120120
font-weight: $font-semi-bold;
121121
line-height: 15px;
122-
color: #FFFFFF;
122+
color: $button-primary-fg-color;
123123
display: inline-block;
124124
vertical-align: text-bottom;
125125
word-break: keep-all; // avoid multiple lines on CJK language

‎res/css/views/elements/_Pill.scss

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ limitations under the License.
1515
*/
1616

1717
.mx_Pill {
18-
padding: $font-1px 0.4em $font-1px 0;
18+
padding: $font-1px 0.4em $font-1px 0.4em;
1919
line-height: $font-17px;
2020
border-radius: $font-16px;
2121
vertical-align: text-top;
@@ -47,6 +47,7 @@ limitations under the License.
4747
}
4848

4949
.mx_BaseAvatar {
50+
margin-left: -0.3em; // Otherwise the gap is too large
5051
position: relative;
5152
display: inline-flex;
5253
align-items: center;

‎res/css/views/elements/_DesktopBuildsNotice.scss renamed to ‎res/css/views/elements/_SearchWarning.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
.mx_DesktopBuildsNotice {
17+
.mx_SearchWarning {
1818
text-align: center;
1919
padding: 0 16px;
2020

‎res/css/views/messages/_DateSeparator.scss

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ limitations under the License.
2727
flex: 1 1 0;
2828
height: 0;
2929
border: none;
30+
border-bottom: 1px solid $menu-selected-color;
3031
}
3132

3233
.mx_DateSeparator > div {

‎res/css/views/messages/_MLocationBody.scss

+4
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,7 @@ limitations under the License.
3838
max-width: 100%;
3939
width: 450px;
4040
}
41+
42+
.mx_DisambiguatedProfile ~ .mx_MLocationBody {
43+
margin-top: 6px; // See: https://github.com/matrix-org/matrix-react-sdk/pull/8442
44+
}

‎res/css/views/rooms/_EventTile.scss

+15-8
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,12 @@ $threadInfoLineHeight: calc(2 * $font-12px); // See: _commons.scss
5050
.mx_EventTile_receiptSending::before {
5151
mask-image: url('$(res)/img/element-icons/circle-sending.svg');
5252
}
53+
54+
&[data-layout=group] {
55+
.mx_EventTile_line {
56+
line-height: var(--GroupLayout-EventTile-line-height);
57+
}
58+
}
5359
}
5460

5561
.mx_EventTile:not([data-layout=bubble]) {
@@ -263,8 +269,15 @@ $threadInfoLineHeight: calc(2 * $font-12px); // See: _commons.scss
263269
}
264270
}
265271

266-
.mx_GenericEventListSummary:not([data-layout=bubble]) .mx_EventTile_line {
267-
padding-left: $left-gutter;
272+
.mx_GenericEventListSummary:not([data-layout=bubble]) {
273+
.mx_EventTile_line {
274+
padding-left: $left-gutter;
275+
line-height: normal;
276+
277+
.mx_RedactedBody {
278+
line-height: 1; // remove spacing between lines
279+
}
280+
}
268281
}
269282

270283
.mx_EventTile:not([data-layout=bubble]).mx_EventTile_info .mx_EventTile_line,
@@ -842,12 +855,6 @@ $threadInfoLineHeight: calc(2 * $font-12px); // See: _commons.scss
842855
padding-right: 0;
843856
}
844857

845-
.mx_ReplyChain {
846-
.mx_MLocationBody {
847-
margin-top: 6px; // See: https://github.com/matrix-org/matrix-react-sdk/pull/8442
848-
}
849-
}
850-
851858
&:not([data-layout=bubble]) {
852859
padding-top: $spacing-16;
853860
}

‎res/css/views/rooms/_GroupLayout.scss

+21-6
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ limitations under the License.
1818
$left-gutter: 64px;
1919

2020
.mx_GroupLayout {
21+
--GroupLayout-EventTile-line-height: $font-22px;
22+
2123
.mx_EventTile {
2224
> .mx_DisambiguatedProfile {
2325
line-height: $font-20px;
@@ -33,10 +35,14 @@ $left-gutter: 64px;
3335
position: absolute; // for modern layout
3436
}
3537

36-
.mx_EventTile_line, .mx_EventTile_reply {
38+
.mx_EventTile_line,
39+
.mx_EventTile_reply {
3740
padding-top: 1px;
3841
padding-bottom: 3px;
39-
line-height: $font-22px;
42+
}
43+
44+
.mx_EventTile_reply {
45+
line-height: var(--GroupLayout-EventTile-line-height);
4046
}
4147
}
4248
}
@@ -47,7 +53,8 @@ $left-gutter: 64px;
4753
.mx_EventTile {
4854
padding-top: 4px;
4955

50-
.mx_EventTile_line, .mx_EventTile_reply {
56+
.mx_EventTile_line,
57+
.mx_EventTile_reply {
5158
padding-top: 0;
5259
padding-bottom: 0;
5360
}
@@ -56,9 +63,12 @@ $left-gutter: 64px;
5663
// same as the padding for non-compact .mx_EventTile.mx_EventTile_info
5764
padding-top: 0px;
5865
font-size: $font-13px;
59-
.mx_EventTile_line, .mx_EventTile_reply {
66+
67+
.mx_EventTile_line,
68+
.mx_EventTile_reply {
6069
line-height: $font-20px;
6170
}
71+
6272
.mx_EventTile_avatar {
6373
top: 4px;
6474
}
@@ -71,18 +81,23 @@ $left-gutter: 64px;
7181
&.mx_EventTile_emote {
7282
// add a bit more space for emotes so that avatars don't collide
7383
padding-top: 8px;
84+
7485
.mx_EventTile_avatar {
7586
top: 2px;
7687
}
77-
.mx_EventTile_line, .mx_EventTile_reply {
88+
89+
.mx_EventTile_line,
90+
.mx_EventTile_reply {
7891
padding-top: 0px;
7992
padding-bottom: 1px;
8093
}
8194
}
8295

8396
&.mx_EventTile_emote.mx_EventTile_continuation {
8497
padding-top: 0;
85-
.mx_EventTile_line, .mx_EventTile_reply {
98+
99+
.mx_EventTile_line,
100+
.mx_EventTile_reply {
86101
padding-top: 0px;
87102
padding-bottom: 0px;
88103
}

‎res/css/views/rooms/_ReplyPreview.scss

+10-3
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,10 @@ limitations under the License.
1616

1717
.mx_ReplyPreview {
1818
border: 1px solid $primary-hairline-color;
19-
background: $background;
2019
border-bottom: none;
21-
border-radius: 8px 8px 0 0;
20+
background: $background;
2221
max-height: 50vh;
2322
overflow: auto;
24-
box-shadow: 0px -16px 32px $composer-shadow-color;
2523

2624
.mx_ReplyPreview_section {
2725
border-bottom: 1px solid $primary-hairline-color;
@@ -53,3 +51,12 @@ limitations under the License.
5351
}
5452
}
5553
}
54+
55+
.mx_RoomView_body {
56+
.mx_ReplyPreview {
57+
// Add box-shadow to the reply preview on the main (left) panel only.
58+
// It is not added to the preview on the (right) panel for threads and a chat with a maximized widget.
59+
box-shadow: 0px -16px 32px $composer-shadow-color;
60+
border-radius: 8px 8px 0 0;
61+
}
62+
}

‎res/css/views/rooms/_RoomTile.scss

+4
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ limitations under the License.
3838
margin-right: 10px;
3939
}
4040

41+
.mx_RoomTile_details {
42+
min-width: 0;
43+
}
44+
4145
.mx_RoomTile_titleContainer {
4246
height: 32px;
4347
min-width: 0;

‎res/themes/dark/css/_dark.scss

+4
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,10 @@ $selected-color: $room-highlight-color;
269269
}
270270
// ********************
271271

272+
body {
273+
color-scheme: dark;
274+
}
275+
272276
// Nasty hacks to apply a filter to arbitrary monochrome artwork to make it
273277
// better match the theme. Typically applied to dark grey 'off' buttons or
274278
// light grey 'on' buttons.

0 commit comments

Comments
 (0)