Skip to content

Commit 75256bf

Browse files
su-exsu-ex
committed
Merge tag 'v3.37.0' into sc
* Always unhide widgets on layout change (pinning a widget) ([\matrix-org#7299](matrix-org#7299)). * Update status message in the member list and user info panel when it is changed ([\matrix-org#7338](matrix-org#7338)). Fixes element-hq/element-web#20127. Contributed by @SimonBrandner. * Iterate space panel toggle collapse interaction ([\matrix-org#7335](matrix-org#7335)). Fixes element-hq/element-web#20079. * Spotlight search labs ([\matrix-org#7116](matrix-org#7116)). Fixes element-hq/element-web#19530. * Put room settings form elements in fieldsets ([\matrix-org#7311](matrix-org#7311)). * Add descriptions to ambiguous links for screen readers ([\matrix-org#7310](matrix-org#7310)). * Make tooltips keyboard accessible ([\matrix-org#7281](matrix-org#7281)). * Iterate room context menus for DMs ([\matrix-org#7308](matrix-org#7308)). Fixes element-hq/element-web#19527. * Update space panel expand mechanism ([\matrix-org#7230](matrix-org#7230)). Fixes element-hq/element-web#17993. * Add CSS variable to make the UI gaps consistent and fix the resize handle position ([\matrix-org#7234](matrix-org#7234)). Fixes element-hq/element-web#19904 and element-hq/element-web#19938. * Custom location sharing. ([\matrix-org#7185](matrix-org#7185)). * Simple static location sharing ([\matrix-org#7135](matrix-org#7135)). * Finish sending pending messages before leaving room ([\matrix-org#7276](matrix-org#7276)). Fixes element-hq/element-web#4702. * Dropdown follow wai-aria practices for expanding on arrow keys ([\matrix-org#7277](matrix-org#7277)). Fixes element-hq/element-web#3687. * Expose PL control for pinned events when lab enabled ([\matrix-org#7278](matrix-org#7278)). Fixes element-hq/element-web#5396. * In People & Favourites metaspaces always show all rooms ([\matrix-org#7288](matrix-org#7288)). Fixes element-hq/element-web#20048. * Don't allow calls when the connection the server has been lost ([\matrix-org#7287](matrix-org#7287)). Fixes element-hq/element-web#2096. Contributed by @SimonBrandner. * Analytics opt in for posthog ([\matrix-org#6936](matrix-org#6936)). * Don't inhibit current room notifications if user has Modal open ([\matrix-org#7274](matrix-org#7274)). Fixes element-hq/element-web#1118. * Remove the `Screen sharing is here!` dialog ([\matrix-org#7266](matrix-org#7266)). Fixes element-hq/element-web#18824. Contributed by @SimonBrandner. * Make composer buttons react to settings without having to change room ([\matrix-org#7264](matrix-org#7264)). Fixes element-hq/element-web#20011. * Decorate view keyboard shortcuts link as a link ([\matrix-org#7260](matrix-org#7260)). Fixes element-hq/element-web#20007. * Improve ease of focusing on Room list Search ([\matrix-org#7255](matrix-org#7255)). Fixes matrix-org/element-web-rageshakes#7017. * Autofocus device panel entry when renaming device ([\matrix-org#7249](matrix-org#7249)). Fixes element-hq/element-web#19984. * Update Space Panel scrollable region ([\matrix-org#7245](matrix-org#7245)). Fixes element-hq/element-web#19978. * Replace breadcrumbs with recently viewed menu ([\matrix-org#7073](matrix-org#7073)). Fixes element-hq/element-web#19528. * Tweaks to informational architecture 1.1 ([\matrix-org#7052](matrix-org#7052)). Fixes element-hq/element-web#19526, element-hq/element-web#19379, element-hq/element-web#17792, element-hq/element-web#16450, element-hq/element-web#19881, element-hq/element-web#19892, element-hq/element-web#19300, element-hq/element-web#19324, element-hq/element-web#17307, element-hq/element-web#17468 element-hq/element-web#19932 and element-hq/element-web#19956. * [Release] Fix inline code block nowrap issue ([\matrix-org#7407](matrix-org#7407)). * don't collapse spaces in inline code blocks (https ([\matrix-org#7328](matrix-org#7328)). Fixes element-hq/element-web#6051. Contributed by @HarHarLinks. * Fix accessibility regressions ([\matrix-org#7336](matrix-org#7336)). * Debounce User Info start dm "Message" button ([\matrix-org#7357](matrix-org#7357)). Fixes element-hq/element-web#7763. * Fix thread filter being cut-off on narrow screens ([\matrix-org#7354](matrix-org#7354)). Fixes element-hq/element-web#20146. * Fix upgraded rooms wrongly showing up in spotlight ([\matrix-org#7341](matrix-org#7341)). Fixes element-hq/element-web#20141. * Show votes in replied-to polls (pass in getRelationsForEvent) ([\matrix-org#7345](matrix-org#7345)). Fixes element-hq/element-web#20153. * Keep all previously approved widget capabilities when requesting new capabilities ([\matrix-org#7340](matrix-org#7340)). Contributed by @dhenneke. * Only show poll previews when the polls feature is enabled ([\matrix-org#7331](matrix-org#7331)). * No-op action:join if the user is already invited for scalar ([\matrix-org#7334](matrix-org#7334)). Fixes element-hq/element-web#20134. * Don't show polls in timeline if polls are disabled ([\matrix-org#7332](matrix-org#7332)). Fixes element-hq/element-web#20130. * Don't send a poll response event if you are voting for your current c… ([\matrix-org#7326](matrix-org#7326)). Fixes element-hq/element-web#20129. * Don't show options button when the user can't modify widgets ([\matrix-org#7324](matrix-org#7324)). Fixes element-hq/element-web#20114. Contributed by @SimonBrandner. * Add vertical spacing between buttons when they go over multiple lines ([\matrix-org#7314](matrix-org#7314)). Contributed by @twigleingrid. * Improve accessibility of opening space create menu ([\matrix-org#7316](matrix-org#7316)). * Correct tab order in room preview dialog ([\matrix-org#7302](matrix-org#7302)). * Fix favourites and people metaspaces not rendering their content ([\matrix-org#7315](matrix-org#7315)). Fixes element-hq/element-web#20070. * Make clear button images visible in high contrast theme ([\matrix-org#7306](matrix-org#7306)). Fixes element-hq/element-web#19931. * Fix html exporting and improve output size ([\matrix-org#7312](matrix-org#7312)). Fixes element-hq/element-web#19436 element-hq/element-web#20107 and element-hq/element-web#19441. * Fix textual message stripping new line ([\matrix-org#7239](matrix-org#7239)). Fixes element-hq/element-web#15320. Contributed by @renancleyson-dev. * Fix issue with room list resizer getting clipped in firefox ([\matrix-org#7303](matrix-org#7303)). Fixes element-hq/element-web#20076. * Fix wrong indentation with nested ordered list unnesting list on edit ([\matrix-org#7300](matrix-org#7300)). Contributed by @renancleyson-dev. * Fix input field behaviour inside context menus ([\matrix-org#7293](matrix-org#7293)). Fixes element-hq/element-web#19881. * Corrected the alignment of the Edit button on LoginPage. ([\matrix-org#7292](matrix-org#7292)). Contributed by @ankur12-1610. * Allow sharing manual location without giving location permission ([\matrix-org#7295](matrix-org#7295)). Fixes element-hq/element-web#20065. Contributed by @tulir. * Make emoji picker search placeholder localizable ([\matrix-org#7294](matrix-org#7294)). * Fix jump to bottom on message send ([\matrix-org#7280](matrix-org#7280)). Fixes element-hq/element-web#19859. Contributed by @SimonBrandner. * Fix: Warning: Unsupported style property pointer-events. Did you mean pointerEvents? ([\matrix-org#7291](matrix-org#7291)). * Add edits and replies to the right panel timeline & prepare the timelineCard to share code with threads ([\matrix-org#7262](matrix-org#7262)). Fixes element-hq/element-web#20012 and element-hq/element-web#19928. * Fix labs exploding when lab group is empty ([\matrix-org#7290](matrix-org#7290)). Fixes element-hq/element-web#20051. * Update URL when room aliases are modified ([\matrix-org#7289](matrix-org#7289)). Fixes element-hq/element-web#1616 and element-hq/element-web#1925. * Render mini user menu for when space panel is disabled ([\matrix-org#7258](matrix-org#7258)). Fixes element-hq/element-web#19998. * When accepting DM from People metaspace don't switch to Home ([\matrix-org#7272](matrix-org#7272)). Fixes element-hq/element-web#19995. * Fix CallPreview `room is null` ([\matrix-org#7265](matrix-org#7265)). Fixes element-hq/element-web#19990, element-hq/element-web#19972, matrix-org/element-web-rageshakes#7004 matrix-org/element-web-rageshakes#6991 and matrix-org/element-web-rageshakes#6964. * Fixes more instances of double-translation ([\matrix-org#7259](matrix-org#7259)). Fixes element-hq/element-web#20010. * Fix video calls ([\matrix-org#7256](matrix-org#7256)). Fixes element-hq/element-web#20008. Contributed by @SimonBrandner. * Fix broken i18n in Forgot & Change password ([\matrix-org#7252](matrix-org#7252)). Fixes element-hq/element-web#19989. * Fix setBotPower to not use `.content` ([\matrix-org#7179](matrix-org#7179)). Fixes element-hq/element-web#19845. * Break long words in pinned messages to prevent overflow ([\matrix-org#7251](matrix-org#7251)). Fixes element-hq/element-web#19985. * Disallow sending empty feedbacks ([\matrix-org#7240](matrix-org#7240)). * Fix wrongly sized default sub-space icons in space panel ([\matrix-org#7243](matrix-org#7243)). Fixes element-hq/element-web#19973. * Hide clear cache and reload button if crash is before client init ([\matrix-org#7242](matrix-org#7242)). Fixes matrix-org/element-web-rageshakes#6996. * Fix automatic space switching wrongly going via Home for room aliases ([\matrix-org#7247](matrix-org#7247)). Fixes element-hq/element-web#19974. * Fix links being parsed as markdown links improperly ([\matrix-org#7200](matrix-org#7200)). Contributed by @Palid.
2 parents 04fae22 + 96e1694 commit 75256bf

File tree

733 files changed

+14822
-6368
lines changed

Some content is hidden

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

733 files changed

+14822
-6368
lines changed

‎.eslintignore

+1
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ src/component-index.js
22
test/end-to-end-tests/node_modules/
33
test/end-to-end-tests/element/
44
test/end-to-end-tests/synapse/
5+
test/end-to-end-tests/lib/

‎.eslintrc.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ module.exports = {
6666
settings: {
6767
react: {
6868
version: "detect",
69-
}
70-
}
69+
},
70+
},
7171
};
7272

7373
function buildRestrictedPropertiesOptions(properties, message) {

‎.github/workflows/netlify.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
7070
timeout-minutes: 1
7171
- name: Edit PR Description
72-
uses: velas/[email protected]
72+
uses: Beakyn/gha-comment-pull-request@2167a7aee24f9e61ce76a23039f322e49a990409
7373
env:
7474
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7575
with:

‎CHANGELOG.md

+155
Large diffs are not rendered by default.

‎package.json

+12-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "matrix-react-sdk",
3-
"version": "3.36.1",
3+
"version": "3.37.0",
44
"description": "SDK for matrix.org using React",
55
"author": "matrix.org",
66
"repository": {
@@ -57,6 +57,7 @@
5757
"@babel/runtime": "^7.12.5",
5858
"@sentry/browser": "^6.11.0",
5959
"@sentry/tracing": "^6.11.0",
60+
"@types/geojson": "^7946.0.8",
6061
"await-lock": "^2.1.0",
6162
"blurhash": "^1.1.3",
6263
"browser-encrypt-attachment": "^0.3.0",
@@ -70,6 +71,7 @@
7071
"emojibase-data": "^6.2.0",
7172
"emojibase-regex": "^5.1.3",
7273
"escape-html": "^1.0.3",
74+
"eslint-plugin-import": "^2.25.2",
7375
"file-saver": "^2.0.5",
7476
"filesize": "6.1.0",
7577
"flux": "2.1.1",
@@ -83,16 +85,18 @@
8385
"katex": "^0.12.0",
8486
"linkifyjs": "^2.1.9",
8587
"lodash": "^4.17.20",
86-
"matrix-js-sdk": "15.2.1",
87-
"matrix-widget-api": "^0.1.0-beta.17",
88+
"maplibre-gl": "^1.15.2",
89+
"matrix-analytics-events": "https://github.com/matrix-org/matrix-analytics-events.git#1eab4356548c97722a183912fda1ceabbe8cc7c1",
90+
"matrix-js-sdk": "15.3.0",
91+
"matrix-widget-api": "^0.1.0-beta.18",
8892
"minimist": "^1.2.5",
8993
"opus-recorder": "^8.0.3",
9094
"pako": "^2.0.3",
9195
"parse5": "^6.0.1",
9296
"png-chunks-extract": "^1.0.0",
9397
"posthog-js": "1.12.2",
9498
"prop-types": "^15.7.2",
95-
"qrcode": "^1.4.4",
99+
"qrcode": "1.4.4",
96100
"re-resizable": "^6.9.0",
97101
"react": "17.0.2",
98102
"react-beautiful-dnd": "^13.1.0",
@@ -151,8 +155,8 @@
151155
"@types/react-transition-group": "^4.4.0",
152156
"@types/sanitize-html": "^2.3.1",
153157
"@types/zxcvbn": "^4.4.0",
154-
"@typescript-eslint/eslint-plugin": "^4.17.0",
155-
"@typescript-eslint/parser": "^4.17.0",
158+
"@typescript-eslint/eslint-plugin": "^5.6.0",
159+
"@typescript-eslint/parser": "^5.6.0",
156160
"@wojtekmaj/enzyme-adapter-react-17": "^0.6.1",
157161
"allchange": "^1.0.6",
158162
"babel-jest": "^26.6.3",
@@ -162,7 +166,7 @@
162166
"enzyme-to-json": "^3.6.2",
163167
"eslint": "7.18.0",
164168
"eslint-config-google": "^0.14.0",
165-
"eslint-plugin-matrix-org": "github:matrix-org/eslint-plugin-matrix-org#2306b3d4da4eba908b256014b979f1d3d43d2945",
169+
"eslint-plugin-matrix-org": "github:matrix-org/eslint-plugin-matrix-org#48ec1e6af2cfb8310b9a6e23edf2dc7a26ddd580",
166170
"eslint-plugin-react": "^7.22.0",
167171
"eslint-plugin-react-hooks": "^4.2.0",
168172
"glob": "^7.1.6",
@@ -181,7 +185,7 @@
181185
"stylelint": "^13.9.0",
182186
"stylelint-config-standard": "^20.0.0",
183187
"stylelint-scss": "^3.18.0",
184-
"typescript": "4.3.5",
188+
"typescript": "4.5.3",
185189
"walk": "^2.3.14"
186190
},
187191
"resolutions": {

‎res/css/_common.scss

+29-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
/*
22
Copyright 2015, 2016 OpenMarket Ltd
33
Copyright 2017 Vector Creations Ltd
4-
Copyright 2017 New Vector Ltd
4+
Copyright 2017 - 2019 New Vector Ltd
5+
Copyright 2019 - 2021 The Matrix.org Foundation C.I.C
56
67
Licensed under the Apache License, Version 2.0 (the "License");
78
you may not use this file except in compliance with the License.
@@ -20,6 +21,7 @@ limitations under the License.
2021
@import "./_font-weights.scss";
2122
@import "./_border-radii.scss";
2223
@import "./_animations.scss";
24+
@import url("maplibre-gl/dist/maplibre-gl.css");
2325

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

@@ -32,6 +34,7 @@ $slider-dot-size: 1em;
3234
$slider-selection-dot-size: 2.4em;
3335

3436
$container-border-width: 8px;
37+
$container-gap-width: 8px; // only even numbers should be used because otherwise we get 0.5px margin values.
3538

3639
$timeline-image-border-radius: $border-radius-8px;
3740
:root {
@@ -170,6 +173,21 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
170173
outline: none;
171174
}
172175

176+
// override defaults
177+
fieldset {
178+
display: inline-block;
179+
margin-inline: unset;
180+
padding-block: unset;
181+
padding-inline: unset;
182+
min-inline-size: unset;
183+
border: none;
184+
}
185+
186+
legend {
187+
padding-inline: unset;
188+
border: none;
189+
}
190+
173191
// .mx_textinput is a container for a text input
174192
// + some other controls like buttons, ...
175193
// it has the appearance of a text box so the controls
@@ -411,6 +429,7 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
411429
@mixin mx_DialogButton;
412430
margin-left: 0px;
413431
margin-right: 8px;
432+
margin-bottom: 5px;
414433

415434
// flip colours for the secondary ones
416435
font-weight: 600;
@@ -483,6 +502,15 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
483502
overflow-y: hidden;
484503
}
485504

505+
.mx_DialogDesignChanges_wrapper .mx_Dialog_fixedWidth {
506+
max-width: 636px; // match splash image width
507+
508+
.mx_AccessibleButton_kind_link {
509+
font-size: inherit;
510+
padding: 0;
511+
}
512+
}
513+
486514
// TODO: Review mx_GeneralButton usage to see if it can use a different class
487515
// These classes were brought in from the old UserSettings and are included here to avoid
488516
// breaking the app.

‎res/css/_components.scss

+10-2
Original file line numberDiff line numberDiff line change
@@ -60,17 +60,16 @@
6060
@import "./views/auth/_Welcome.scss";
6161
@import "./views/avatars/_BaseAvatar.scss";
6262
@import "./views/avatars/_DecoratedRoomAvatar.scss";
63-
@import "./views/avatars/_MemberStatusMessageAvatar.scss";
6463
@import "./views/avatars/_WidgetAvatar.scss";
6564
@import "./views/beta/_BetaCard.scss";
6665
@import "./views/context_menus/_CallContextMenu.scss";
6766
@import "./views/context_menus/_IconizedContextMenu.scss";
6867
@import "./views/context_menus/_MessageContextMenu.scss";
69-
@import "./views/context_menus/_StatusMessageContextMenu.scss";
7068
@import "./views/context_menus/_TagTileContextMenu.scss";
7169
@import "./views/dialogs/_AddExistingToSpaceDialog.scss";
7270
@import "./views/dialogs/_AddressPickerDialog.scss";
7371
@import "./views/dialogs/_Analytics.scss";
72+
@import "./views/dialogs/_AnalyticsLearnMoreDialog.scss";
7473
@import "./views/dialogs/_BugReportDialog.scss";
7574
@import "./views/dialogs/_ChangelogDialog.scss";
7675
@import "./views/dialogs/_ChatCreateOrReuseChatDialog.scss";
@@ -114,6 +113,7 @@
114113
@import "./views/dialogs/_ShareDialog.scss";
115114
@import "./views/dialogs/_SlashCommandHelpDialog.scss";
116115
@import "./views/dialogs/_SpaceSettingsDialog.scss";
116+
@import "./views/dialogs/_SpotlightDialog.scss";
117117
@import "./views/dialogs/_TabbedIntegrationManagerDialog.scss";
118118
@import "./views/dialogs/_TermsDialog.scss";
119119
@import "./views/dialogs/_UntrustedDeviceDialog.scss";
@@ -140,11 +140,13 @@
140140
@import "./views/elements/_ErrorBoundary.scss";
141141
@import "./views/elements/_EventListSummary.scss";
142142
@import "./views/elements/_EventTilePreview.scss";
143+
@import "./views/elements/_ExternalLink.scss";
143144
@import "./views/elements/_FacePile.scss";
144145
@import "./views/elements/_Field.scss";
145146
@import "./views/elements/_ImageView.scss";
146147
@import "./views/elements/_InfoTooltip.scss";
147148
@import "./views/elements/_InlineSpinner.scss";
149+
@import "./views/elements/_InteractiveTooltip.scss";
148150
@import "./views/elements/_InviteReason.scss";
149151
@import "./views/elements/_ManageIntegsButton.scss";
150152
@import "./views/elements/_MiniAvatarUploader.scss";
@@ -158,6 +160,7 @@
158160
@import "./views/elements/_RoomAliasField.scss";
159161
@import "./views/elements/_SSOButtons.scss";
160162
@import "./views/elements/_ServerPicker.scss";
163+
@import "./views/elements/_SettingsFlag.scss";
161164
@import "./views/elements/_Slider.scss";
162165
@import "./views/elements/_Spinner.scss";
163166
@import "./views/elements/_StyledCheckbox.scss";
@@ -173,6 +176,7 @@
173176
@import "./views/groups/_GroupPublicityToggle.scss";
174177
@import "./views/groups/_GroupRoomList.scss";
175178
@import "./views/groups/_GroupUserSettings.scss";
179+
@import "./views/location/_LocationPicker.scss";
176180
@import "./views/messages/_CallEvent.scss";
177181
@import "./views/messages/_CreateEvent.scss";
178182
@import "./views/messages/_DateSeparator.scss";
@@ -182,6 +186,7 @@
182186
@import "./views/messages/_MImageBody.scss";
183187
@import "./views/messages/_MImageReplyBody.scss";
184188
@import "./views/messages/_MJitsiWidgetEvent.scss";
189+
@import "./views/messages/_MLocationBody.scss";
185190
@import "./views/messages/_MNoticeBody.scss";
186191
@import "./views/messages/_MPollBody.scss";
187192
@import "./views/messages/_MStickerBody.scss";
@@ -232,11 +237,13 @@
232237
@import "./views/rooms/_NotificationBadge.scss";
233238
@import "./views/rooms/_PinnedEventTile.scss";
234239
@import "./views/rooms/_PresenceLabel.scss";
240+
@import "./views/rooms/_RecentlyViewedButton.scss";
235241
@import "./views/rooms/_ReplyPreview.scss";
236242
@import "./views/rooms/_ReplyTile.scss";
237243
@import "./views/rooms/_RoomBreadcrumbs.scss";
238244
@import "./views/rooms/_RoomHeader.scss";
239245
@import "./views/rooms/_RoomList.scss";
246+
@import "./views/rooms/_RoomListHeader.scss";
240247
@import "./views/rooms/_RoomPreviewBar.scss";
241248
@import "./views/rooms/_RoomSublist.scss";
242249
@import "./views/rooms/_RoomTile.scss";
@@ -265,6 +272,7 @@
265272
@import "./views/settings/_SecureBackupPanel.scss";
266273
@import "./views/settings/_SetIdServer.scss";
267274
@import "./views/settings/_SetIntegrationManager.scss";
275+
@import "./views/settings/_SettingsFieldset.scss";
268276
@import "./views/settings/_SpellCheckLanguages.scss";
269277
@import "./views/settings/_ThemeChoicePanel.scss";
270278
@import "./views/settings/_UpdateCheckButton.scss";

‎res/css/structures/_ContextualMenu.scss

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ limitations under the License.
3737
position: absolute;
3838
font-size: $font-14px;
3939
z-index: 5001;
40+
width: max-content;
4041
}
4142

4243
.mx_ContextualMenu_right {

‎res/css/structures/_LeftPanel.scss

+50-11
Original file line numberDiff line numberDiff line change
@@ -101,17 +101,44 @@ $roomListCollapsedWidth: 68px;
101101
}
102102

103103
.mx_LeftPanel_filterContainer {
104-
margin-left: 12px;
105-
margin-right: 12px;
104+
margin: 0 12px;
105+
padding: 12px 0 8px;
106+
border-bottom: 1px solid $quinary-content;
106107

107108
flex-shrink: 0; // to convince safari's layout engine the flexbox is fine
108109

109110
// Create a flexbox to organize the inputs
110111
display: flex;
111112
align-items: center;
112113

114+
.mx_UserMenu {
115+
// mini-mode for when Space Panel is disabled
116+
margin-right: 12px;
117+
}
118+
119+
& + .mx_RoomListHeader {
120+
margin-top: 12px;
121+
}
122+
123+
.mx_RoomSearch_shortcutPrompt {
124+
border-radius: 6px;
125+
background-color: $panel-actions;
126+
padding: 2px 4px;
127+
user-select: none;
128+
font-size: $font-12px;
129+
line-height: $font-15px;
130+
font-weight: $font-semi-bold;
131+
color: $light-fg-color;
132+
margin-right: 6px;
133+
}
134+
113135
.mx_RoomSearch_focused, .mx_RoomSearch_hasQuery {
114-
& + .mx_LeftPanel_exploreButton {
136+
.mx_RoomSearch_shortcutPrompt {
137+
display: none;
138+
}
139+
140+
& + .mx_LeftPanel_exploreButton,
141+
& + .mx_LeftPanel_recentsButton {
115142
// Cheaty way to return the occupied space to the filter input
116143
flex-basis: 0;
117144
margin: 0;
@@ -144,11 +171,12 @@ $roomListCollapsedWidth: 68px;
144171
mask-position: center;
145172
mask-size: contain;
146173
mask-repeat: no-repeat;
147-
background: $secondary-content;
174+
background-color: $secondary-content;
148175
}
149176
}
150177

151-
.mx_LeftPanel_exploreButton {
178+
.mx_LeftPanel_exploreButton,
179+
.mx_LeftPanel_recentsButton {
152180
width: 32px;
153181
height: 32px;
154182
border-radius: $border-radius-8px;
@@ -163,17 +191,28 @@ $roomListCollapsedWidth: 68px;
163191
left: 8px;
164192
width: 16px;
165193
height: 16px;
166-
mask-image: url('$(res)/img/element-icons/roomlist/explore.svg');
167194
mask-position: center;
168195
mask-size: contain;
169196
mask-repeat: no-repeat;
170-
background: $secondary-content;
197+
background-color: $secondary-content;
171198
}
172199

173-
&.mx_LeftPanel_exploreButton_space::before {
174-
mask-image: url('$(res)/img/element-icons/roomlist/browse.svg');
200+
&:hover {
201+
background-color: $tertiary-content;
202+
203+
&::before {
204+
background-color: $background;
205+
}
175206
}
176207
}
208+
209+
.mx_LeftPanel_exploreButton::before {
210+
mask-image: url('$(res)/img/element-icons/roomlist/explore.svg');
211+
}
212+
213+
.mx_LeftPanel_recentsButton::before {
214+
mask-image: url('$(res)/img/element-icons/clock.svg');
215+
}
177216
}
178217

179218
.mx_LeftPanel_roomListFilterCount {
@@ -231,10 +270,10 @@ $roomListCollapsedWidth: 68px;
231270
background-color: transparent;
232271
}
233272

234-
.mx_LeftPanel_exploreButton {
273+
.mx_LeftPanel_exploreButton,
274+
.mx_LeftPanel_recentsButton {
235275
margin-left: 0;
236276
margin-top: 8px;
237-
background-color: transparent;
238277
}
239278
}
240279
}

‎res/css/structures/_MainSplit.scss

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ limitations under the License.
2323
}
2424

2525
.mx_MainSplit > .mx_RightPanel_ResizeWrapper {
26-
// no padding on the left. The spacing is taken care of by the main split content.
27-
padding: 0px 5px 5px 0px;
28-
margin-left: 8px;
26+
padding: $container-gap-width;
27+
padding-left: calc($container-gap-width / 2); // The resizer should be centered: only half of the gap-width is handled by the right panel. The other half by the RoomView.
2928
height: calc(100vh - 51px); // height of .mx_RoomHeader.light-panel
3029

3130
&:hover .mx_ResizeHandle_horizontal::before {
3231
position: absolute;
3332
top: 50%;
34-
transform: translate(0, -50%);
33+
left: 50%;
34+
transform: translate(-50%, -50%);
3535

3636
height: 64px; // to match width of the ones on roomlist
3737
width: 4px;

0 commit comments

Comments
 (0)