Commit graph

3841 commits

Author SHA1 Message Date
Šimon Brandner
aad4e6f312
$voice-playback-button-bg-color -> $system
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-16 20:29:03 +02:00
Šimon Brandner
707f0c6bc9
$voice-playback-button-fg-color -> $secondary-content
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-16 20:28:01 +02:00
Šimon Brandner
ee7c126596
$groupFilterPanel-divider-color -> $tertiary-content
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-16 20:21:27 +02:00
Šimon Brandner
0794be1e98
$notice-secondary-color -> $tertiary-content
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-16 20:21:27 +02:00
Šimon Brandner
ca6ed64811
$roomlist-header-color -> $tertiary-content
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-16 20:21:26 +02:00
Šimon Brandner
79efd61b66
$roomsublist-divider-color -> $primary-content
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-16 20:21:26 +02:00
Šimon Brandner
36531be8ca
$roomtile-preview-color -> $secondary-content
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-16 20:21:26 +02:00
Šimon Brandner
1691127ad2
$field-focused-label-bg-color -> $background
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-16 20:21:20 +02:00
CicadaCinema
7b893366f2 Add spacing to Room settings - Notifications subsection 2021-10-16 14:52:29 +01:00
Germain Souquet
5a7c0d87b6 Rename ReplyThread to ReplyChain to avoid confusion with m.thread 2021-10-15 17:42:44 +01:00
Andy Balaam
0941b38b5d Name CryptographyPanel CSS classes consistent with style 2021-10-15 16:09:36 +01:00
David Baker
4fb0d021ae
Merge pull request #6897 from SimonBrandner/task/colors-4
Color de-duplication #4
2021-10-15 16:07:07 +01:00
Andy Balaam
a547ee4654 Break 'Cryptography' settings into a separate component 2021-10-15 16:02:44 +01:00
Faye Duxovni
1b7277b8f0
Merge pull request #6943 from matrix-org/fayed/emoji-compare-buttons
Update the button styling on the emoji comparison dialog during cross-signing
2021-10-15 10:34:25 -04:00
Šimon Brandner
0a6e78fd38
Merge remote-tracking branch 'upstream/develop' into task/colors-4 2021-10-15 16:23:40 +02:00
Dariusz Niemczyk
f8c516d927
Add new thread message preview (#18958) (#6953)
Closes https://github.com/vector-im/element-web/issues/18958
2021-10-15 14:29:17 +01:00
Šimon Brandner
71eeb836d9
Merge remote-tracking branch 'upstream/develop' into task/colors-4
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-15 15:23:32 +02:00
Andy Balaam
690893ea6b Merge duplicate CSS selectors 2021-10-15 13:32:39 +01:00
Andy Balaam
7edec291ac Switch DevicesPanel to use table (for screen readers) 2021-10-15 11:50:49 +01:00
Dariusz Niemczyk
562a880c7d
Create room threads list view (#6904)
Implement https://github.com/vector-im/element-web/issues/18957 following requirements:
* Create a new right panel view to list all the threads in a given room.
* Change ThreadView previous phase to be ThreadPanel rather than RoomSummary
* Implement local filters for My and All threads

In addition: 
* Create a new TileShape for proper rendering requirements (hiding typing indicator)
* Create new timelineRenderingType for proper rendering requirements
2021-10-14 15:27:35 +02:00
Michael Telatynski
4118d13846
Merge pull request #6829 from matrix-org/t3chguy/fix/18969 2021-10-14 09:59:34 +01:00
Michael Telatynski
2a3c483f96
Merge pull request #6919 from matrix-org/t3chguy/fix/19146 2021-10-14 09:58:19 +01:00
Faye Duxovni
8f10a1d3fb Update the button styling on the emoji comparison dialog during cross-signing
Signed-off-by: Faye Duxovni <fayed@element.io>
2021-10-14 00:46:15 -04:00
Travis Ralston
ea7257698c
Merge pull request #6934 from matrix-org/travis/labs/polls
Add feature flag for polls and placeholder dialog
2021-10-13 11:28:53 -06:00
Andy Balaam
4e9a20db21 Move the required CSS for DevicesPanel into its own scss file
Signed-off-by: Andy Balaam <andyb@element.io>
2021-10-13 13:55:01 +01:00
Travis Ralston
71c5b02390 Add feature flag for polls and placeholder dialog
We're anticipating development of polls soon, so for efficiency reasons we're getting the labs flag in early. If something goes wrong with the plan, this whole change will be reverted.
2021-10-12 15:13:56 -06:00
Michael Telatynski
4416212d0b
Merge pull request #6926 from matrix-org/t3chguy/fix/18231 2021-10-12 14:03:12 +01:00
Michael Telatynski
d050c00703 Fix room list skeleton ui for narrow room list 2021-10-12 10:30:36 +01:00
Michael Telatynski
e54d803343 Tweak skeleton UI height to be more reasonable 2021-10-11 10:50:33 +01:00
Michael Telatynski
0d524ae70b Iterate invite your teammates to Space view 2021-10-11 10:43:37 +01:00
rom4nik
436996dc30
Prevent backdrop image from being selected 2021-10-11 02:21:09 +02:00
Oliver Pham
0fe133c14f
Merge branch 'matrix-org:develop' into issue-19180 2021-10-10 11:41:21 -04:00
Michael Telatynski
111ae75874 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18969
 Conflicts:
	src/components/views/right_panel/UserInfo.tsx
2021-10-08 13:00:20 +01:00
James Salter
e1c1d2dc0f
Merge pull request #6840 from wlach/make-placeholder-for-field-grey-no-input
Make placeholder more grey when no input
2021-10-08 12:54:57 +01:00
Michael Telatynski
2483f1dc90 Add progress bar to restricted room upgrade dialog 2021-10-08 12:20:43 +01:00
Germain Souquet
822f73edf7 Remove stale comments in _RoomSublist.scss 2021-10-07 17:28:37 +01:00
Germain
57b919b10a
Delete fixed headerContainer height
Co-authored-by: Travis Ralston <travisr@matrix.org>
2021-10-07 16:51:39 +01:00
Germain Souquet
c009d15176 Allow the header container to collapse on itself when room list not minimised 2021-10-07 10:57:23 +01:00
Michael Telatynski
1d5a1c7a82
Merge pull request #6887 from matrix-org/t3chguy/fix/19216 2021-10-06 09:29:25 +01:00
Oliver Pham
ab835c0e0d
Merge branch 'matrix-org:develop' into issue-19180 2021-10-05 10:15:11 -04:00
Phu Thong Pham
70106f979e Fix text overflows button on Home page 2021-10-05 10:11:25 -04:00
Faye Duxovni
651e943b31 Merge branch 'develop' into fayed/fix-verification-dialog 2021-10-05 08:48:52 -04:00
Faye Duxovni
9a16b4636f Make cross-signing dialog clearer and more context-aware
- Don't show loading spinners while waiting for user action
- When checking if there are other devices we can verify against, only
  look for devices that are actually cross-signed.
- Adjust displayed options depending on whether other devices and/or
  recovery keys exist, and add an option to reset cross-signing keys
  if necessary.
- Various minor clarifying adjustments to UI styling/text

Signed-off-by: Faye Duxovni <fayed@element.io>
2021-10-05 00:54:20 -04:00
ColonisationCaptain
a076bee764 Decrease profile button touch target 2021-10-03 19:51:46 +01:00
Šimon Brandner
14466b1e3b
$settings-profile-placeholder-bg-color -> $system
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-01 20:43:46 +02:00
Šimon Brandner
8a9c493f3a
Use correct color for a selected room in the
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-01 20:40:18 +02:00
Dariusz Niemczyk
17f59131d8
Merge pull request #6868 from SimonBrandner/task/colors-3-mk2
Color clean-up #3 mk2
2021-10-01 11:04:15 +02:00
Jaiwanth
1e90043eb3 Change colour variable for export dialog subheading 2021-09-30 20:58:03 +05:30
Michael Telatynski
8ac77c498f Add progress bar to Community to Space migration tool
and invite-one-by-one to workaround Synapse ratelimits
2021-09-30 13:43:59 +01:00
Jaiwanth
208b914cb0 Merge branch 'develop' into export-conversations 2021-09-29 19:32:05 +05:30
Michael Telatynski
399ceaf002
Merge pull request #6879 from matrix-org/t3chguy/fix/19164 2021-09-29 10:05:43 +01:00
Michael Telatynski
02c5b7e28d Pluck out some more applicable styles 2021-09-28 16:36:25 +01:00
Michael Telatynski
4335cd03c5 Pluck out JoinRuleSettings styles so they apply in space settings too 2021-09-28 16:30:17 +01:00
Michael Telatynski
0f8069ac35 Switch ConfirmUserActionDialog over to using a Field 2021-09-28 16:22:27 +01:00
Michael Telatynski
2ac2358d93 Fix avatar getting chopped off 2021-09-28 16:22:05 +01:00
Michael Telatynski
207a1143fc Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18969 2021-09-28 15:45:09 +01:00
Michael Telatynski
ba8ec1763b Fix space panel width mismatch for creation modal shade 2021-09-28 11:05:03 +01:00
Travis Ralston
77ad0a9142
Merge pull request #6699 from SimonBrandner/fix/improve-aux-panel/18787
Improve AUX panel behaviour
2021-09-27 10:16:05 -06:00
Germain
8c9cd0d2f4
Merge pull request #6865 from robintown/cut-off-pills 2021-09-27 16:39:04 +01:00
Dariusz Niemczyk
0cfa2a58c7
Add ability to expand and collapse long quoted messages (#6701)
In case where we had a very long message the experience of going between 
messages to see the full quote isn't very nice on desktop, therefore this commit
adds a button with additional hotkey to normalize the experience a bit.

Fixes https://github.com/vector-im/element-web/issues/18884
2021-09-27 12:20:37 +02:00
Michael Telatynski
6d0af83df4 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18969
 Conflicts:
	src/components/views/dialogs/LeaveSpaceDialog.tsx
	src/i18n/strings/en_EN.json
2021-09-27 11:19:49 +01:00
Šimon Brandner
71d1196692
Get rid of message-body-panel colors
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-27 09:04:51 +02:00
Šimon Brandner
02d42244a8
$user-tile-hover-bg-color -> $header-panel-bg-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-27 09:02:09 +02:00
Šimon Brandner
42d332ce41
Fix Toast container color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-27 08:59:33 +02:00
Robin Townsend
b08e05ebe7 Fix pills being cut off in message bubble layout
Signed-off-by: Robin Townsend <robin@robin.town>
2021-09-26 10:24:46 -04:00
Germain Souquet
bb7319f632 move timestamp to the right in thread's context 2021-09-24 11:44:11 +01:00
Jaiwanth
d1e3d35d40 Change export bundle filename format, light theme for all exports and import jszip after export cta 2021-09-22 22:17:23 +05:30
Jaiwanth
94e4fb71c1 Merge branch 'develop' into export-conversations 2021-09-22 18:07:01 +05:30
Germain Souquet
dc979a33a1 Fix spacing for message composer buttons 2021-09-22 11:55:25 +01:00
Šimon Brandner
b2c0f57c4b
More prefers-reduced-motion friendliness
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-21 17:59:13 +02:00
Šimon Brandner
afdec1971f
Handle prefers-reduced-motion
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-21 17:42:23 +02:00
Šimon Brandner
7022ab4f8a
Merge remote-tracking branch 'upstream/develop' into feature/image-view-load-anim/18186 2021-09-21 17:36:26 +02:00
Šimon Brandner
499b470d07
Use CSS var in JS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-21 17:36:16 +02:00
J. Ryan Stinnett
7071092fa4
Merge pull request #5555 from 2580ayush2580/ayush25802
Improve room directory UX for mobile devices
2021-09-21 11:44:07 +01:00
William Lachance
b257393d74 Make placeholder more grey when no input (fixes #17243)
The placeholder is actually the label in this case.
2021-09-19 07:48:35 -04:00
Michael Telatynski
1858c63c4a Allow options to cascade kicks/bans throughout spaces 2021-09-17 15:34:49 +01:00
Michael Telatynski
e17318a364 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 2021-09-16 10:05:20 +01:00
Travis Ralston
30972c597d
Merge pull request #6777 from robintown/room-list-scroll-jumps
Fix room list scroll jumps
2021-09-14 13:40:20 -06:00
Travis Ralston
fdb004b4e8
Merge pull request #6785 from robintown/message-bubble-misc
Fix various message bubble alignment issues
2021-09-14 13:26:03 -06:00
Travis Ralston
c3ad978941
Merge pull request #6795 from robintown/message-bubble-font-size
Make message bubble font size consistent
2021-09-14 13:25:28 -06:00
Robin Townsend
9b3da61ae4 Remove unnecessary unset
Signed-off-by: Robin Townsend <robin@robin.town>
2021-09-14 12:37:45 -04:00
Robin Townsend
8824b12064 Fix alignment of sender name in message bubble replies
Signed-off-by: Robin Townsend <robin@robin.town>
2021-09-14 12:35:51 -04:00
Šimon Brandner
8e3be15365
Move animations into _animations
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-14 18:05:15 +02:00
Robin Townsend
2c0835ed9b Add comments to message bubble magic numbers
Signed-off-by: Robin Townsend <robin@robin.town>
2021-09-14 11:27:03 -04:00
Robin Townsend
35171ccd23 Merge branch 'develop' into message-bubble-misc 2021-09-14 11:00:55 -04:00
Michael Telatynski
6672be91a1 Simplify Space Panel layout 2021-09-14 15:00:44 +01:00
Dariusz Niemczyk
42a1048fde
Merge pull request #6794 from matrix-org/palid/fix/18997
Fix autocomplete not having y-scroll
2021-09-14 14:53:06 +02:00
Dariusz Niemczyk
527e1eb462
Fix autocomplete not having y-scroll
After changing flex-order the children did not have a max-height which
ended up in the child growing to outside of the screen instead of
being properly constrained.

Fix https://github.com/vector-im/element-web/issues/18997
2021-09-14 14:45:47 +02:00
Robin Townsend
465ce0820d Make message bubble font size consistent
Signed-off-by: Robin Townsend <robin@robin.town>
2021-09-13 23:32:01 -04:00
Robin Townsend
8099791b32 Fix various message bubble alignment issues
Signed-off-by: Robin Townsend <robin@robin.town>
2021-09-11 11:43:36 -04:00
Šimon Brandner
1a128c3a00
Merge remote-tracking branch 'upstream/develop' into feature/image-view-load-anim/18186
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-11 15:32:44 +02:00
Eric Eastwood
049040b67d Optimize input label transition on focus
Fix https://github.com/vector-im/element-web/issues/12876
2021-09-11 02:03:55 -05:00
Michael Telatynski
80fd960304 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 2021-09-10 09:53:04 +01:00
Robin Townsend
07eafb9e3d Fix room list scroll jumps
Signed-off-by: Robin Townsend <robin@robin.town>
2021-09-09 20:07:51 -04:00
Germain
d475b7f1ea
Merge pull request #6753 from matrix-org/revert-6752-revert-6682-gsouquet/compact-composer-18533 2021-09-09 18:49:38 +01:00
Germain Souquet
aa53444267 Improve narrow composer usability 2021-09-09 13:27:25 +01:00
Michael Telatynski
82cd7acdae Use cursor:pointer on space panel buttons 2021-09-09 11:40:43 +01:00
Michael Telatynski
29b4ba6675 Use new SCSS vars 2021-09-08 15:30:19 +01:00
Germain Souquet
bbf66a0011 Make label clickable on narrow mode context menu 2021-09-07 17:10:09 +01:00
Germain Souquet
646ef197fe Fix PR UI defects 2021-09-07 16:02:26 +01:00
Travis Ralston
329292eb9b
Revert "Revert "Create narrow mode for Composer"" 2021-09-06 22:11:35 -06:00
Travis Ralston
945181fe39
Revert "Create narrow mode for Composer" 2021-09-06 22:08:50 -06:00
Germain
59de3c96a2
Merge pull request #6682 from matrix-org/gsouquet/compact-composer-18533 2021-09-07 05:07:00 +01:00
Michael Telatynski
a688e5b8b3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088
 Conflicts:
	src/components/structures/LoggedInView.tsx
	src/stores/SpaceStore.tsx
2021-09-06 11:41:09 +01:00
Germain
e7cfa4816e
Merge pull request #6582 from SimonBrandner/fix/bubble-highlight/18295 2021-09-06 09:56:16 +01:00
Dariusz Niemczyk
1e50246a78
Merge pull request #6636 from matrix-org/palid/fix/forgot-password-ux
Make ForgotPassword UX slightly more user friendly
2021-09-06 10:55:25 +02:00
Germain Souquet
997f43cb82 Implement new narrow mode UI 2021-09-03 12:03:19 +01:00
Germain Souquet
e416952c90 Merge branch 'develop' into gsouquet/compact-composer-18533 2021-09-02 08:31:29 +01:00
Travis Ralston
f0cf00433b
Merge pull request #6702 from nordeck/nic/fix/even-tile-preview
Replace fake username in EventTilePreview with a proper loading state
2021-09-01 14:28:12 -06:00
Michael Telatynski
34e9443abc
Merge pull request #6722 from SimonBrandner/fix/autocomplete-dir 2021-09-01 14:45:30 +01:00
Šimon Brandner
4328ee18f5
Show autocomplete sections vertically
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-01 15:37:59 +02:00
Germain
7621a9a0f3
Merge pull request #6658 from matrix-org/gsouquet/threaded-messaging-2349 2021-09-01 08:47:10 +01:00
Steffen Kolmer
9fdc5659b7 Fixed eslint error and copyright header 2021-08-28 13:56:08 +02:00
Steffen Kolmer
d76adde1ab Use scss instead of inline styles 2021-08-28 13:41:24 +02:00
Šimon Brandner
54cd385e6d
Improve AUX panel behaviour
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-27 13:31:43 +02:00
Šimon Brandner
2d47f453cd
Update styling
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-26 16:19:46 +02:00
J. Ryan Stinnett
32ad94bce5
Merge pull request #6692 from matrix-org/jryans/changelog-link-colour
Fix changelog link colour back to blue
2021-08-26 14:46:25 +01:00
Šimon Brandner
e8bf7ac227
Merge remote-tracking branch 'upstream/develop' into fix/bubble-highlight/18295 2021-08-26 15:40:40 +02:00
Šimon Brandner
6003e12e48
Fix color name
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-26 15:12:26 +02:00
Šimon Brandner
408c327943
Merge remote-tracking branch 'upstream/develop' into fix/codeblock-border/18367 2021-08-26 15:11:46 +02:00
Dariusz Niemczyk
fc1dd51046
Fix commit edit history
Fix https://github.com/vector-im/element-web/issues/18742
2021-08-26 15:05:35 +02:00
J. Ryan Stinnett
d013ae79b7 Fix changelog link colour back to blue
https://github.com/matrix-org/matrix-react-sdk/pull/5698 changed all dialog
links to green, which is not expected. In general, we use blue links for
information and green links for actions.

This resolves the regression by removing the general change and adjusting the
new links added by the above PR to be green as desired there.

Fixes https://github.com/vector-im/element-web/issues/18726
2021-08-26 13:59:12 +01:00
Germain Souquet
bd1aa01b67 Update copyright and method accessors 2021-08-26 08:19:44 +01:00
Travis Ralston
aa0a753105
Merge pull request #6681 from SimonBrandner/fix/codeblock-formatting
Fix codeblock formatting with syntax highlighting on
2021-08-25 13:36:47 -06:00
Germain Souquet
2d14be9cef Merge branch 'develop' into gsouquet/compact-composer-18533 2021-08-25 18:07:36 +01:00
Šimon Brandner
9f791031a8
Fix codeblock formatting
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-25 18:54:52 +02:00
Šimon Brandner
ecd45f7a81
Use min-height instead of height
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-25 18:38:36 +02:00
Travis Ralston
dc32df1ba5
Merge pull request #6639 from SimonBrandner/feature/voice-activity
Add active speaker indicators
2021-08-25 09:16:37 -06:00
Germain Souquet
31b3b2e2ed Fix Sticker and Emoji picker opening on narrow mode 2021-08-25 15:39:50 +01:00
Germain Souquet
77a463e679 Merge branch 'develop' into gsouquet/threaded-messaging-2349 2021-08-25 08:53:16 +01:00
Travis Ralston
49453f2d49
Merge pull request #6604 from SimonBrandner/task/colors-2
Color de-duplication #2
2021-08-24 12:37:18 -06:00
Dariusz Niemczyk
a62717ed85
Force a new layer for backdrop panel 2021-08-24 19:23:12 +02:00
Dariusz Niemczyk
4cd79e30af
Improve layering for chat
Currently we have a lot of unnecessary layers being created in the app,
which is extremely problematic on Windows when using Chrome, as it
deoptimises fonts rendering due to layers mismatch; chrome's algorithm
can't figure out if the layers won't resize or overlap so it creates a
lot of additional layers, which has a side effect of turning off
sub-pixel antialiasing on Windows.
This is a first step to improve the layering in the entire app.
2021-08-24 19:22:35 +02:00
Travis Ralston
c2a410c724
Merge pull request #6665 from SimonBrandner/fix/add-button/18706
Add padding to the Add button in the notification settings
2021-08-24 10:06:17 -06:00
Dariusz Niemczyk
1e1fc64769
Fix breadcrumbs overflowing left-panel 2021-08-24 16:06:20 +02:00
Dariusz Niemczyk
a93d5cde09
Simplify rendering to css-only 2021-08-24 14:38:39 +02:00
Dariusz Niemczyk
0746fab09d
Make stylelint happy 2021-08-24 14:23:30 +02:00
Dariusz Niemczyk
a5c005756e
Fix resizer on left panel 2021-08-24 13:05:46 +02:00
Germain Souquet
54a0a869bf PR feedback 2021-08-24 09:09:28 +01:00
Šimon Brandner
751c57ecc2
Add some padding to the Add button
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-24 10:05:24 +02:00
Dariusz Niemczyk
e2c55c61f3
Fix difficult to grab scrollbar
Fixes https://github.com/vector-im/element-web/issues/18689
2021-08-24 09:37:33 +02:00
Šimon Brandner
2920da8b8b
Fix a merge regression
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-24 09:33:16 +02:00
Šimon Brandner
3d9a0286dc
Revert "$avatar-bg-color -> $background"
This reverts commit a3a6f73049.
2021-08-24 09:04:17 +02:00
Šimon Brandner
bf87413442
Revert "$roomlist-header-color -> $tertiary-content"
This reverts commit 25a3a8ddfd.
2021-08-24 09:02:17 +02:00
Šimon Brandner
8aacd968c7
Remove comment
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-24 09:00:49 +02:00
Šimon Brandner
64ed96e09a
Remove line of unknown origin
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-24 08:59:12 +02:00
Šimon Brandner
a5f6a2dd64
Remove comment
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-24 08:57:54 +02:00
Šimon Brandner
b6ea75b681
Merge remote-tracking branch 'upstream/develop' into task/colors-2
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-24 08:57:12 +02:00
Travis Ralston
32343f3382
Merge pull request #5698 from SimonBrandner/public-e2ee-warn
Add a warning on E2EE rooms if you try to make them public
2021-08-23 16:45:47 -06:00
Travis Ralston
15c731d574
Merge pull request #6507 from matrix-org/t3chguy/fix/18089
Allow pagination of the space hierarchy and use new APIs
2021-08-23 15:51:34 -06:00