Skip to content

Commit 7e2e1b6

Browse files
committed
Merge tag 'v3.38.0' into sc
* Add permission dropdown for sending reactions ([\matrix-org#7492](matrix-org#7492)). Fixes element-hq/element-web#20450. * Ship maximised widgets and remove feature flag ([\matrix-org#7509](matrix-org#7509)). * Properly maintain aspect ratio of inline images ([\matrix-org#7503](matrix-org#7503)). * Add zoom buttons to the location view ([\matrix-org#7482](matrix-org#7482)). * Remove bubble from around location events ([\matrix-org#7459](matrix-org#7459)). Fixes element-hq/element-web#20323. * Disable "Publish this room" option in invite only rooms ([\matrix-org#7441](matrix-org#7441)). Fixes element-hq/element-web#6596. Contributed by @aaronraimist. * Give secret key field an `id` ([\matrix-org#7489](matrix-org#7489)). Fixes element-hq/element-web#20390. Contributed by @SimonBrandner. * Display a tooltip when you hover over a location ([\matrix-org#7472](matrix-org#7472)). * Open map in a dialog when it is clicked ([\matrix-org#7465](matrix-org#7465)). * a11y - wrap notification level radios in fieldsets ([\matrix-org#7471](matrix-org#7471)). * Wrap inputs in fieldsets in Space visibility settings ([\matrix-org#7350](matrix-org#7350)). * History based navigation with new right panel store ([\matrix-org#7398](matrix-org#7398)). Fixes element-hq/element-web#19686 element-hq/element-web#19660 and element-hq/element-web#19634. * Associate room alias warning with public option in settings ([\matrix-org#7430](matrix-org#7430)). * Disable quick reactions button when no permissions ([\matrix-org#7412](matrix-org#7412)). Fixes element-hq/element-web#20270. * Allow opening a map view in OpenStreetMap ([\matrix-org#7428](matrix-org#7428)). * Display the user's avatar when they shared their location ([\matrix-org#7424](matrix-org#7424)). * Remove the Forward and Share buttons for location messages only ([\matrix-org#7423](matrix-org#7423)). * Add configuration to disable relative date markers in timeline ([\matrix-org#7405](matrix-org#7405)). * Space preferences for whether or not you see DMs in a Space ([\matrix-org#7250](matrix-org#7250)). Fixes element-hq/element-web#19529 and element-hq/element-web#19955. * Have LocalEchoWrapper emit updates so the app can react faster ([\matrix-org#7358](matrix-org#7358)). Fixes element-hq/element-web#19749. * Use semantic heading on dialog component ([\matrix-org#7383](matrix-org#7383)). * Add `/jumptodate` slash command ([\matrix-org#7372](matrix-org#7372)). Fixes element-hq/element-web#7677. * Update room context menu copy ([\matrix-org#7361](matrix-org#7361)). Fixes element-hq/element-web#20133. * Use lazy rendering in the AddExistingToSpaceDialog ([\matrix-org#7369](matrix-org#7369)). Fixes element-hq/element-web#18784. * Tweak FacePile tooltip to include whether or not you are included ([\matrix-org#7367](matrix-org#7367)). Fixes element-hq/element-web#17278. * Fix wrongly wrapping code blocks, breaking line numbers ([\matrix-org#7507](matrix-org#7507)). Fixes element-hq/element-web#20316. * Set header buttons to no phase when right panel is closed ([\matrix-org#7506](matrix-org#7506)). * Fix active Jitsi calls (and other active widgets) not being visible on screen, by showing them in PiP if they are not visible in any other container ([\matrix-org#7435](matrix-org#7435)). Fixes element-hq/element-web#15169 and element-hq/element-web#20275. * Fix layout of message bubble preview in settings ([\matrix-org#7497](matrix-org#7497)). * Prevent mutations of js-sdk owned objects as it breaks accountData ([\matrix-org#7504](matrix-org#7504)). Fixes matrix-org/element-web-rageshakes#7822. * fallback properly with pluralized strings ([\matrix-org#7495](matrix-org#7495)). Fixes element-hq/element-web#20455. * Consider continuations when resolving whether a tile is last in section ([\matrix-org#7461](matrix-org#7461)). Fixes element-hq/element-web#20368 and element-hq/element-web#20369. * Fix read receipts and sent indicators for bubble layout ([\matrix-org#7460](matrix-org#7460)). Fixes element-hq/element-web#18298 and element-hq/element-web#20345. * null-guard dataset mxTheme to prevent html exports from exploding ([\matrix-org#7493](matrix-org#7493)). Fixes element-hq/element-web#20453. * Fix avatar container overlapping give feedback cta ([\matrix-org#7491](matrix-org#7491)). Fixes matrix-org/element-web-rageshakes#7987. * Fix jump to bottom button working when on a permalink ([\matrix-org#7494](matrix-org#7494)). Fixes element-hq/element-web#19813. * Remove the Description from the location picker ([\matrix-org#7485](matrix-org#7485)). * Fix look of the untrusted device dialog ([\matrix-org#7487](matrix-org#7487)). Fixes element-hq/element-web#20447. Contributed by @SimonBrandner. * Hide maximise button in the sticker picker ([\matrix-org#7488](matrix-org#7488)). Fixes element-hq/element-web#20443. Contributed by @SimonBrandner. * Fix space ordering to match newer spec ([\matrix-org#7481](matrix-org#7481)). * Fix typing notification colors ([\matrix-org#7490](matrix-org#7490)). Fixes element-hq/element-web#20144. Contributed by @SimonBrandner. * fix fallback for pluralized strings ([\matrix-org#7480](matrix-org#7480)). Fixes element-hq/element-web#20426. * Fix right panel soft crashes chat rooms ([\matrix-org#7479](matrix-org#7479)). Fixes element-hq/element-web#20433. * update yarn.lock and i18n ([\matrix-org#7476](matrix-org#7476)). Fixes element-hq/element-web#20426 and element-hq/element-web#20423. * Don't send typing notification when restoring composer draft ([\matrix-org#7477](matrix-org#7477)). Fixes element-hq/element-web#20424. * Fix room joining spinner being incorrect if you change room mid-join ([\matrix-org#7473](matrix-org#7473)). * Only return the approved widget capabilities instead of accepting all requested capabilities ([\matrix-org#7454](matrix-org#7454)). Contributed by @dhenneke. * Fix quoting messages from the search view ([\matrix-org#7466](matrix-org#7466)). Fixes element-hq/element-web#20353. * Attribute fallback i18n strings with lang attribute ([\matrix-org#7323](matrix-org#7323)). * Fix spotlight cmd-k wrongly expanding left panel ([\matrix-org#7463](matrix-org#7463)). Fixes element-hq/element-web#20399. * Fix room_id check when adding user widgets ([\matrix-org#7448](matrix-org#7448)). Fixes element-hq/element-web#19382. Contributed by @bink. * Add new line in settings label ([\matrix-org#7451](matrix-org#7451)). Fixes element-hq/element-web#20365. * Fix handling incoming redactions in EventIndex ([\matrix-org#7443](matrix-org#7443)). Fixes element-hq/element-web#19326. * Fix room alias address isn't checked for validity before being shown as added ([\matrix-org#7107](matrix-org#7107)). Fixes element-hq/element-web#19609. Contributed by @Palid. * Call view accessibility fixes ([\matrix-org#7439](matrix-org#7439)). Fixes element-hq/element-web#18516. * Fix offscreen canvas breaking with split-brained firefox support ([\matrix-org#7440](matrix-org#7440)). * Removed red shield in forwarding preview. ([\matrix-org#7447](matrix-org#7447)). Contributed by @ankur12-1610. * Wrap status message ([\matrix-org#7325](matrix-org#7325)). Fixes element-hq/element-web#20092. Contributed by @SimonBrandner. * Move hideSender logic into state so it causes re-render ([\matrix-org#7413](matrix-org#7413)). Fixes element-hq/element-web#18448. * Fix dialpad positioning ([\matrix-org#7446](matrix-org#7446)). Fixes element-hq/element-web#20175. Contributed by @SimonBrandner. * Hide non-functional list options on Suggested sublist ([\matrix-org#7410](matrix-org#7410)). Fixes element-hq/element-web#20252. * Fix width overflow in mini composer overflow menu ([\matrix-org#7411](matrix-org#7411)). Fixes element-hq/element-web#20263. * Fix being wrongly sent to Home space when creating/joining/leaving rooms ([\matrix-org#7418](matrix-org#7418)). Fixes matrix-org/element-web-rageshakes#7331 element-hq/element-web#20246 and element-hq/element-web#20240. * Fix HTML Export where the data-mx-theme is `Light` not `light` ([\matrix-org#7415](matrix-org#7415)). * Don't disable username/password fields whilst doing wk-lookup ([\matrix-org#7438](matrix-org#7438)). Fixes element-hq/element-web#20121. * Prevent keyboard propagation out of context menus ([\matrix-org#7437](matrix-org#7437)). Fixes element-hq/element-web#20317. * Fix nulls leaking into geo urls ([\matrix-org#7433](matrix-org#7433)). * Fix zIndex of peristent apps in miniMode ([\matrix-org#7429](matrix-org#7429)). * Space panel should watch spaces for space name changes ([\matrix-org#7432](matrix-org#7432)). * Fix list formatting alternating on edit ([\matrix-org#7422](matrix-org#7422)). Fixes element-hq/element-web#20073. Contributed by @renancleyson-dev. * Don't show `Testing small changes` without UIFeature.Feedback ([\matrix-org#7427](matrix-org#7427)). Fixes element-hq/element-web#20298. * Fix invisible toggle space panel button ([\matrix-org#7426](matrix-org#7426)). Fixes element-hq/element-web#20279. * Fix legacy breadcrumbs wrongly showing up ([\matrix-org#7425](matrix-org#7425)). * Space Panel use SettingsStore instead of SpaceStore as source of truth ([\matrix-org#7404](matrix-org#7404)). Fixes element-hq/element-web#20250. * Fix inline code block nowrap issue ([\matrix-org#7406](matrix-org#7406)). * Fix notification badge for All Rooms space ([\matrix-org#7401](matrix-org#7401)). Fixes element-hq/element-web#20229. * Show error if could not load space hierarchy ([\matrix-org#7399](matrix-org#7399)). Fixes element-hq/element-web#20221. * Increase gap between ELS and the subsequent event to prevent overlap ([\matrix-org#7391](matrix-org#7391)). Fixes element-hq/element-web#18319. * Fix list of members in space preview ([\matrix-org#7356](matrix-org#7356)). Fixes element-hq/element-web#19781. * Fix sizing of e2e shield in bubble layout ([\matrix-org#7394](matrix-org#7394)). Fixes element-hq/element-web#19090. * Fix bubble radius wrong when followed by a state event from same user ([\matrix-org#7393](matrix-org#7393)). Fixes element-hq/element-web#18982. * Fix alignment between ELS and Events in bubble layout ([\matrix-org#7392](matrix-org#7392)). Fixes element-hq/element-web#19652 and element-hq/element-web#19057. * Don't include the accuracy parameter in location events if accuracy could not be determined. ([\matrix-org#7375](matrix-org#7375)). * Make compact layout only apply to Modern layout ([\matrix-org#7382](matrix-org#7382)). Fixes element-hq/element-web#18412. * Pin qrcode to fix e2e verification bug ([\matrix-org#7378](matrix-org#7378)). Fixes element-hq/element-web#20188. * Add internationalisation to progress strings in room export dialog ([\matrix-org#7385](matrix-org#7385)). Fixes element-hq/element-web#20208. * Prevent escape to cancel edit from also scrolling to bottom ([\matrix-org#7380](matrix-org#7380)). Fixes element-hq/element-web#20182. * Fix narrow mode composer buttons for polls labs ([\matrix-org#7386](matrix-org#7386)). Fixes element-hq/element-web#20067. * Fix useUserStatusMessage exploding on unknown user ([\matrix-org#7365](matrix-org#7365)). * Fix room join spinner in room list header ([\matrix-org#7364](matrix-org#7364)). Fixes element-hq/element-web#20139. * Fix room search sometimes not opening spotlight ([\matrix-org#7363](matrix-org#7363)). Fixes matrix-org/element-web-rageshakes#7288.
2 parents 755e043 + 0b83dfc commit 7e2e1b6

File tree

321 files changed

+10689
-3927
lines changed

Some content is hidden

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

321 files changed

+10689
-3927
lines changed

.eslintrc.js

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
module.exports = {
2-
plugins: ["matrix-org"],
2+
plugins: [
3+
"matrix-org",
4+
],
35
extends: [
46
"plugin:matrix-org/babel",
57
"plugin:matrix-org/react",
8+
"plugin:matrix-org/a11y",
69
],
710
env: {
811
browser: true,
@@ -36,6 +39,24 @@ module.exports = {
3639
"Use Media helper instead to centralise access for customisation.",
3740
),
3841
],
42+
43+
// There are too many a11y violations to fix at once
44+
// Turn violated rules off until they are fixed
45+
"jsx-a11y/alt-text": "off",
46+
"jsx-a11y/aria-activedescendant-has-tabindex": "off",
47+
"jsx-a11y/click-events-have-key-events": "off",
48+
"jsx-a11y/iframe-has-title": "off",
49+
"jsx-a11y/interactive-supports-focus": "off",
50+
"jsx-a11y/label-has-associated-control": "off",
51+
"jsx-a11y/media-has-caption": "off",
52+
"jsx-a11y/mouse-events-have-key-events": "off",
53+
"jsx-a11y/no-autofocus": "off",
54+
"jsx-a11y/no-noninteractive-element-interactions": "off",
55+
"jsx-a11y/no-noninteractive-element-to-interactive-role": "off",
56+
"jsx-a11y/no-noninteractive-tabindex": "off",
57+
"jsx-a11y/no-static-element-interactions": "off",
58+
"jsx-a11y/role-supports-aria-props": "off",
59+
"jsx-a11y/tabindex-no-positive": "off",
3960
},
4061
overrides: [{
4162
files: [

CHANGELOG.md

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

__mocks__/browser-request.js

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
const en = require("../src/i18n/strings/en_EN");
22
const de = require("../src/i18n/strings/de_DE");
3+
const lv = {
4+
"Save": "Saglabāt",
5+
"Uploading %(filename)s and %(count)s others|one": "Качване на %(filename)s и %(count)s друг",
6+
};
37

48
// Mock the browser-request for the languageHandler tests to return
5-
// Fake languages.json containing references to en_EN and de_DE
9+
// Fake languages.json containing references to en_EN, de_DE and lv
610
// en_EN.json
711
// de_DE.json
12+
// lv.json - mock version with few translations, used to test fallback translation
813
module.exports = jest.fn((opts, cb) => {
914
const url = opts.url || opts.uri;
1015
if (url && url.endsWith("languages.json")) {
@@ -17,11 +22,17 @@ module.exports = jest.fn((opts, cb) => {
1722
"fileName": "de_DE.json",
1823
"label": "German",
1924
},
25+
"lv": {
26+
"fileName": "lv.json",
27+
"label": "Latvian"
28+
}
2029
}));
2130
} else if (url && url.endsWith("en_EN.json")) {
2231
cb(undefined, {status: 200}, JSON.stringify(en));
2332
} else if (url && url.endsWith("de_DE.json")) {
2433
cb(undefined, {status: 200}, JSON.stringify(de));
34+
} else if (url && url.endsWith("lv.json")) {
35+
cb(undefined, {status: 200}, JSON.stringify(lv));
2536
} else {
2637
cb(true, {status: 404}, "");
2738
}

package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "matrix-react-sdk",
3-
"version": "3.37.0",
3+
"version": "3.38.0",
44
"description": "SDK for matrix.org using React",
55
"author": "matrix.org",
66
"repository": {
@@ -71,7 +71,6 @@
7171
"emojibase-data": "^6.2.0",
7272
"emojibase-regex": "^5.1.3",
7373
"escape-html": "^1.0.3",
74-
"eslint-plugin-import": "^2.25.2",
7574
"file-saver": "^2.0.5",
7675
"filesize": "6.1.0",
7776
"flux": "2.1.1",
@@ -87,7 +86,7 @@
8786
"lodash": "^4.17.20",
8887
"maplibre-gl": "^1.15.2",
8988
"matrix-analytics-events": "https://github.com/matrix-org/matrix-analytics-events.git#1eab4356548c97722a183912fda1ceabbe8cc7c1",
90-
"matrix-js-sdk": "15.3.0",
89+
"matrix-js-sdk": "15.4.0",
9190
"matrix-widget-api": "^0.1.0-beta.18",
9291
"minimist": "^1.2.5",
9392
"opus-recorder": "^8.0.3",
@@ -166,7 +165,9 @@
166165
"enzyme-to-json": "^3.6.2",
167166
"eslint": "7.18.0",
168167
"eslint-config-google": "^0.14.0",
169-
"eslint-plugin-matrix-org": "github:matrix-org/eslint-plugin-matrix-org#48ec1e6af2cfb8310b9a6e23edf2dc7a26ddd580",
168+
"eslint-plugin-import": "^2.25.4",
169+
"eslint-plugin-jsx-a11y": "^6.5.1",
170+
"eslint-plugin-matrix-org": "^0.4.0",
170171
"eslint-plugin-react": "^7.22.0",
171172
"eslint-plugin-react-hooks": "^4.2.0",
172173
"glob": "^7.1.6",

res/css/_common.scss

Lines changed: 35 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -356,6 +356,7 @@ legend {
356356

357357
.mx_Dialog_header {
358358
position: relative;
359+
padding: 3px 0;
359360
margin-bottom: 10px;
360361
}
361362

@@ -365,20 +366,21 @@ legend {
365366
height: 25px;
366367
margin-left: -2px;
367368
margin-right: 4px;
369+
margin-bottom: 2px;
368370
}
369371

370372
.mx_Dialog_title {
371-
font-size: $font-22px;
372-
font-weight: $font-semi-bold;
373-
line-height: $font-36px;
374373
color: $dialog-title-fg-color;
374+
display: inline-block;
375+
width: 100%;
376+
box-sizing: border-box;
375377
}
376378

377379
.mx_Dialog_header.mx_Dialog_headerWithButton > .mx_Dialog_title {
378380
text-align: center;
379381
}
380-
.mx_Dialog_header.mx_Dialog_headerWithCancel > .mx_Dialog_title {
381-
margin-right: 20px; // leave space for the 'X' cancel button
382+
.mx_Dialog_header.mx_Dialog_headerWithCancel {
383+
padding-right: 20px; // leave space for the 'X' cancel button
382384
}
383385

384386
.mx_Dialog_title.danger {
@@ -421,10 +423,13 @@ legend {
421423
* in the app look the same by being AccessibleButtons, or possibly by having explict button classes.
422424
* We should go through and have one consistent set of styles for buttons throughout the app.
423425
* For now, I am duplicating the selectors here for mx_Dialog and mx_DialogButtons.
426+
*
427+
* Elements that should not be styled like a dialog button are mentioned in a :not() pseudo-class.
428+
* For the widest browser support, we use multiple :not pseudo-classes instead of :not(.a, .b).
424429
*/
425-
.mx_Dialog button:not(.mx_Dialog_nonDialogButton),
430+
.mx_Dialog button:not(.mx_Dialog_nonDialogButton):not(.maplibregl-ctrl-attrib-button):not(.mx_AccessibleButton),
426431
.mx_Dialog input[type="submit"],
427-
.mx_Dialog_buttons button:not(.mx_Dialog_nonDialogButton),
432+
.mx_Dialog_buttons button:not(.mx_Dialog_nonDialogButton):not(.mx_AccessibleButton),
428433
.mx_Dialog_buttons input[type="submit"] {
429434
@mixin mx_DialogButton;
430435
margin-left: 0px;
@@ -439,25 +444,25 @@ legend {
439444
font-family: inherit;
440445
}
441446

442-
.mx_Dialog button:not(.mx_Dialog_nonDialogButton):last-child {
447+
.mx_Dialog button:not(.mx_Dialog_nonDialogButton):not(.maplibregl-ctrl-attrib-button):not(.mx_AccessibleButton):last-child {
443448
margin-right: 0px;
444449
}
445450

446-
.mx_Dialog button:not(.mx_Dialog_nonDialogButton):hover,
451+
.mx_Dialog button:not(.mx_Dialog_nonDialogButton):not(.maplibregl-ctrl-attrib-button):not(.mx_AccessibleButton):hover,
447452
.mx_Dialog input[type="submit"]:hover,
448-
.mx_Dialog_buttons button:not(.mx_Dialog_nonDialogButton):hover,
453+
.mx_Dialog_buttons button:not(.mx_Dialog_nonDialogButton):not(.mx_AccessibleButton):hover,
449454
.mx_Dialog_buttons input[type="submit"]:hover {
450455
@mixin mx_DialogButton_hover;
451456
}
452457

453-
.mx_Dialog button:not(.mx_Dialog_nonDialogButton):focus,
458+
.mx_Dialog button:not(.mx_Dialog_nonDialogButton):not(.maplibregl-ctrl-attrib-button):not(.mx_AccessibleButton):focus,
454459
.mx_Dialog input[type="submit"]:focus,
455-
.mx_Dialog_buttons button:not(.mx_Dialog_nonDialogButton):focus,
460+
.mx_Dialog_buttons button:not(.mx_Dialog_nonDialogButton):not(.mx_AccessibleButton):focus,
456461
.mx_Dialog_buttons input[type="submit"]:focus {
457462
filter: brightness($focus-brightness);
458463
}
459464

460-
.mx_Dialog button.mx_Dialog_primary,
465+
.mx_Dialog button.mx_Dialog_primary:not(.mx_Dialog_nonDialogButton):not(.maplibregl-ctrl-attrib-button),
461466
.mx_Dialog input[type="submit"].mx_Dialog_primary,
462467
.mx_Dialog_buttons button.mx_Dialog_primary,
463468
.mx_Dialog_buttons input[type="submit"].mx_Dialog_primary {
@@ -466,7 +471,7 @@ legend {
466471
min-width: 156px;
467472
}
468473

469-
.mx_Dialog button.danger,
474+
.mx_Dialog button.danger:not(.mx_Dialog_nonDialogButton):not(.maplibregl-ctrl-attrib-button),
470475
.mx_Dialog input[type="submit"].danger,
471476
.mx_Dialog_buttons button.danger,
472477
.mx_Dialog_buttons input[type="submit"].danger {
@@ -475,15 +480,15 @@ legend {
475480
color: $accent-fg-color;
476481
}
477482

478-
.mx_Dialog button.warning,
483+
.mx_Dialog button.warning:not(.mx_Dialog_nonDialogButton):not(.maplibregl-ctrl-attrib-button),
479484
.mx_Dialog input[type="submit"].warning {
480485
border: solid 1px $alert;
481486
color: $alert;
482487
}
483488

484-
.mx_Dialog button:not(.mx_Dialog_nonDialogButton):disabled,
489+
.mx_Dialog button:not(.mx_Dialog_nonDialogButton):not(.maplibregl-ctrl-attrib-button):not(.mx_AccessibleButton):disabled,
485490
.mx_Dialog input[type="submit"]:disabled,
486-
.mx_Dialog_buttons button:not(.mx_Dialog_nonDialogButton):disabled,
491+
.mx_Dialog_buttons button:not(.mx_Dialog_nonDialogButton):not(.mx_AccessibleButton):disabled,
487492
.mx_Dialog_buttons input[type="submit"]:disabled {
488493
background-color: $light-fg-color;
489494
border: solid 1px $light-fg-color;
@@ -494,7 +499,7 @@ legend {
494499
.mx_Dialog_wrapper.mx_Dialog_spinner .mx_Dialog {
495500
width: auto;
496501
border-radius: $border-radius-8px;
497-
padding: 0px;
502+
padding: 8px;
498503
box-shadow: none;
499504

500505
/* Don't show scroll-bars on spinner dialogs */
@@ -686,3 +691,15 @@ legend {
686691
outline-style: auto;
687692
}
688693
}
694+
695+
@define-mixin ButtonResetDefault {
696+
appearance: none;
697+
background: none;
698+
border: none;
699+
padding: 0;
700+
margin: 0;
701+
font-size: inherit;
702+
font-family: inherit;
703+
line-height: inherit;
704+
cursor: pointer;
705+
}

res/css/_components.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
@import "./_common.scss";
44
@import "./_font-sizes.scss";
55
@import "./_font-weights.scss";
6+
@import "./_spacing.scss";
67
@import "./structures/_AutoHideScrollbar.scss";
78
@import "./structures/_BackdropPanel.scss";
89
@import "./structures/_CompatibilityPage.scss";
@@ -96,6 +97,7 @@
9697
@import "./views/dialogs/_JoinRuleDropdown.scss";
9798
@import "./views/dialogs/_KeyboardShortcutsDialog.scss";
9899
@import "./views/dialogs/_LeaveSpaceDialog.scss";
100+
@import "./views/dialogs/_LocationViewDialog.scss";
99101
@import "./views/dialogs/_ManageRestrictedJoinRuleDialog.scss";
100102
@import "./views/dialogs/_MessageEditHistoryDialog.scss";
101103
@import "./views/dialogs/_ModalWidgetDialog.scss";
@@ -112,6 +114,7 @@
112114
@import "./views/dialogs/_SettingsDialog.scss";
113115
@import "./views/dialogs/_ShareDialog.scss";
114116
@import "./views/dialogs/_SlashCommandHelpDialog.scss";
117+
@import "./views/dialogs/_SpacePreferencesDialog.scss";
115118
@import "./views/dialogs/_SpaceSettingsDialog.scss";
116119
@import "./views/dialogs/_SpotlightDialog.scss";
117120
@import "./views/dialogs/_TabbedIntegrationManagerDialog.scss";
@@ -299,6 +302,7 @@
299302
@import "./views/toasts/_AnalyticsToast.scss";
300303
@import "./views/toasts/_IncomingCallToast.scss";
301304
@import "./views/toasts/_NonUrgentEchoFailureToast.scss";
305+
@import "./views/typography/_Heading.scss";
302306
@import "./views/verification/_VerificationShowSas.scss";
303307
@import "./views/voip/CallView/_CallViewButtons.scss";
304308
@import "./views/voip/_CallContainer.scss";
Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2020 The Matrix.org Foundation C.I.C.
2+
Copyright 2022 The Matrix.org Foundation C.I.C.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
@@ -14,14 +14,14 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
import { ActionPayload } from "../payloads";
18-
import { Action } from "../actions";
17+
// 1rem :: 10px
1918

20-
export interface ToggleRightPanelPayload extends ActionPayload {
21-
action: Action.ToggleRightPanel;
22-
23-
/**
24-
* The type of room that the panel is toggled in.
25-
*/
26-
type: "group" | "room";
27-
}
19+
$spacing-4: 4px;
20+
$spacing-8: 8px;
21+
$spacing-12: 12px;
22+
$spacing-16: 16px;
23+
$spacing-20: 20px;
24+
$spacing-24: 24px;
25+
$spacing-28: 28px;
26+
$spacing-32: 32px;
27+
$spacing-40: 40px;

res/css/structures/_SpaceHierarchy.scss

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -15,35 +15,6 @@ limitations under the License.
1515
*/
1616

1717
.mx_SpaceRoomView_landing {
18-
.mx_Dialog_title {
19-
display: flex;
20-
21-
.mx_BaseAvatar {
22-
margin-right: 12px;
23-
align-self: center;
24-
}
25-
26-
.mx_BaseAvatar_image {
27-
border-radius: 8px;
28-
}
29-
30-
> div {
31-
> h1 {
32-
font-weight: $font-semi-bold;
33-
font-size: $font-18px;
34-
line-height: $font-22px;
35-
margin: 0;
36-
}
37-
38-
> div {
39-
font-weight: 400;
40-
color: $secondary-content;
41-
font-size: $font-15px;
42-
line-height: $font-24px;
43-
}
44-
}
45-
}
46-
4718
.mx_AccessibleButton_kind_link {
4819
padding: 0;
4920
font-size: inherit;
@@ -249,7 +220,7 @@ limitations under the License.
249220
line-height: $font-18px;
250221
color: $secondary-content;
251222
grid-row: 2;
252-
grid-column: 1/3;
223+
grid-column: 2/3;
253224
display: -webkit-box;
254225
-webkit-box-orient: vertical;
255226
-webkit-line-clamp: 2;

res/css/structures/_SpacePanel.scss

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ $activeBorderColor: $primary-content;
7171
}
7272

7373
&:hover .mx_SpacePanel_toggleCollapse {
74-
opacity: 100%;
74+
opacity: 1;
7575
}
7676

7777
ul {
@@ -411,6 +411,10 @@ $activeBorderColor: $primary-content;
411411
mask-image: url('$(res)/img/element-icons/roomlist/search.svg');
412412
}
413413

414+
.mx_SpacePanel_iconPreferences::before {
415+
mask-image: url('$(res)/img/element-icons/settings/preference.svg');
416+
}
417+
414418
.mx_SpacePanel_noIcon {
415419
display: none;
416420

res/css/structures/_SpaceRoomView.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,10 @@ $SpaceRoomViewInnerWidth: 428px;
254254
flex-direction: column;
255255
min-width: 0;
256256

257+
> .mx_BaseAvatar {
258+
width: 80px;
259+
}
260+
257261
> .mx_BaseAvatar_image,
258262
> .mx_BaseAvatar > .mx_BaseAvatar_image {
259263
border-radius: 12px;

0 commit comments

Comments
 (0)