Commit graph

787 commits

Author SHA1 Message Date
Michael Telatynski
fa9490b02b Add skeleton UI for Room List when no rooms 2020-11-02 17:22:45 +00: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
5a9bac68c6 iterate PR based on feedback
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-21 09:48:02 +01:00
Michael Telatynski
334ab12c47 Tidy up widget colouring
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-20 16:06:35 +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
06009df05b Update Widget paddings and background colours
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-19 18:47:15 +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
f198b95579 Iterate PR; tidy and improve widget context menu
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-15 15:24:42 +01:00
Travis Ralston
43208c01a1 Fix variable naming 2020-10-14 16:30:38 -06:00
Arsh Sharma
49d99c6dc7 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into fix-final-10 2020-10-14 16:58:05 +05:30
Michael Telatynski
bb52bad099 Remove stale props and CSS classes
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-13 16:23:49 +01:00
Michael Telatynski
447ea9eb23 Relax flexboxes in resizer on window resize
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-13 16:11:58 +01:00
Michael Telatynski
ba21c6ed36 Iterate on Widget icons and resizing handles
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-13 15:56:53 +01:00
Michael Telatynski
7be5ff0fe6 First cut of app drawer tiled resizing
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-13 12:29:12 +01:00
Michael Telatynski
f72b1e0c7d Remove stale things
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-13 12:27:50 +01:00
Michael Telatynski
c1fef5a941 Improve the styling
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-12 13:36:09 +01:00
Michael Telatynski
7820f9c28a Switch to WidgetAvatar
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-12 13:16:55 +01:00
RinkiyaKeDad
4f8b0afc41 updated TagPanel 2020-10-10 18:00:06 +05:30
Michael Telatynski
ada6d1aa46 Iterate PR
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-09 08:42:21 +01:00
J. Ryan Stinnett
576ea6df08 Use same colour variable as text 2020-10-08 10:01:05 +01:00
J. Ryan Stinnett
73ce2fac8a Add comment on colour 2020-10-08 09:56:58 +01:00
J. Ryan Stinnett
3d0db1b022 Change invite icon 2020-10-07 20:08:59 +01:00
Michael Telatynski
ab9b5b0d7b
Merge pull request #5265 from matrix-org/t3chguy/feat/widget-max-width
Remove width limit on widgets
2020-10-06 10:23:19 +01:00
Travis Ralston
a5569303d1 Merge branch 'develop' into travis/ft-sep1620/04-jitsi-hangup 2020-09-29 10:20:02 -06:00
Travis Ralston
c75628844d
Merge pull request #5226 from matrix-org/travis/ft-sep1620/10-pip
Make the PIP Jitsi look and feel like the 1:1 PIP
2020-09-29 10:18:30 -06:00
Michael Telatynski
123dada465 Remove width limit on widgets
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-29 14:49:02 +01:00
Travis Ralston
9df175212e Merge branch 'develop' into travis/ft-sep1620/04-jitsi-hangup 2020-09-28 13:43:47 -06:00
Michael Telatynski
7fd6d4498f Make bottom sticky room list header dynamic
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-23 11:00:19 +01:00
Travis Ralston
870c35be6f Merge branch 'develop' into travis/ft-sep1620/09-enc-files 2020-09-18 10:56:20 -06:00
Travis Ralston
849a5e4a39 Round the jitsi pip corners 2020-09-17 14:58:48 -06:00
Travis Ralston
8129333dcc Make the PIP Jitsi look and feel like the 1:1 PIP
* Similar sizing
* Fix pointers so the jitsi widget doesn't feel clickable when it's not
  * We might want to introduce click-to-visit-room for the Jitsi widget (like the 1:1 call), however the Jitsi widget has many more controls to worry about
* Remove the menu bar from the widget to avoid accidents
2020-09-16 22:38:12 -06:00
Travis Ralston
bfbbf44dfc Add a note to use the desktop builds when seshat isn't available
Fixes https://github.com/vector-im/element-web/issues/15184

This is currently temporary design for https://github.com/vector-im/element-web/issues/12896 but does not fix it.
2020-09-16 17:23:37 -06:00
Travis Ralston
1ffc6d5bd3 Make the hangup button do things for conference calls
Behaviour constraints:
* If you're not in the conference, use a grey button that does nothing.
* If you're in the conference, show a button:
  * If you're able to modify widgets in the room, annotate it in the context of ending the call for everyone and remove the widget. Use a confirmation dialog.
  * If you're not able to modify widgets in the room, hang up.

For this we know that persistent Jitsi widgets will mean that the user is in the call, so we use that to determine if they are actually participating.
2020-09-16 14:35:55 -06:00
J. Ryan Stinnett
26b465f1fd Remove room recovery reminder
The Secure Backup toast replaces this with better UX.

Part of https://github.com/vector-im/element-web/issues/13895
2020-09-16 15:03:06 +01:00
Travis Ralston
b177843e45 Remove defunct "always show encryption icons" setting
It doesn't do anything in practice.

Fixes https://github.com/vector-im/element-web/issues/8725
2020-09-14 22:03:54 -06:00
J. Ryan Stinnett
cd3aa81eed Fix sticker picker height
Fixes https://github.com/vector-im/element-web/issues/15152
2020-09-11 11:12:56 +01:00
Michael Telatynski
050319c0cc Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into fix-1px-jump 2020-09-09 17:37:50 +01:00
Nigel Mansell
421af52e76 Fixed 1px jump upwards on filter room members box
Signed-off-by: Nigel Mansell <mansell.nigel@mac.com>
2020-09-08 15:29:16 -04:00
Michael Telatynski
31cca5e0f2 Create new right panel cards 2020-09-08 15:42:31 +01:00
Michael Telatynski
bf3c49b8df Remove redundant CSS rules 2020-08-27 10:46:29 +01:00
Michael Telatynski
dc08fee635 Fix the resize handle being unreachable when you don't have permission to add widgets 2020-08-24 14:38:58 +01:00
Michael Telatynski
35cc1fb06d small tweaks 2020-08-21 16:38:28 +01:00
Michael Telatynski
cca5ccd79d Switch widget resizing to re-resizable and add persistence 2020-08-21 16:29:07 +01:00
Michael Telatynski
ae65ed5c2e Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into resizable-appsdrawer
 Conflicts:
	res/css/views/rooms/_AppsDrawer.scss
2020-08-20 10:26:35 +01:00
Michael Telatynski
24a390f840
Merge pull request #5123 from matrix-org/t3chguy/room-list/14466
Room List filtering visual tweaks
2020-08-18 17:22:05 +01:00
Bruno Windels
5d98805d77 Merge branch 'develop' into bwindels/make-reply-not-overlay 2020-08-18 13:39:06 +02:00
Michael Telatynski
24a088e234 Iterate PR, tweak margins 2020-08-18 12:00:56 +01:00
Michael Telatynski
3fe6f0a792 delint css 2020-08-17 18:26:42 +01:00
Michael Telatynski
e20b375433 Add filter results count and explore prompt 2020-08-17 18:20:00 +01:00
Michael Telatynski
21cdf5073c Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/room-list/14617 2020-08-14 18:58:26 +01:00