Commit Graph

2323 Commits (a52e5a581dab680d128efbfa247ddfd5c64ad4d7)

Author SHA1 Message Date
Travis Ralston 361d524e7e Rename remaining SCSS variables to remove 2 suffix 2020-07-17 16:18:15 -06:00
Travis Ralston 0e054c05c2 Remove unused SCSS variables + fix tertiary colour 2020-07-17 16:15:14 -06:00
Travis Ralston 40e4347114 Replace $roomtile-badge-fg-color with $accent-fg-color 2020-07-17 16:08:47 -06:00
Travis Ralston b24436c4a4 Fix the orange used for away presence 2020-07-17 16:04:02 -06:00
Travis Ralston 1cecabb0b3 Replace $roomtile-name-color with $muted-fg-color (equivalent) 2020-07-17 16:03:26 -06:00
Travis Ralston a30da8dcdb Rename RoomList2 SCSS variables 2020-07-17 15:59:35 -06:00
Travis Ralston c5d732a631 IncomingCallBox2 -> IncomingCallBox 2020-07-17 15:56:58 -06:00
Travis Ralston 7f5c501b2b CallView2 -> CallView 2020-07-17 15:55:30 -06:00
Travis Ralston cbf967ea69 Remove legacy call components 2020-07-17 15:53:13 -06:00
Travis Ralston d7ada5f7c5 Remove TODO flags 2020-07-17 15:47:37 -06:00
Travis Ralston c9b0b3b31d RoomSublist2 -> RoomSublist 2020-07-17 15:46:46 -06:00
Travis Ralston 96065ae982 RoomTile2 -> RoomTile 2020-07-17 15:43:29 -06:00
Travis Ralston 8dfe7b6cc7 RoomBreadcrumbs2 -> RoomBreadcrumbs 2020-07-17 15:32:06 -06:00
Travis Ralston a7c18bfbfa RoomList2 -> RoomList 2020-07-17 15:27:49 -06:00
Travis Ralston 2441cbc9ac LeftPanel2 -> LeftPanel 2020-07-17 15:22:18 -06:00
Jorik Schellekens 58532f2ac4
Merge pull request #4990 from matrix-org/joriks/irc-layout-truncate-upload-name
ellipse senders for images and videos
2020-07-17 22:04:19 +01:00
Travis Ralston 3c047cecfd Remove core structures for the old room list 2020-07-17 14:17:11 -06:00
Michael Telatynski 38dc3c8bd1 Replace non-functional Interactive Tooltip
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-17 18:43:42 +01:00
Michael Telatynski 9ec2ca447c Update style of default tooltips to match the new style
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-17 16:19:10 +01:00
Matthew Hodgson 6e5efd0839 stop Inter from clobbering Twemoji
Fixes the bug where red heart emoji appear monochrome
2020-07-17 00:35:41 +01:00
Jorik Schellekens 173ccbcec9 Fix handles 2020-07-16 16:21:38 +01:00
Michael Telatynski 5e6f8b20bc Visual WIP
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-16 16:16:41 +01:00
Jorik Schellekens d794e17d4d Fix handlebar interaction 2020-07-16 16:16:41 +01:00
Michael Telatynski fb222c7eff
Merge pull request #5001 from swapnilraj/swapnilraj/country-code-width
Increase width for country code dropdown
2020-07-16 16:09:43 +01:00
Swapnil Raj 8253756276 Remove unnecessary import 2020-07-16 20:28:19 +05:30
Michael Telatynski a704eefdd5 Merge branches 'develop' and 't3chguy/nad/rampage' of github.com:matrix-org/matrix-react-sdk into t3chguy/nad/rampage
 Conflicts:
	src/components/views/elements/AccessibleTooltipButton.tsx
2020-07-16 15:47:12 +01:00
Michael Telatynski ebb9c4e814 Update text input placeholder active colour to 75% inactive
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-16 15:46:06 +01:00
Swapnil Raj 0ddfd9ee8c Use rem to guard against font scaling breakages 2020-07-16 20:15:28 +05:30
Michael Telatynski e6dff951b8 Fix composer text alignment
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-16 15:42:58 +01:00
Michael Telatynski 1a9680b527 Update font size of member filter field
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-16 15:40:31 +01:00
J. Ryan Stinnett 9b13ef1446 Revert "Merge branch 'joriks/horizontal-resize-bars' into 'element'"
This reverts commit eb0cb5c279.
2020-07-16 15:31:41 +01:00
Michael Telatynski 007f63b5bb Update the SVGs with 24x24 fixed Figma ones
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-16 15:30:06 +01:00
Michael Telatynski 576294e7ce Add shadow to the reply preview and autocomplete composer panes
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-16 15:26:25 +01:00
Michael Telatynski d5f2d43429 Improve Tooltip font/layout consistency
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-16 15:15:00 +01:00
Swapnil Raj 1195c09f5c Increase width for country code dropdown 2020-07-16 19:11:52 +05:30
Michael Telatynski b6cd8065f8 Re-export top right header button svg masks to match Figma
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-16 14:39:02 +01:00
Michael Telatynski a2b5e5a6a1 Fix top right header button layout and hover consistency
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-16 14:38:46 +01:00
Michael Telatynski cb4f4c96b4 Update colour of typing indicator in timeline to match topic
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-16 14:38:23 +01:00
Michael Telatynski 2b260a69a0 Change colour of unread count dot to primary fg
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-16 14:37:41 +01:00
Jorik Schellekens 2e8285590c
Merge pull request #4992 from matrix-org/joriks/irc-layout-e2e-icon
Move e2e icon
2020-07-16 14:35:08 +01:00
Swapnil Raj 4006ae6701
Fix copy button in share dialog 2020-07-16 10:30:31 +01:00
Jorik Schellekens 96f0681c2e Move e2e icon 2020-07-16 03:52:35 +01:00
Jorik Schellekens bcbb3e8169 fix name jump 2020-07-16 03:14:20 +01:00
Jorik Schellekens e873ba9608 ellipse senders for images and videos 2020-07-16 02:52:16 +01:00
Jorik Schellekens eb0cb5c279 Revert "Revert "Merge branch 'joriks/horizontal-resize-bars' into 'element'""
This reverts commit 8cde611653.
2020-07-15 04:52:34 -06:00
Travis Ralston 17dba01993 Fix style lint 2020-07-15 03:49:59 -06:00
David Baker bb0f2ce944 Fix alignment of login/syncing spinner
Somewhat hacky but makes it look sensible
2020-07-15 10:44:20 +01:00
Bruno Windels 7ca8b27dc1 Make custom themes acceptable with recent changes for element theme
Note that custom themes are still based on the old theme, now called legacy-light/dark
2020-07-15 10:38:24 +02:00
Jorik Schellekens 8cde611653 Revert "Merge branch 'joriks/horizontal-resize-bars' into 'element'"
This reverts commit 2a4c09880c.
2020-07-14 18:45:01 -06:00
Jorik Schellekens 1f94986c88 add horizontal handlebars 2020-07-15 00:20:39 +01:00
Travis Ralston 556da7fe5c Swap out Modular for EMS 2020-07-14 15:47:03 -06:00
Travis Ralston 54a060cbb1 Fix user info section headers on the dark theme 2020-07-14 14:15:24 -06:00
J. Ryan Stinnett 9d094a793c Merge branch 'bwindel/polish' into 'element'
More polish

See merge request new-vector/element/element-web/matrix-react-sdk!21
2020-07-14 19:35:41 +00:00
Bruno Windels 936f24eb15 change look of right panel header buttons 2020-07-14 21:09:18 +02:00
Bruno Windels 2da7d17a5d change color of who is typing text to composer icons color
as requested by Nad
2020-07-14 20:45:14 +02:00
Bruno Windels 38549ecf4c change accent color 2020-07-14 20:36:27 +02:00
Bruno Windels 01e7d9c4e4 Merge branch 'bwindels/restyle-blurry-login-box' into 'element'
change bg color to that of the room list

See merge request new-vector/element/element-web/matrix-react-sdk!19
2020-07-14 18:22:52 +00:00
Bruno Windels d39974b590 change bg color to that of the room list 2020-07-14 20:17:31 +02:00
J. Ryan Stinnett 225c31e043 Merge branch 'nadonomy/quick-wins' into 'element'
Make message previews more legible

See merge request new-vector/element/element-web/matrix-react-sdk!18
2020-07-14 18:10:30 +00:00
Nad Chishtie 1f9657c7fb Make message previews more legible 2020-07-14 19:05:49 +01:00
Bruno Windels 37776447d4 Merge branch 'element-update-icons' into 'element'
change icon on invite button

See merge request new-vector/element/element-web/matrix-react-sdk!16
2020-07-14 17:54:07 +00:00
Travis Ralston 941186dbc1 Merge branch 'travis/EL/communities-touchups' into 'element'
Minor padding fixes to communities

See merge request new-vector/element/element-web/matrix-react-sdk!11
2020-07-14 17:50:40 +00:00
Bruno Windels aeadf64ccf change icon on invite button 2020-07-14 19:40:17 +02:00
Bruno Windels 0c3501e317 make field border less bright 2020-07-14 19:19:27 +02:00
Bruno Windels 4d14a1d6b3 change right panel/event tile hover bg color 2020-07-14 19:19:07 +02:00
Bruno Windels c2456d9b81 change room header/timeline/composer bg 2020-07-14 19:18:42 +02:00
Bruno Windels 25d3257d80 rename element(-dark) to light/dark so old prefs apply 2020-07-14 18:39:14 +02:00
Travis Ralston a5c8485e23 Minor padding fixes to communities 2020-07-14 10:16:00 -06:00
Travis Ralston d7e8dbbab5 Remove extraneous scrollbar on TagPanel when few communities are shown 2020-07-14 09:08:07 -06:00
Bruno Windels 7ff3e6a26d bring back padding between show more and resize handle 2020-07-14 15:09:53 +02:00
Bruno Windels b6a5fa38e1 Merge branch 'element' into 'nadonomy/ui-tweaks-part-deux'
# Conflicts:
#   res/css/views/rooms/_RoomSublist2.scss
2020-07-14 12:40:52 +00:00
Nad Chishtie 9700e7e269 Tweak blur & alpha on panels 2020-07-14 13:35:31 +01:00
Bruno Windels 4f466300b7 Merge branch 'element' of https://gitlab.matrix.org/new-vector/element/element-web/matrix-react-sdk into element 2020-07-14 14:32:08 +02:00
Bruno Windels 4fe4788c2e Merge branch 'develop' into element 2020-07-14 14:31:31 +02:00
Michael Telatynski 70951614e4 Merge branch 'nadonomy/ui-tweaks-part-deux' of https://gitlab.matrix.org/new-vector/element/element-web/matrix-react-sdk into nadonomy/ui-tweaks-part-deux 2020-07-14 13:30:55 +01:00
Michael Telatynski fcf5fc0990 Fix normal e2e icon colour
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-14 13:30:05 +01:00
Bruno Windels 1180bb722a Merge branch 'nadonomy/ui-tweaks-part-deux' of https://gitlab.matrix.org/new-vector/element/element-web/matrix-react-sdk into nadonomy/ui-tweaks-part-deux 2020-07-14 14:25:36 +02:00
Bruno Windels 1578b1c3d3 different blur radius for dark theme 2020-07-14 14:24:35 +02:00
Michael Telatynski 9f199758b9 restore old tooltip positioning (right) instead of (above) for timeline tooltips
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-14 13:00:25 +01:00
J. Ryan Stinnett a09f773edd Tweak sticky header hiding to avoid pop
When transitioning between sublists, there can be a visibly observable jump in
the positioning of list items when the header container is restored to normal
size outside of sticky mode.

To avoid this problem, this leaves all headers at normal size. This creates a
new issue of a permanent gap at the top of the list for the first header, but
this can be solved by always hiding (since it can only ever appear stuck to
top).

Fixes https://github.com/vector-im/riot-web/issues/14429
2020-07-14 12:16:17 +01:00
Bruno Windels c936439ad5 only remove underline for links in element theme 2020-07-14 12:52:28 +02:00
Bruno Windels 488f49dc5c redefine variable rather than picking a different one
to not break other teams
2020-07-14 12:51:51 +02:00
Michael Telatynski 0cb0d2a4eb Apply 1 suggestion(s) to 1 file(s) 2020-07-14 09:27:53 +00:00
Bruno Windels 106c91aec0 Merge branch 'element' into 'nadonomy/ui-tweaks-part-deux'
# Conflicts:
#   res/css/views/rooms/_RoomSublist2.scss
2020-07-14 09:26:04 +00:00
Michael Telatynski 9d7a7c707f Merge branch 'nadonomy/ui-tweaks-part-deux' of https://gitlab.matrix.org/new-vector/element/element-web/matrix-react-sdk into nadonomy/ui-tweaks-part-deux 2020-07-14 00:52:07 +01:00
Michael Telatynski d4e397cbd0 Switch to svg masks for the e2eicon and border it for the EntityTile avatars
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-14 00:52:03 +01:00
Nad Chishtie d70b510d81 Tweak panel colours 2020-07-14 00:06:12 +01:00
Nad Chishtie d0d61e7e3c Improve legibility of room headers 2020-07-14 00:06:12 +01:00
Michael Telatynski 4d432f23e4 Fix room header timeline and composer alignment
Room header use DecoratedRoomAvatar instead of manual e2eIcon overlay
move e2eIcon next to it instead of private padlock

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 23:56:25 +01:00
Michael Telatynski 98f3d9bd74 fix input border colour
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 23:23:21 +01:00
Michael Telatynski cd2f323002 re-add text-align center
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 23:18:33 +01:00
Michael Telatynski a5a32cb5de Merge branch 'nadonomy/ui-tweaks-part-deux' of https://gitlab.matrix.org/new-vector/element/element-web/matrix-react-sdk into nadonomy/ui-tweaks-part-deux 2020-07-13 23:14:10 +01:00
Michael Telatynski 646c5d4a64 Replace timeline tooltips to match breadcrumb tooltips
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 23:14:00 +01:00
Nad Chishtie ce365cc5a1 Optically align room header height with panel heights 2020-07-13 23:12:37 +01:00
Nad Chishtie b10195cefa Use consistent values between right and left panels 2020-07-13 23:12:37 +01:00
Michael Telatynski 145b154a01 fix left gutter based on the border-left shrinking by 1px
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 22:56:20 +01:00
Michael Telatynski de46c0091f Fix UserInfo separator colour to match User Menu context menu
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 22:50:18 +01:00
Michael Telatynski a40972cec9 Fix text jumps for event tile hover
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 22:21:06 +01:00
Michael Telatynski a1ff00a7a8 Fix scrollbar occlusion in the right panel
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 22:13:29 +01:00
Michael Telatynski 5e5620a6c2 Make widgets match the new 8px border-radius standard
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 21:59:46 +01:00
Michael Telatynski b45adda676 Merge branch 'nadonomy/ui-tweaks-part-deux' of https://gitlab.matrix.org/new-vector/element/element-web/matrix-react-sdk into nadonomy/ui-tweaks-part-deux 2020-07-13 21:56:52 +01:00
Michael Telatynski 93e1ba4699 Change border radius of context menus and dialog from 4px to 8px
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 21:56:48 +01:00
Nad Chishtie f8e2805f38 Merge branch 'nadonomy/ui-tweaks-part-deux' of https://gitlab.matrix.org/new-vector/element/element-web/matrix-react-sdk into nadonomy/ui-tweaks-part-deux 2020-07-13 21:53:46 +01:00
Nad Chishtie 9007653ec6 Make room clipping list mask softer 2020-07-13 21:52:52 +01:00
Nad Chishtie d136d02f5e Stylise right panel as card 2020-07-13 21:52:31 +01:00
Michael Telatynski 6a58512397 Fix alignments
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 21:45:48 +01:00
Michael Telatynski e8e900ca1e Merge branch 'nadonomy/ui-tweaks-part-deux' of https://gitlab.matrix.org/new-vector/element/element-web/matrix-react-sdk into nadonomy/ui-tweaks-part-deux 2020-07-13 21:21:02 +01:00
Nad Chishtie 1b9d918a92 Add new e2e icons 2020-07-13 21:20:55 +01:00
Michael Telatynski 88a653445f Fix h-alignment of the room header, timeline and composer avatars
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 21:15:58 +01:00
Michael Telatynski 57f75736be Merge branch 'nadonomy/ui-tweaks-part-deux' of https://gitlab.matrix.org/new-vector/element/element-web/matrix-react-sdk into nadonomy/ui-tweaks-part-deux 2020-07-13 21:02:26 +01:00
Michael Telatynski 5a85ce5d3d Remove text decoration from links v2
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 21:02:08 +01:00
Nad Chishtie fafbd25f6b Tweak padding & weight 2020-07-13 20:57:24 +01:00
Nad Chishtie a3b1c93149 Tweak padding 2020-07-13 20:50:26 +01:00
Michael Telatynski a19f0fac2f Merge branch 'nadonomy/ui-tweaks-part-deux' of https://gitlab.matrix.org/new-vector/element/element-web/matrix-react-sdk into nadonomy/ui-tweaks-part-deux 2020-07-13 20:48:28 +01:00
Michael Telatynski 21a8f2298e Remove text decoration from links
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 20:48:19 +01:00
Nad Chishtie 87a8dc4ff0 Improve spacing 2020-07-13 20:41:18 +01:00
Michael Telatynski 69929134c5 add spacing between sublists of 4px
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 20:40:42 +01:00
Michael Telatynski 4244c67aca Fix even spacing between sticky and non-sticky headers
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 20:29:08 +01:00
J. Ryan Stinnett b50c809d35 Merge remote-tracking branch 'origin/develop' into element 2020-07-13 20:28:57 +01:00
J. Ryan Stinnett 571209afbe
Merge pull request #4963 from matrix-org/joriks/room-list-gradient
Add fade to show more button on room list
2020-07-13 20:21:48 +01:00
Nad Chishtie dec377a448 Temporarily apply Joriks CSS fix 2020-07-13 20:15:09 +01:00
Nad Chishtie b28bb34cb7 Small tweaks to padding and sizing 2020-07-13 20:13:20 +01:00
Jorik Schellekens c9e231c3eb Add fad 2020-07-13 19:03:31 +01:00
J. Ryan Stinnett 995a7879a1 Merge remote-tracking branch 'origin/develop' into element 2020-07-13 18:49:55 +01:00
Michael Telatynski 33422f1744 Switch out Labs spinner to be the Flow-generated from Design
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 17:39:57 +01:00
Bruno Windels c346122adf align room header with user menu button 2020-07-13 18:24:28 +02:00
Bruno Windels ec65083c61 polish user menu button 2020-07-13 18:24:28 +02:00
Bruno Windels 19ebf3beec make overscroll gradients smaller so they pop less when appearing 2020-07-13 18:24:28 +02:00
Bruno Windels b19afe4d46 reduce distance between tiles to 12px, so we can align things in LP with 2020-07-13 18:24:28 +02:00
Bruno Windels 965856aa55 align breadcrumbs with community avatar grid 2020-07-13 18:24:28 +02:00
Bruno Windels 375f6fa4d8 make search field 32px high, just like avatars 2020-07-13 18:24:28 +02:00
Bruno Windels 02b27086da swap search field and breadcrumbs 2020-07-13 18:24:28 +02:00
Jorik Schellekens cd83f12a82 Fix badges for font size 20 2020-07-13 16:11:21 +01:00
Michael Telatynski 1ce3ae0cf2
Merge pull request #4952 from matrix-org/t3chguy/room-list/14413
Remove redundant scroll-margins and fix RoomTile wrongly scrolling
2020-07-13 15:57:27 +01:00
Michael Telatynski 213e2df9fc Remove redundant scroll-margins and fix RoomTile wrongly scrolling
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-12 08:49:04 +01:00
Travis Ralston bdb641279a Merge branch 'develop' into travis/room-list/enable 2020-07-10 11:11:25 -06:00
David Baker 503159c1c8 Merge branch 'dbkr/in-app-rebrand-prompt' into 'element'
Add in-app rebranding toasts & prompts

See merge request new-vector/element/element-web/matrix-react-sdk!1
2020-07-10 17:09:17 +00:00
Bruno Windels a2cb6f375a fix padding upon Nads request 2020-07-10 19:06:48 +02:00
Bruno Windels 952200f031 Merge branch 'develop' into element 2020-07-10 19:04:45 +02:00
Travis Ralston 477472c178 Merge branch 'develop' into travis/room-list/showmore2 2020-07-10 10:57:17 -06:00
Bruno Windels 85ac256231 cleanup 2020-07-10 18:40:09 +02:00
Bruno Windels 725b7f8950 make show more button a bit less tall 2020-07-10 18:30:52 +02:00
Bruno Windels d5a3071518 put show more button inside resizer
this way we have a flexbox layout in the resizer with:
 - the resize handle (fixed)
 - the show more/less button, if any (fixed)
 - the list of tiles (grabbing whatever is left)
2020-07-10 18:29:39 +02:00
Travis Ralston bf0a503e44 [WITH CONFLICTS] Merge branch 'develop' into travis/room-list/enable 2020-07-10 10:18:12 -06:00
Travis Ralston 976f7381ab Merge remote-tracking branch 'origin/joriks/room-list-fix-search-padding' into develop 2020-07-10 08:53:30 -06:00
Travis Ralston 2bf2a08e7a Mark safari hacks 2020-07-10 08:52:46 -06:00
Travis Ralston 37a8b68539 Merge remote-tracking branch 'origin/joriks/room-list-safari-fix' into develop 2020-07-10 08:51:31 -06:00
David Baker 8701e9293e Add in-app rebranding toasts & prompts
Either shows an informational dialog telling you the name has changed,
or a more naggy one if the user needs to log in on a different URL.
The new URL (if any) is hardcoded based on the current URL, and also
with a bonus config param in case other deployments need to do similar.
2020-07-10 15:32:34 +01:00
Bruno Windels 42e101340e
Merge pull request #4942 from matrix-org/joriks/room-list-breadcrumbs-scroll-fade
Scroll fade for breadcrumbs
2020-07-10 10:37:55 +00:00
Bruno Windels 7880c10b21 Merge branch 'element' of https://gitlab.matrix.org/new-vector/element/element-web/matrix-react-sdk into element 2020-07-10 12:28:47 +02:00