mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-14 22:01:31 +03:00
Code Issues Projects Releases Packages Wiki Activity
39623 commits 219 branches 562 tags 474 MiB
Commit graph

3104 commits

Author SHA1 Message Date
Michael Telatynski
e54d803343 Tweak skeleton UI height to be more reasonable 2021-10-11 10:50:33 +01: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
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
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
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
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
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
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 Souquet
aa53444267 Improve narrow composer usability 2021-09-09 13:27:25 +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
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
2d47f453cd
Update styling 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-26 16:19:46 +02: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
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
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
Š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
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
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
Germain Souquet
edd4d42e7f Merge branch 'develop' into gsouquet/threaded-messaging-2349 2021-08-23 17:31:37 +01:00
Germain Souquet
9facb0d963 Polish UI 2021-08-23 14:44:44 +01:00
David Baker
b391ee0bbf
Merge pull request #6451 from SimonBrandner/fix/replies-bubble/18184 
Fix replies on the bubble layout
 2021-08-23 11:29:28 +01:00
Germain
1fad454fe0
Merge pull request #6655 from SimonBrandner/fix/autocomplete-scroll 2021-08-23 11:16:02 +01:00
Germain Souquet
393bd4871f Merge branch 'develop' into gsouquet/threaded-messaging-2349 2021-08-23 10:15:35 +01:00
Šimon Brandner
1c93e18c0a
Move CallPreview CSS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-22 15:22:21 +02:00
Šimon Brandner
d29a18b182
Fix some sizing issue on video feeds 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-22 10:10:05 +02:00
Šimon Brandner
61188561d2
Merge remote-tracking branch 'upstream/develop' into feature/voice-activity 2021-08-22 10:01:17 +02:00
Šimon Brandner
cb7e44f4f5
Always show a transparent border to avoid icon jumps 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-22 09:08:33 +02:00
Šimon Brandner
b58184d61e
Make autocomplete smaller 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-21 19:04:26 +02:00
Šimon Brandner
81d64bec58
Fix autocomplete scrollbar 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-21 18:18:53 +02:00
Travis Ralston
3e19fc1984
Merge pull request #6620 from SimonBrandner/feature/vertical-autocomplete/18558 
Format autocomplete suggestions vertically
 2021-08-20 09:10:36 -06:00
Germain Souquet
30a762944a Implement a very low fidelity UI for threads 2021-08-20 12:11:04 +01:00
Jaiwanth
6a26154271 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations 2021-08-20 15:02:13 +05:30
David Baker
ea38990d94
Merge pull request #6647 from SimonBrandner/fix/call-tile-bubbles/18648 
Fix call tiles on the bubble layout
 2021-08-20 09:24:42 +01:00
Šimon Brandner
952fdd04c1
Fix call tiles on the bubble layout 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-20 10:04:40 +02:00
Travis Ralston
fcf47f6539
Merge pull request #6626 from SimonBrandner/fix/correct-colors-call-tiles 
Adjust colors in call tiles
 2021-08-20 00:02:56 -06:00
Germain Souquet
ffc7326b0c Merge branch 'develop' into gsouquet/threaded-messaging-2349 2021-08-19 10:44:32 +01:00
Šimon Brandner
abab31c33b
Add a speaking indicator 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-19 11:42:43 +02:00
Dariusz Niemczyk
7adfbf6f98
Show blurhash only after 150ms 
Blurhash on every single room entrance was extremely annoying, to the
point where it wasn't really helpful, but distracting, even after
the animations was added.
This commit makes it so the blurhash is only shown after 150ms, and the
image will be animated as a quick fade-in if there's no blurhash.

Fixes https://github.com/vector-im/element-web/issues/18617
Fixes https://github.com/vector-im/element-web/issues/17879
 2021-08-19 07:52:23 +02:00
David Baker
5fa0908752
Merge pull request #6624 from SimonBrandner/fix/call-tile-button/18565 
Fix call tile buttons
 2021-08-18 12:03:18 +01:00
David Baker
24e3a91f6f
Merge pull request #6618 from SimonBrandner/fix/long-names-call-tiles 
Fix long display names in call tiles
 2021-08-18 11:56:09 +01:00
David Baker
3a733d1604
Merge pull request #6616 from SimonBrandner/fix/access-token-overflow 
Avoid access token overflow
 2021-08-18 11:54:40 +01:00
Germain Souquet
95f4513bd2 Make UI respond to thread events 2021-08-17 17:42:47 +01:00
Germain Souquet
458f860a26 Merge branch 'develop' into gsouquet/threaded-messaging-2349 2021-08-17 11:14:21 +01:00
Germain Souquet
d1dbfbd014 hide thread events from the timeline 2021-08-17 11:10:02 +01:00
Šimon Brandner
d8f58e95cb
Use the secondary color for all 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-16 18:41:21 +02:00
Šimon Brandner
93fee442e6
Fix call tile buttons 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-16 15:30:45 +02:00
Šimon Brandner
2ca616c239
Format autocomplete suggestions vertically 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-16 10:15:54 +02:00
Šimon Brandner
c856d433d6
Trim long display names 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-16 10:08:16 +02:00
Šimon Brandner
ae19055734
Fix long display names in call toasts 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-16 09:34:28 +02:00
Šimon Brandner
84ad1bec6c
Avoid access token overflow 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-15 14:40:31 +02:00
Jaiwanth
0e3ad652af Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations 2021-08-14 00:04:30 +05:30
Jaiwanth
7207329c15 Apply review suggestions 2021-08-13 23:44:07 +05:30
Šimon Brandner
0ee59a17de
Fix PiP of held calls 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-13 18:42:55 +02:00
Michael Telatynski
5e38b8b3b3 try fix tests s'more 2021-08-13 13:29:25 +01:00
Šimon Brandner
cda91e44e0
Use new call state icons 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-13 11:37:17 +02:00
Šimon Brandner
c79852a9f0
Left align call tiles 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-13 10:59:59 +02:00
Šimon Brandner
5ac5640939
Add a little padding 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-13 10:35:31 +02:00
Šimon Brandner
39bb253d1f
Merge remote-tracking branch 'upstream/develop' into feature/narrow-voip-tiles/18398 2021-08-13 10:30:21 +02:00
Šimon Brandner
25a3a8ddfd
$roomlist-header-color -> $tertiary-content 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 17:19:31 +02:00
Šimon Brandner
8e610e5947
$dialpad-button-bg-color -> $quinary-content 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 17:19:31 +02:00
Šimon Brandner
0faedebb92
$roomheader-bg-color -> $background 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 17:19:30 +02:00
Šimon Brandner
a3a6f73049
$avatar-bg-color -> $background 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 17:19:30 +02:00
Šimon Brandner
8b59bf3d18
$tertiary-fg-color -> $tertiary-content 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 17:19:29 +02:00
Šimon Brandner
10bc85724a
$secondary-fg-color -> $secondary-content 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 17:19:26 +02:00
Šimon Brandner
e5fd19c332
$primary-fg-color -> $primary-content 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 17:18:18 +02:00
Šimon Brandner
9ecd3b03f1
$quaternary-fg-color -> $quaternary-content 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 17:17:37 +02:00
Šimon Brandner
2afee596a9
$primary-bg-color -> $background 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 17:17:34 +02:00
Michael Telatynski
0414ea27b8 Iterate PR based on feedback 2021-08-12 15:53:10 +01:00
Šimon Brandner
7ce88c9966
$toast-bg-color -> $system 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 16:20:30 +02:00
Jaiwanth
e88edba650
Merge branch 'develop' into export-conversations 2021-08-12 17:10:13 +05:30
Michael Telatynski
57bf64bd28 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 
 Conflicts:
	src/components/views/spaces/SpacePanel.tsx
 2021-08-12 12:05:55 +01:00
Dariusz Niemczyk
fbc5729daf
Merge pull request #6590 from matrix-org/palid/fix/images-loading-ux 
Make loading encrypted images look snappier
 2021-08-12 12:55:52 +02:00
Michael Telatynski
228d623024
Merge pull request #6543 from matrix-org/t3chguy/fix/18092 2021-08-12 11:28:14 +01:00
Michael Telatynski
9d3569a577 Iterate PR based on feedback 2021-08-12 10:58:56 +01:00
Travis Ralston
2e6da2dc6e
Merge pull request #6596 from SimonBrandner/fix/scrollbar-dot/18474 
Remove tiny scrollbar dot from code blocks
 2021-08-11 13:54:47 -06:00
Michael Telatynski
38dbe89316 Merge branch 't3chguy/fix/18092' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 
 Conflicts:
	src/components/views/spaces/SpaceCreateMenu.tsx
	src/i18n/strings/en_EN.json
 2021-08-11 20:53:41 +01:00
Michael Telatynski
5f54abc7e5 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 2021-08-11 20:51:47 +01:00