Skip to content

Commit 4c5818e

Browse files
su-exsu-ex
committed
Merge tag 'v3.39.0' into sc
* Tweak room list header menu for when space is active ([\matrix-org#7577](matrix-org#7577)). Fixes element-hq/element-web#20601. * Tweak light hover & active color for bubble layout ([\matrix-org#7626](matrix-org#7626)). Fixes element-hq/element-web#19475. * De-labs Metaspaces ([\matrix-org#7613](matrix-org#7613)). * De-labs Message Bubbles layout ([\matrix-org#7612](matrix-org#7612)). * Add customisation point for mxid display ([\matrix-org#7595](matrix-org#7595)). * Add labs flag for default open right panel ([\matrix-org#7618](matrix-org#7618)). Fixes element-hq/element-web#20666. * Tweak copy for the Sidebar tab in User Settings ([\matrix-org#7578](matrix-org#7578)). Fixes element-hq/element-web#20619. * Make widgets not reload (persistent) between center and top container ([\matrix-org#7575](matrix-org#7575)). Fixes element-hq/element-web#20596. Contributed by @toger5. * Don't render a bubble around emotes in bubble layout ([\matrix-org#7573](matrix-org#7573)). Fixes element-hq/element-web#20617. * Add ability to switch between voice & video in calls ([\matrix-org#7155](matrix-org#7155)). Fixes element-hq/element-web#18619. Contributed by @SimonBrandner. * Re-renable Share option for location messages ([\matrix-org#7596](matrix-org#7596)). * Make room ID copyable ([\matrix-org#7600](matrix-org#7600)). Fixes element-hq/element-web#20675. Contributed by @SimonBrandner. * Improve the look of the keyboard settings tab ([\matrix-org#7562](matrix-org#7562)). Contributed by @SimonBrandner. * Add tooltips to emoji in messages ([\matrix-org#7592](matrix-org#7592)). Fixes element-hq/element-web#9911 and element-hq/element-web#20661. Contributed by @robintown. * Improve redundant tooltip on send button in forward dialog ([\matrix-org#7594](matrix-org#7594)). Contributed by @twigleingrid. * Allow downloads from widgets. ([\matrix-org#7502](matrix-org#7502)). Contributed by @Fox32. * Parse matrix-schemed URIs ([\matrix-org#7453](matrix-org#7453)). * Show a tile at beginning of visible history ([\matrix-org#5887](matrix-org#5887)). Fixes element-hq/element-web#16818 element-hq/element-web#16679 and element-hq/element-web#19888. Contributed by @robintown. * Enable the polls feature ([\matrix-org#7581](matrix-org#7581)). * Display general marker on non-self location shares ([\matrix-org#7574](matrix-org#7574)). * Improve/add notifications for location and poll events ([\matrix-org#7552](matrix-org#7552)). Fixes element-hq/element-web#20561. Contributed by @SimonBrandner. * Upgrade linkify to v3.0 ([\matrix-org#7282](matrix-org#7282)). Fixes element-hq/element-web#17133 element-hq/element-web#16825 and element-hq/element-web#5808. Contributed by @Palid. * Update sidebar icon from Compound ([\matrix-org#7572](matrix-org#7572)). Fixes element-hq/element-web#20615. * Replace home icon with new one ([\matrix-org#7571](matrix-org#7571)). Fixes element-hq/element-web#20606. * Make the `Keyboard Shortcuts` dialog into a settings tab ([\matrix-org#7198](matrix-org#7198)). Fixes element-hq/element-web#19866. Contributed by @SimonBrandner. * Add setting for enabling location sharing ([\matrix-org#7547](matrix-org#7547)). * Add a developer mode 'view source' button to crashed event tiles ([\matrix-org#7537](matrix-org#7537)). * Replace `kick` terminology with `Remove from chat` ([\matrix-org#7469](matrix-org#7469)). Fixes element-hq/element-web#9547. * Render events as extensible events (behind labs) ([\matrix-org#7462](matrix-org#7462)). * Render Jitsi (and other sticky widgets) in PiP container, so it can be dragged and the "jump to room functionality" is provided ([\matrix-org#7450](matrix-org#7450)). Fixes element-hq/element-web#15682. Contributed by @toger5. * Allow bubble layout in Thread View ([\matrix-org#7478](matrix-org#7478)). Fixes element-hq/element-web#20419. * Make LocationPicker appearance cleaner ([\matrix-org#7516](matrix-org#7516)). * Limit max-width for bubble layout to 1200px ([\matrix-org#7458](matrix-org#7458)). Fixes element-hq/element-web#18072. * Improve look of call events in bubble layout ([\matrix-org#7445](matrix-org#7445)). Fixes element-hq/element-web#20324. Contributed by @SimonBrandner. * Make files & voice memos in bubble layout match colouring ([\matrix-org#7457](matrix-org#7457)). Fixes element-hq/element-web#20326. * Allow cancelling events whilst they are encrypting ([\matrix-org#7483](matrix-org#7483)). Fixes element-hq/element-web#17726. * [Release] Fix left panel widgets causing app-wide crash ([\matrix-org#7660](matrix-org#7660)). * Load light theme prior to HTML export to ensure it is present ([\matrix-org#7643](matrix-org#7643)). Fixes element-hq/element-web#20276. * Fix soft-crash when hanging up Jitsi via PIP ([\matrix-org#7645](matrix-org#7645)). Fixes element-hq/element-web#20766. * Fix RightPanelStore assuming isViewingRoom is false on load ([\matrix-org#7642](matrix-org#7642)). * Correctly handle Room.timeline events which have a nullable `Room` ([\matrix-org#7635](matrix-org#7635)). Fixes matrix-org/element-web-rageshakes#9490. * Translate keyboard shortcut alternate key names ([\matrix-org#7633](matrix-org#7633)). Fixes element-hq/element-web#20739. * Fix unfocused paste handling and focus return for file uploads ([\matrix-org#7625](matrix-org#7625)). * Changed MacOS hotkey for GoToHome view. ([\matrix-org#7631](matrix-org#7631)). Contributed by @aj-ya. * Fix issue with the new composer EmojiPart which caused infinite loops ([\matrix-org#7629](matrix-org#7629)). Fixes element-hq/element-web#20746. * Upgrade linkifyjs to fix schemes as domain prefixes ([\matrix-org#7628](matrix-org#7628)). Fixes element-hq/element-web#20720. * Show bubble tile timestamps for bubble layout inside the bubble ([\matrix-org#7622](matrix-org#7622)). Fixes element-hq/element-web#20562. * Improve taken username warning in registration for when request fails ([\matrix-org#7621](matrix-org#7621)). * Avoid double dialog after clicking to remove a public room ([\matrix-org#7604](matrix-org#7604)). Fixes element-hq/element-web#20681. Contributed by @c-cal. * Fix space member list right panel state ([\matrix-org#7617](matrix-org#7617)). Fixes element-hq/element-web#20716. * Fall back to legacy analytics for guest users ([\matrix-org#7616](matrix-org#7616)). * Always emit a space filter update when the space is actually changed ([\matrix-org#7611](matrix-org#7611)). Fixes element-hq/element-web#20664. * Enlarge emoji in composer ([\matrix-org#7602](matrix-org#7602)). Fixes element-hq/element-web#20665 element-hq/element-web#15635 and element-hq/element-web#20688. Contributed by @robintown. * Disable location sharing button on Desktop ([\matrix-org#7590](matrix-org#7590)). * Make pills more natural to navigate around ([\matrix-org#7607](matrix-org#7607)). Fixes element-hq/element-web#20678. Contributed by @robintown. * Fix excessive padding on inline images ([\matrix-org#7605](matrix-org#7605)). Contributed by @robintown. * Prevent pills from being split by formatting actions ([\matrix-org#7606](matrix-org#7606)). Contributed by @robintown. * Fix translation of "powerText" ([\matrix-org#7603](matrix-org#7603)). Contributed by @c-cal. * Unhide display names when switching back to modern layout ([\matrix-org#7601](matrix-org#7601)). Fixes element-hq/element-web#20676. Contributed by @robintown. * Fix space member list not opening ([\matrix-org#7609](matrix-org#7609)). Fixes element-hq/element-web#20679. Contributed by @SimonBrandner. * Fix translation for the "Add room" tooltip ([\matrix-org#7532](matrix-org#7532)). Contributed by @c-cal. * Make the close button of the location share dialog visible in high-contrast theme ([\matrix-org#7597](matrix-org#7597)). * Cancel pending events in virtual room when call placed ([\matrix-org#7583](matrix-org#7583)). Fixes element-hq/element-web#17594. * Fix alignment of unread badge in thread list ([\matrix-org#7582](matrix-org#7582)). Fixes element-hq/element-web#20643. * Fix left positioned tooltips being wrong and offset by fixed value ([\matrix-org#7551](matrix-org#7551)). * Fix MAB overlapping or overflowing in bubbles layout and threads regressions ([\matrix-org#7569](matrix-org#7569)). Fixes element-hq/element-web#20403 and element-hq/element-web#20404. * Fix wrong icon being used for appearance tab in space preferences dialog ([\matrix-org#7570](matrix-org#7570)). Fixes element-hq/element-web#20608. * Fix `/jumptodate` using wrong MSC feature flag ([\matrix-org#7563](matrix-org#7563)). * Ensure maps show up in replies and threads, by creating unique IDs ([\matrix-org#7568](matrix-org#7568)). * Differentiate between hover and roving focus in spotlight dialog ([\matrix-org#7564](matrix-org#7564)). Fixes element-hq/element-web#20597. * Fix timeline jumping issues related to bubble layout ([\matrix-org#7529](matrix-org#7529)). Fixes element-hq/element-web#20302. * Start a conference in a room with 2 people + invitee rather than a 1:1 call ([\matrix-org#7557](matrix-org#7557)). Fixes element-hq/element-web#1202. Contributed by @SimonBrandner. * Wait for initial profile load before displaying widget ([\matrix-org#7556](matrix-org#7556)). * Make widgets and calls span across the whole room width when using bubble layout ([\matrix-org#7553](matrix-org#7553)). Fixes element-hq/element-web#20560. Contributed by @SimonBrandner. * Always show right panel after setting a card ([\matrix-org#7544](matrix-org#7544)). Contributed by @toger5. * Support deserialising HR tags for editing ([\matrix-org#7543](matrix-org#7543)). Fixes element-hq/element-web#20553. * Refresh ThreadView after React state has been updated ([\matrix-org#7539](matrix-org#7539)). Fixes element-hq/element-web#20549. * Set initial zoom level to 1 to make zooming to location faster ([\matrix-org#7541](matrix-org#7541)). * truncate room name on pip header ([\matrix-org#7538](matrix-org#7538)). * Prevent enter to send edit weirdness when no change has been made ([\matrix-org#7522](matrix-org#7522)). Fixes element-hq/element-web#20507. * Allow using room pills in slash commands ([\matrix-org#7513](matrix-org#7513)). Fixes element-hq/element-web#20343.
2 parents 09cbb58 + bdcdd74 commit 4c5818e

File tree

227 files changed

+7735
-3915
lines changed

Some content is hidden

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

227 files changed

+7735
-3915
lines changed

‎.eslintrc.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ module.exports = {
4545
"jsx-a11y/alt-text": "off",
4646
"jsx-a11y/aria-activedescendant-has-tabindex": "off",
4747
"jsx-a11y/click-events-have-key-events": "off",
48-
"jsx-a11y/iframe-has-title": "off",
4948
"jsx-a11y/interactive-supports-focus": "off",
5049
"jsx-a11y/label-has-associated-control": "off",
5150
"jsx-a11y/media-has-caption": "off",

‎.github/workflows/layered-build.yaml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,4 @@ jobs:
1717
path: element-web/webapp
1818
# We'll only use this in a triggered job, then we're done with it
1919
retention-days: 1
20-
- uses: actions/[email protected]
21-
with:
22-
script: |
23-
var fs = require('fs');
24-
fs.writeFileSync('${{github.workspace}}/pr.json', JSON.stringify(context.payload.pull_request));
25-
- name: Upload PR Info
26-
uses: actions/upload-artifact@v2
27-
with:
28-
name: pr.json
29-
path: pr.json
30-
# We'll only use this in a triggered job, then we're done with it
31-
retention-days: 1
3220

‎.github/workflows/netlify.yaml

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -33,28 +33,8 @@ jobs:
3333
});
3434
var fs = require('fs');
3535
fs.writeFileSync('${{github.workspace}}/previewbuild.zip', Buffer.from(download.data));
36-
37-
var prInfoArtifact = artifacts.data.artifacts.filter((artifact) => {
38-
return artifact.name == "pr.json"
39-
})[0];
40-
var download = await github.actions.downloadArtifact({
41-
owner: context.repo.owner,
42-
repo: context.repo.repo,
43-
artifact_id: prInfoArtifact.id,
44-
archive_format: 'zip',
45-
});
46-
var fs = require('fs');
47-
fs.writeFileSync('${{github.workspace}}/pr.json.zip', Buffer.from(download.data));
4836
- name: Extract Artifacts
49-
run: unzip -d webapp previewbuild.zip && rm previewbuild.zip && unzip pr.json.zip && rm pr.json.zip
50-
- name: 'Read PR Info'
51-
id: readctx
52-
uses: actions/[email protected]
53-
with:
54-
script: |
55-
var fs = require('fs');
56-
var pr = JSON.parse(fs.readFileSync('${{github.workspace}}/pr.json'));
57-
console.log(`::set-output name=prnumber::${pr.number}`);
37+
run: unzip -d webapp previewbuild.zip && rm previewbuild.zip
5838
- name: Deploy to Netlify
5939
id: netlify
6040
uses: nwtgck/[email protected]
@@ -73,7 +53,7 @@ jobs:
7353
env:
7454
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7555
with:
76-
pull-request-number: ${{ steps.readctx.outputs.prnumber }}
56+
pull-request-number: ${{github.event.workflow_run.pull_requests[0].number}}
7757
description-message: |
7858
Preview: ${{ steps.netlify.outputs.deploy-url }}
7959
⚠️ Do you trust the author of this PR? Maybe this build will steal your keys or give you malware. Exercise caution. Use test accounts.

‎CHANGELOG.md

Lines changed: 181 additions & 0 deletions
Large diffs are not rendered by default.

‎docs/settings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ that room administrators cannot force account-only settings upon participants.
2525
## Settings
2626

2727
Settings are the different options a user may set or experience in the application. These are pre-defined in
28-
`src/settings/Settings.ts` under the `SETTINGS` constant, and match the `ISetting` interface as defined there.
28+
`src/settings/Settings.tsx` under the `SETTINGS` constant, and match the `ISetting` interface as defined there.
2929

3030
Settings that support the config level can be set in the config file under the `settingDefaults` key (note that some
3131
settings, like the "theme" setting, are special cased in the config file):

‎package.json

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "matrix-react-sdk",
3-
"version": "3.38.0",
3+
"version": "3.39.0",
44
"description": "SDK for matrix.org using React",
55
"author": "matrix.org",
66
"repository": {
@@ -29,6 +29,9 @@
2929
"matrix_src_main": "./src/index.ts",
3030
"matrix_lib_main": "./lib/index.ts",
3131
"matrix_lib_typings": "./lib/index.d.ts",
32+
"matrix_i18n_extra_translation_funcs": [
33+
"newTranslatableError"
34+
],
3235
"scripts": {
3336
"prepublishOnly": "yarn build",
3437
"i18n": "matrix-gen-i18n",
@@ -55,6 +58,9 @@
5558
},
5659
"dependencies": {
5760
"@babel/runtime": "^7.12.5",
61+
"@matrix-org/linkify-element": "^4.0.0-rc.5",
62+
"@matrix-org/linkify-string": "^4.0.0-rc.5",
63+
"@matrix-org/linkifyjs": "^4.0.0-rc.6",
5864
"@sentry/browser": "^6.11.0",
5965
"@sentry/tracing": "^6.11.0",
6066
"@types/geojson": "^7946.0.8",
@@ -82,11 +88,11 @@
8288
"is-ip": "^3.1.0",
8389
"jszip": "^3.7.0",
8490
"katex": "^0.12.0",
85-
"linkifyjs": "^2.1.9",
8691
"lodash": "^4.17.20",
8792
"maplibre-gl": "^1.15.2",
88-
"matrix-analytics-events": "https://github.com/matrix-org/matrix-analytics-events.git#1eab4356548c97722a183912fda1ceabbe8cc7c1",
89-
"matrix-js-sdk": "15.4.0",
93+
"matrix-analytics-events": "github:matrix-org/matrix-analytics-events.git#1eab4356548c97722a183912fda1ceabbe8cc7c1",
94+
"matrix-events-sdk": "^0.0.1-beta.6",
95+
"matrix-js-sdk": "15.5.0",
9096
"matrix-widget-api": "^0.1.0-beta.18",
9197
"minimist": "^1.2.5",
9298
"opus-recorder": "^8.0.3",
@@ -141,7 +147,6 @@
141147
"@types/file-saver": "^2.0.3",
142148
"@types/flux": "^3.1.9",
143149
"@types/jest": "^26.0.20",
144-
"@types/linkifyjs": "^2.1.3",
145150
"@types/lodash": "^4.14.168",
146151
"@types/modernizr": "^3.5.3",
147152
"@types/node": "^14.14.22",
@@ -178,7 +183,7 @@
178183
"jest-raw-loader": "^1.0.1",
179184
"matrix-mock-request": "^1.2.3",
180185
"matrix-react-test-utils": "^0.2.3",
181-
"matrix-web-i18n": "github:matrix-org/matrix-web-i18n",
186+
"matrix-web-i18n": "^1.2.0",
182187
"raw-loader": "^4.0.2",
183188
"react-test-renderer": "^17.0.2",
184189
"rimraf": "^3.0.2",

‎res/css/_common.scss

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ legend {
427427
* Elements that should not be styled like a dialog button are mentioned in a :not() pseudo-class.
428428
* For the widest browser support, we use multiple :not pseudo-classes instead of :not(.a, .b).
429429
*/
430-
.mx_Dialog button:not(.mx_Dialog_nonDialogButton):not(.maplibregl-ctrl-attrib-button):not(.mx_AccessibleButton),
430+
.mx_Dialog button:not(.mx_Dialog_nonDialogButton):not([class|=maplibregl]):not(.mx_AccessibleButton),
431431
.mx_Dialog input[type="submit"],
432432
.mx_Dialog_buttons button:not(.mx_Dialog_nonDialogButton):not(.mx_AccessibleButton),
433433
.mx_Dialog_buttons input[type="submit"] {
@@ -444,49 +444,49 @@ legend {
444444
font-family: inherit;
445445
}
446446

447-
.mx_Dialog button:not(.mx_Dialog_nonDialogButton):not(.maplibregl-ctrl-attrib-button):not(.mx_AccessibleButton):last-child {
447+
.mx_Dialog button:not(.mx_Dialog_nonDialogButton):not([class|=maplibregl]):not(.mx_AccessibleButton):last-child {
448448
margin-right: 0px;
449449
}
450450

451-
.mx_Dialog button:not(.mx_Dialog_nonDialogButton):not(.maplibregl-ctrl-attrib-button):not(.mx_AccessibleButton):hover,
451+
.mx_Dialog button:not(.mx_Dialog_nonDialogButton):not([class|=maplibregl]):not(.mx_AccessibleButton):hover,
452452
.mx_Dialog input[type="submit"]:hover,
453453
.mx_Dialog_buttons button:not(.mx_Dialog_nonDialogButton):not(.mx_AccessibleButton):hover,
454454
.mx_Dialog_buttons input[type="submit"]:hover {
455455
@mixin mx_DialogButton_hover;
456456
}
457457

458-
.mx_Dialog button:not(.mx_Dialog_nonDialogButton):not(.maplibregl-ctrl-attrib-button):not(.mx_AccessibleButton):focus,
458+
.mx_Dialog button:not(.mx_Dialog_nonDialogButton):not([class|=maplibregl]):not(.mx_AccessibleButton):focus,
459459
.mx_Dialog input[type="submit"]:focus,
460460
.mx_Dialog_buttons button:not(.mx_Dialog_nonDialogButton):not(.mx_AccessibleButton):focus,
461461
.mx_Dialog_buttons input[type="submit"]:focus {
462462
filter: brightness($focus-brightness);
463463
}
464464

465-
.mx_Dialog button.mx_Dialog_primary:not(.mx_Dialog_nonDialogButton):not(.maplibregl-ctrl-attrib-button),
465+
.mx_Dialog button.mx_Dialog_primary:not(.mx_Dialog_nonDialogButton):not([class|=maplibregl]),
466466
.mx_Dialog input[type="submit"].mx_Dialog_primary,
467-
.mx_Dialog_buttons button.mx_Dialog_primary,
467+
.mx_Dialog_buttons button.mx_Dialog_primary:not(.mx_Dialog_nonDialogButton):not(.mx_AccessibleButton),
468468
.mx_Dialog_buttons input[type="submit"].mx_Dialog_primary {
469469
color: $accent-fg-color;
470470
background-color: $accent;
471471
min-width: 156px;
472472
}
473473

474-
.mx_Dialog button.danger:not(.mx_Dialog_nonDialogButton):not(.maplibregl-ctrl-attrib-button),
474+
.mx_Dialog button.danger:not(.mx_Dialog_nonDialogButton):not([class|=maplibregl]),
475475
.mx_Dialog input[type="submit"].danger,
476-
.mx_Dialog_buttons button.danger,
476+
.mx_Dialog_buttons button.danger:not(.mx_Dialog_nonDialogButton):not(.mx_AccessibleButton),
477477
.mx_Dialog_buttons input[type="submit"].danger {
478478
background-color: $alert;
479479
border: solid 1px $alert;
480480
color: $accent-fg-color;
481481
}
482482

483-
.mx_Dialog button.warning:not(.mx_Dialog_nonDialogButton):not(.maplibregl-ctrl-attrib-button),
483+
.mx_Dialog button.warning:not(.mx_Dialog_nonDialogButton):not([class|=maplibregl]),
484484
.mx_Dialog input[type="submit"].warning {
485485
border: solid 1px $alert;
486486
color: $alert;
487487
}
488488

489-
.mx_Dialog button:not(.mx_Dialog_nonDialogButton):not(.maplibregl-ctrl-attrib-button):not(.mx_AccessibleButton):disabled,
489+
.mx_Dialog button:not(.mx_Dialog_nonDialogButton):not([class|=maplibregl]):not(.mx_AccessibleButton):disabled,
490490
.mx_Dialog input[type="submit"]:disabled,
491491
.mx_Dialog_buttons button:not(.mx_Dialog_nonDialogButton):not(.mx_AccessibleButton):disabled,
492492
.mx_Dialog_buttons input[type="submit"]:disabled {

‎res/css/_components.scss

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@
9595
@import "./views/dialogs/_IncomingSasDialog.scss";
9696
@import "./views/dialogs/_InviteDialog.scss";
9797
@import "./views/dialogs/_JoinRuleDropdown.scss";
98-
@import "./views/dialogs/_KeyboardShortcutsDialog.scss";
9998
@import "./views/dialogs/_LeaveSpaceDialog.scss";
10099
@import "./views/dialogs/_LocationViewDialog.scss";
101100
@import "./views/dialogs/_ManageRestrictedJoinRuleDialog.scss";
@@ -134,6 +133,7 @@
134133
@import "./views/elements/_AccessibleButton.scss";
135134
@import "./views/elements/_AddressSelector.scss";
136135
@import "./views/elements/_AddressTile.scss";
136+
@import "./views/elements/_CopyableText.scss";
137137
@import "./views/elements/_DesktopBuildsNotice.scss";
138138
@import "./views/elements/_DesktopCapturerSourcePicker.scss";
139139
@import "./views/elements/_DialPadBackspaceButton.scss";
@@ -184,6 +184,7 @@
184184
@import "./views/messages/_CreateEvent.scss";
185185
@import "./views/messages/_DateSeparator.scss";
186186
@import "./views/messages/_EventTileBubble.scss";
187+
@import "./views/messages/_HiddenBody.scss";
187188
@import "./views/messages/_MEmoteBody.scss";
188189
@import "./views/messages/_MFileBody.scss";
189190
@import "./views/messages/_MImageBody.scss";
@@ -228,6 +229,7 @@
228229
@import "./views/rooms/_EventTile.scss";
229230
@import "./views/rooms/_GroupLayout.scss";
230231
@import "./views/rooms/_BubbleLayout.scss";
232+
@import "./views/rooms/_HistoryTile.scss";
231233
@import "./views/rooms/_IRCLayout.scss";
232234
@import "./views/rooms/_JumpToBottomButton.scss";
233235
@import "./views/rooms/_LinkPreviewGroup.scss";
@@ -287,6 +289,7 @@
287289
@import "./views/settings/tabs/user/_AppearanceUserSettingsTab.scss";
288290
@import "./views/settings/tabs/user/_GeneralUserSettingsTab.scss";
289291
@import "./views/settings/tabs/user/_HelpUserSettingsTab.scss";
292+
@import "./views/settings/tabs/user/_KeyboardUserSettingsTab.scss";
290293
@import "./views/settings/tabs/user/_LabsUserSettingsTab.scss";
291294
@import "./views/settings/tabs/user/_MjolnirUserSettingsTab.scss";
292295
@import "./views/settings/tabs/user/_NotificationUserSettingsTab.scss";
@@ -305,7 +308,6 @@
305308
@import "./views/typography/_Heading.scss";
306309
@import "./views/verification/_VerificationShowSas.scss";
307310
@import "./views/voip/CallView/_CallViewButtons.scss";
308-
@import "./views/voip/_CallContainer.scss";
309311
@import "./views/voip/_CallPreview.scss";
310312
@import "./views/voip/_CallView.scss";
311313
@import "./views/voip/_CallViewForRoom.scss";
@@ -314,4 +316,5 @@
314316
@import "./views/voip/_DialPad.scss";
315317
@import "./views/voip/_DialPadContextMenu.scss";
316318
@import "./views/voip/_DialPadModal.scss";
319+
@import "./views/voip/_PiPContainer.scss";
317320
@import "./views/voip/_VideoFeed.scss";

‎res/css/structures/_SpacePanel.scss

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,10 @@ $activeBorderColor: $primary-content;
387387
line-height: $font-18px;
388388
}
389389

390+
.mx_SpacePanel_iconHome::before {
391+
mask-image: url('$(res)/img/element-icons/home.svg');
392+
}
393+
390394
.mx_SpacePanel_iconInvite::before {
391395
mask-image: url('$(res)/img/element-icons/room/invite.svg');
392396
}
@@ -408,7 +412,7 @@ $activeBorderColor: $primary-content;
408412
}
409413

410414
.mx_SpacePanel_iconExplore::before {
411-
mask-image: url('$(res)/img/element-icons/roomlist/search.svg');
415+
mask-image: url('$(res)/img/element-icons/roomlist/hash-search.svg');
412416
}
413417

414418
.mx_SpacePanel_iconPreferences::before {

‎res/css/structures/_UserMenu.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ limitations under the License.
176176
}
177177

178178
.mx_UserMenu_iconHome::before {
179-
mask-image: url('$(res)/img/element-icons/roomlist/home.svg');
179+
mask-image: url('$(res)/img/element-icons/home.svg');
180180
}
181181

182182
.mx_UserMenu_iconDnd::before {

‎res/css/views/dialogs/_SpacePreferencesDialog.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,7 @@ limitations under the License.
4444
}
4545
}
4646
}
47+
48+
.mx_SpacePreferencesDialog_appearanceIcon::before {
49+
mask-image: url('$(res)/img/element-icons/settings/appearance.svg');
50+
}

‎res/css/views/dialogs/_SpotlightDialog.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,10 +154,10 @@ limitations under the License.
154154

155155
&:hover, &[aria-selected=true] {
156156
background-color: $system;
157+
}
157158

158-
.mx_SpotlightDialog_enterPrompt {
159-
display: inline-block;
160-
}
159+
&[aria-selected=true] .mx_SpotlightDialog_enterPrompt {
160+
display: inline-block;
161161
}
162162
}
163163
}

‎res/css/views/dialogs/_UserSettingsDialog.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ limitations under the License.
3737
mask-image: url('$(res)/img/element-icons/settings/preference.svg');
3838
}
3939

40+
.mx_UserSettingsDialog_keyboardIcon::before {
41+
mask-image: url('$(res)/img/element-icons/settings/keyboard.svg');
42+
}
43+
4044
.mx_UserSettingsDialog_sidebarIcon::before {
4145
mask-image: url('$(res)/img/element-icons/settings/sidebar.svg');
4246
}

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

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
/*
2+
Copyright 2019 New Vector Ltd
3+
Copyright 2022 Šimon Brandner <[email protected]>
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
*/
17+
18+
.mx_CopyableText {
19+
display: flex;
20+
border-radius: 5px;
21+
border: solid 1px $light-fg-color;
22+
margin-bottom: 10px;
23+
margin-top: 10px;
24+
padding: 10px;
25+
width: max-content;
26+
max-width: 100%;
27+
28+
.mx_CopyableText_copyButton {
29+
flex-shrink: 0;
30+
width: 20px;
31+
height: 20px;
32+
cursor: pointer;
33+
margin-left: 20px;
34+
display: block;
35+
36+
&::before {
37+
content: "";
38+
39+
mask-image: url($copy-button-url);
40+
background-color: $message-action-bar-fg-color;
41+
width: 20px;
42+
height: 20px;
43+
display: block;
44+
background-repeat: no-repeat;
45+
}
46+
}
47+
}

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,11 @@ a.mx_Pill {
8686
margin-right: 0.24rem;
8787
}
8888

89+
.mx_Emoji {
90+
font-size: 1.8rem;
91+
vertical-align: bottom;
92+
}
93+
8994
.mx_Markdown_BOLD {
9095
font-weight: bold;
9196
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ limitations under the License.
6060
font-weight: 500;
6161
max-width: 200px;
6262
word-break: break-word;
63-
margin-right: 50px;
63+
margin-left: 6px;
64+
margin-right: 6px;
6465

6566
background-color: #21262C; // Same on both themes
6667
color: $accent-fg-color;

0 commit comments

Comments
 (0)