Commit graph

668 commits

Author SHA1 Message Date
Michael Telatynski
89386b9b2e fix missing closing brace 2021-03-01 17:06:56 +00:00
Michael Telatynski
ea61b18c18 Iterate Space Panel alignments 2021-03-01 17:02:02 +00:00
Michael Telatynski
ce64863326 Annotate User Menu handle with currently selected space 2021-03-01 15:53:16 +00:00
Šimon Brandner
3a643e5b9d
Remove unnecessary changes
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-26 11:46:54 +01:00
Michael Telatynski
f21aedc6cf Add Space Panel with Room List filtering 2021-02-26 10:41:26 +00:00
Šimon Brandner
3bed37463f
Remove unnecessary code
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-26 11:38:05 +01:00
Šimon Brandner
11c5aa02d2
Remove mx_RoomView_container
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-26 11:19:45 +01:00
Šimon Brandner
819a0b013f
min-width
We need to allow the container to be smaller

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-26 11:08:31 +01:00
Šimon Brandner
e90ae2ea75
Delint
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-26 08:18:05 +01:00
Šimon Brandner
172cc01f7d
Add background animation
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-26 08:12:10 +01:00
Šimon Brandner
f0c26846c7
Fix formatting
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-26 08:11:58 +01:00
Šimon Brandner
1a7f9091b4
Animate icon size
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-26 07:51:03 +01:00
Šimon Brandner
1c48804d96
Remove unnecessary class
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 19:28:08 +01:00
Šimon Brandner
26b70b6228
Remove label background
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 18:32:04 +01:00
Šimon Brandner
a3001f77e4
Remove rounded corners of the drop area
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 18:30:39 +01:00
Šimon Brandner
ad85764a8e
Fix timeline expansion
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 18:23:32 +01:00
Šimon Brandner
c1a105f071
Merge branch 'develop' into improve-file-drop-ui 2021-02-25 18:12:37 +01:00
J. Ryan Stinnett
d96043d5ab Use config for host signup branding 2021-02-15 17:37:33 +00:00
Jason Robinson
23140a84ff Remove host signup config strings, make translatable instead
Also replace the icon in the UserMenu and change the text, requested from design.
2021-02-10 13:38:32 +02:00
Jason Robinson
5fe3c83f27 Merge branch 'develop' into jaywink/hosting-provider-iframe-minimize-wip 2021-02-09 11:18:51 +02:00
Šimon Brandner
84eba59afa
Merge branch 'develop' into improve-codeblock 2021-02-08 15:26:50 +01:00
Šimon Brandner
cdb0d1c12e
Move and use icons from widget dir
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-08 15:22:10 +01:00
Michael Weimann
f0f6e4678e
switch room explorer list to css grid
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-02-06 14:40:16 +01:00
Jason Robinson
6ccce7142c Merge branch 'develop' into jaywink/hosting-provider-iframe-minimize-wip 2021-02-03 22:35:22 +02:00
J. Ryan Stinnett
d78bc98521 Resolve linting errors after upgrades 2021-01-27 12:42:39 +00:00
Šimon Brandner
044e02b06a Remove spaces in empty line
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-17 20:16:53 +01:00
Šimon Brandner
dcb30b72b0 Fix left panel resizer
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-17 13:25:22 +01:00
Šimon Brandner
da97d18332 Added a comment
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-16 21:33:05 +01:00
Šimon Brandner
41e2ffdf0d Added background
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-16 19:51:49 +01:00
Šimon Brandner
89bc443594 Fix file drop UI
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-16 16:02:27 +01:00
Jason Robinson
5aa24b97cd Merge remote-tracking branch 'origin/develop' into jaywink/elementPro 2020-12-16 14:45:16 +02:00
Šimon Brandner
e55ec43595 Fix minimized left panel alignment
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-15 14:45:10 +01:00
Michael Telatynski
d77c5b46eb Fix width of underline in server picker dialog 2020-12-08 11:56:42 +00:00
Michael Telatynski
eb25c39318 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials
 Conflicts:
	src/i18n/strings/en_EN.json
2020-12-01 16:33:29 +00:00
Richard Lewis
116f109a62 Improve setup initiation link 2020-11-27 15:10:35 +02:00
Michael Telatynski
edd5bf5842
Merge pull request #5421 from matrix-org/t3chguy/fix/15700
Simplify UserMenu for Guests as they can't use most of the options
2020-11-27 10:57:54 +00:00
Michael Telatynski
b1ca1eb3f5 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials 2020-11-24 11:30:51 +00:00
Michael Telatynski
1d53a5cf23 Initial support for MSC2858 2020-11-24 11:18:11 +00:00
Michael Telatynski
613710b75c Iterate Auth copy 2020-11-23 17:01:35 +00:00
David Baker
50965e41eb Remove call bar
Also hide video mute button on voice calls (awaiting clarification from design)
and fix mute keyboard shortcuts by moving them out of roomview & into
callview.
2020-11-19 15:15:31 +00:00
Michael Telatynski
5f23c9499c Simplify UserMenu for Guests as they can't use most of the options 2020-11-12 12:46:55 +00:00
Michael Telatynski
f1121c1b6e Fix vertical centering of the Homepage and button layout 2020-11-12 11:13:53 +00:00
Michael Telatynski
6aeea3e38e Extract MiniAvatarUploader into a reusable component 2020-11-05 15:42:45 +00:00
Michael Telatynski
2594ff8e80 Remove old isAlone checker 2020-11-05 15:39:22 +00:00
Michael Telatynski
4afa610ee1 Add variant of default home page for justRegistered 2020-11-02 17:24:47 +00:00
Aaron Raimist
c636dc0ed3
Fix custom tag layout which regressed in #5309
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-10-29 16:54:55 -05:00
Michael Telatynski
4e12aeca9e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/room-list-widgets
 Conflicts:
	src/components/views/elements/AppTile.js
2020-10-21 12:48:51 +01:00
Michael Telatynski
a5468c918e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets
 Conflicts:
	src/resizer/distributors/collapse.ts
	src/resizer/distributors/fixed.ts
	src/resizer/index.ts
	src/resizer/item.ts
	src/resizer/resizer.ts
	src/resizer/sizer.ts
2020-10-21 09:56:22 +01:00
Michael Telatynski
bec1d718e0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/room-list-widgets
 Conflicts:
	src/components/views/elements/AppTile.js
	src/utils/WidgetUtils.ts
2020-10-19 20:50:16 +01:00
Michael Telatynski
744a4abd1c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets 2020-10-19 13:08:17 +01:00
Michael Telatynski
30adc98a15 Fix excessive hosting link padding
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-19 12:34:25 +01:00
Travis Ralston
43208c01a1 Fix variable naming 2020-10-14 16:30:38 -06:00
Arsh Sharma
a5d01f2f4d missed a replacement 2020-10-14 17:18:50 +05:30
Michael Telatynski
f72b1e0c7d Remove stale things
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-13 12:27:50 +01:00
RinkiyaKeDad
4f8b0afc41 updated TagPanel 2020-10-10 18:00:06 +05:30
J. Ryan Stinnett
43ea5de320 Adjust Settings styles 2020-10-07 20:23:34 +01:00
Michel Zimmer
58bbbf31b9 Fix room directory clipping links in the room's topic
Signed-off-by: Michel Zimmer <opensource@michel-zimmer.de>
2020-10-02 18:00:58 +02:00
Michael Telatynski
956a3bf69d Implement Left Panel User Widget
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-24 09:28:49 +01:00
Travis Ralston
4ef4e67642
Merge pull request #5229 from matrix-org/travis/workflow/design/sep1720
Adjust layout and formatting of notifications / files cards
2020-09-18 11:11:35 -06:00
Travis Ralston
f5f48cbc21 Fix indentation 2020-09-17 10:44:58 -06:00
Travis Ralston
4657a34bbb Document some of the magic values 2020-09-17 10:44:18 -06:00
Travis Ralston
14a7b83988 Don't show a bottom border ahead of the date separator 2020-09-17 10:40:48 -06:00
Travis Ralston
24d0950b7e Adjust layout and formatting of notifications / file cards
This follows some polish time with a designer.

The placeholder text on the two panels was tracking up/down when the width was changed. This is fixed by adjusting some of the flexbox properties to center it more safely. 

We also spent some time making the notifications panel more legible while we wait for the overhaul to land.
2020-09-17 09:23:06 -06:00
J. Ryan Stinnett
7a5b0a964f Adjust main encryption toast to reference Secure Backup
This adjusts the main toast to focus on Secure Backup as suggested in designs.

Part of https://github.com/vector-im/element-web/issues/13895
2020-09-16 15:03:06 +01:00
Michael Telatynski
4a4a8cd611 styling and fix i button behaviour 2020-09-08 15:43:40 +01:00
Michael Telatynski
98b59fb217 Consolidate all the work thus far 2020-09-08 15:43:38 +01:00
Michael Telatynski
89a836100d small css tweaks to closer match the figma 2020-09-08 15:42:31 +01:00
Travis Ralston
78d5b87fbc Use a different border variable for compatibility with custom themes 2020-08-31 11:20:28 -06:00
Travis Ralston
02095389e7 Add structure for mixed prototype UserMenu 2020-08-28 17:03:17 -06:00
Travis Ralston
01b0acbe62 Make the UserMenu echo the current community name 2020-08-28 16:14:08 -06:00
Travis Ralston
0ffa548864 Change the menu button to a chevron
by design request
2020-08-28 15:37:23 -06:00
Travis Ralston
52e095fa61
Merge pull request #5151 from matrix-org/travis/copy-change
Update create room dialog copy & community prototype home icon
2020-08-28 09:47:53 -06:00
Travis Ralston
3c176f762e Remove disabled clear button from tag panel + dead code 2020-08-27 14:27:06 -06:00
Travis Ralston
13e9f7b912 Update home icon 2020-08-27 13:18:52 -06:00
Travis Ralston
0c67a42b0f Make padding only on the prototype tag panel 2020-08-26 08:42:26 -06:00
Travis Ralston
20c562c208 Change user avatar to a home icon 2020-08-25 21:46:26 -06:00
Travis Ralston
276ed90884 Add a personal group for an all-communities state
Design is approximate and needs review, though being completed out of band.
2020-08-21 18:19:29 -06:00
Michael Telatynski
24a088e234 Iterate PR, tweak margins 2020-08-18 12:00:56 +01:00
Michael Telatynski
e20b375433 Add filter results count and explore prompt 2020-08-17 18:20:00 +01:00
Michael Telatynski
a4d11cc190 Change highlighting around the room list filter 2020-08-17 16:59:29 +01:00
Michael Telatynski
4381bdfdbf fix typo 2020-08-14 18:53:56 +01:00
Michael Telatynski
4abbcd8c06 Fix styling for selected community marker 2020-08-13 15:24:21 +01:00
Michael Telatynski
3e475bb69c padding the timeline so that its scrollbar has its own space from the resize handle 2020-08-12 16:21:37 +01:00
Jorik Schellekens
0060acbb33
Merge pull request #5056 from matrix-org/joriks/style-fighting
Quick win session 24/07/2020
2020-08-12 15:21:06 +01:00
J. Ryan Stinnett
9e429ee669 Remove rebranding toast
It's time to remove the rebranding toast, as we believe people have had
sufficient warning now.

Fixes https://github.com/vector-im/element-web/issues/14931
2020-08-11 14:27:53 +01:00
Michael Telatynski
4799f0ee43
Merge pull request #5085 from matrix-org/t3chguy/notifications11
Factor out Iconized Context menu for reusability
2020-08-08 11:41:28 +01:00
J. Ryan Stinnett
af825b4559 Fix room list scrolling in Safari
This sets `flex-basis` properly in Safari so the room list is scrollable.

Fixes https://github.com/vector-im/element-web/issues/14877
2020-08-05 14:32:02 +01:00
Michael Telatynski
d126f5c1e6 tidy up IconizedContextMenu CSS 2020-08-04 21:42:45 +01:00
Jorik Schellekens
271eeeabee Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/style-fighting 2020-08-04 15:04:56 +01:00
J. Ryan Stinnett
ce226ab534 Replace Riot with Element in docs and comments
This only covers the simple cases of references to issues and repos. More
complex areas, such as deployment scripts, will be handled separately.

Part of https://github.com/vector-im/element-web/issues/14864
2020-08-03 18:33:36 +01:00
Bruno Windels
fba1158700
Merge pull request #5079 from matrix-org/bwindels/alert-file-panel-empty-state
Add title and icon to empty state of file and notification panel
2020-08-03 12:58:13 +00:00
Bruno Windels
5a3bda7eea Add title and icon to empty state of file and notification panel 2020-08-03 13:30:56 +02:00
J. Ryan Stinnett
af49639bd8
Merge pull request #5065 from matrix-org/travis/echo/audit
Add local echo for notifications in the new room list
2020-07-31 12:20:20 +01:00
Travis Ralston
5b15d12865 Ensure list visibility changes get counted as list changes
Fixes https://github.com/vector-im/riot-web/issues/14799

We were checking to see if the tags were visible at render time, but we needed to ensure that they were(n't) included when checking for diffs. This introduces a new kind of object cloning for semantic reasons.

This also fixes the selection indicator being a bit off on custom tags.
2020-07-30 14:18:54 -06:00
Travis Ralston
e3765ea8c5 Appease the linters 2020-07-29 20:47:32 -06:00
Travis Ralston
14757cacd5 Introduce a concept of "non-urgent" toasts
This is somewhat expected to be temporary.
2020-07-29 12:43:35 -06:00
Jorik Schellekens
4f55ef685d
Merge pull request #4989 from matrix-org/joriks/resize-handlebars-2.0
Fix handlebar interaction
2020-07-28 14:30:00 +01:00
Jorik Schellekens
9cd232617d Unify composer and room header icons 2020-07-28 13:19:11 +01:00
Jorik Schellekens
1d6c2b786e File panel spacing and corner rounding 2020-07-27 16:21:41 +01:00
Jorik Schellekens
84e3a0954c Fix handle left align 2020-07-27 15:04:09 +01:00
Travis Ralston
80687e358f Obliterate some flexboxes in the room list
We don't need columns of divs to equally size themselves, so use easier layout techniques to make the list fit in the container. We have to take a hit with `height:100%`, but the hit is much more insignificant than confusing the layout engine.

The layout engine has a hard time with dynamically-but-statically-sized stuff like `width: 100%; display: flex;`, particularly when it is nested so badly. Overall this should improve performance for the app by not having to re-paint so often.

Fixes https://github.com/vector-im/riot-web/issues/14639
2020-07-22 16:34:33 -06:00
Travis Ralston
a0b2859436 Support custom tags in the room list again
Fixes https://github.com/vector-im/riot-web/issues/14091

Design needs work, however this is behind labs anyways. This re-implements the behaviour of the old room list.

The implementation ended up being a lot easier due to early confusion with what the TagOrderStore and TagPanel take care of. Turns out they don't deal with tags, but groups. As such, we don't need to do anything with filtering (though we keep some sanity checks in place for safety), and just have to wire up the CustomRoomTagPanel and CustomRoomTagStore.
2020-07-20 16:51:16 -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
2441cbc9ac LeftPanel2 -> LeftPanel 2020-07-17 15:22:18 -06:00
Travis Ralston
3c047cecfd Remove core structures for the old room list 2020-07-17 14:17:11 -06: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
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
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
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
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
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
Bruno Windels
936f24eb15 change look of right panel header buttons 2020-07-14 21:09:18 +02:00
Bruno Windels
38549ecf4c change accent color 2020-07-14 20:36:27 +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
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
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
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
d136d02f5e Stylise right panel as card 2020-07-13 21:52:31 +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
Nad Chishtie
87a8dc4ff0 Improve spacing 2020-07-13 20:41:18 +01:00
Nad Chishtie
b28bb34cb7 Small tweaks to padding and sizing 2020-07-13 20:13:20 +01:00
J. Ryan Stinnett
995a7879a1 Merge remote-tracking branch 'origin/develop' into element 2020-07-13 18:49:55 +01: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
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
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
6dc7a5631b make tag panel less wide 2020-07-10 12:27:48 +02:00
Travis Ralston
75dbd5f1d4 Merge branch 'develop' into travis/room-list/enable 2020-07-09 22:28:16 -06:00
Jorik Schellekens
e4366632cf Fix search padding 2020-07-10 02:54:11 +01:00
Jorik Schellekens
edb556f22e Stop safari from agressivly shrinking 2020-07-10 02:15:46 +01:00
Jorik Schellekens
e2539f11cd Scroll fade for breadcrumbs 2020-07-09 19:24:02 +01:00
Bruno Windels
d90fc57469 Merge branch 'develop' into element 2020-07-09 17:59:56 +02:00