Commit Graph

773 Commits (e450750700e688c9f30f78dd49b22a32b3e80b35)

Author SHA1 Message Date
Germain a36063704d
Merge pull request #6138 from matrix-org/gsouquet/containment-event
Fix mx_Event containment rules and empty read avatar row
2021-06-03 16:38:55 +01:00
Germain 7f83590846
Merge pull request #6079 from matrix-org/gsouquet/switch-rooms 2021-06-03 08:44:01 +01:00
Michael Telatynski 4f50727010 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/6606
 Conflicts:
	src/components/structures/RoomView.tsx
	src/components/views/right_panel/UserInfo.tsx
2021-06-03 08:42:05 +01:00
Germain Souquet a34f8a29f4 fix mx_Event containment rules and empty read avatar row 2021-06-03 08:41:12 +01:00
Michael Telatynski e334ce8192 First cut of space panel drag-and-drop ordering 2021-06-03 08:32:36 +01:00
Germain 430cfa9c06
Merge pull request #6127 from matrix-org/gsouquet/css-containment
Add CSS containment rules for shorter reflow operations
2021-06-03 08:10:29 +01:00
Germain Souquet ebd7cd6212 Add CSS containement rules for shorter reflow operations 2021-06-01 11:26:32 +01:00
Michael Telatynski b2f01b8438 Respect newlines in space topics 2021-06-01 10:48:53 +01:00
Germain Souquet 1a51ed9ffd Make breadcrumb animation run on the compositing layer 2021-05-28 09:34:08 +01:00
Michael Telatynski 59f4c728c9 Initial cut of Pinned event card in the right panel 2021-05-25 16:10:44 +01:00
Michael Telatynski a6adfde8e2
Merge pull request #6070 from matrix-org/t3chguy/fix/17360
Improve explore rooms when no results are found
2021-05-23 21:17:35 +01:00
Robin Townsend 332412782e Remove logo spinner
Removed since design wants to avoid associating slowness with the brand.

Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-20 17:31:10 -04:00
Michael Telatynski aa7ccc1420 Show prompt to create new room from room directory results 2021-05-19 20:07:54 +01:00
Michael Telatynski 7396ce76e5 Tweak the feedbacks a tad 2021-05-11 17:30:33 +01:00
Michael Telatynski 7de626824e Sprinkle some more feedback prompts in the spaces beta 2021-05-11 17:01:31 +01:00
Michael Telatynski 2e19c7fd24 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021
 Conflicts:
	src/components/views/spaces/SpaceCreateMenu.tsx
2021-05-11 13:40:28 +01:00
Michael Telatynski de04d82395 Switch to using forms for implicit submission 2021-05-11 10:01:40 +01:00
Michael Telatynski 1e6c6e9d80
Merge pull request #5983 from matrix-org/t3chguy/fix/16994
Improve style of notification badges on the space panel
2021-05-07 13:49:41 +01:00
Michael Telatynski a8c4aabb52 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021
 Conflicts:
	src/components/structures/SpaceRoomView.tsx
	src/i18n/strings/en_EN.json
2021-05-07 11:50:49 +01:00
Michael Telatynski 237399f13e fix button height inconsistency between Chrome & FF 2021-05-07 11:40:39 +01:00
Michael Telatynski 03ca7e0107 move notification dot on the space panel up by 1px 2021-05-07 10:22:56 +01:00
Michael Telatynski d2fc1c42b0 Improve style of notification badges on the space panel 2021-05-06 15:58:22 +01:00
Michael Telatynski d47eecbd24 Make button sizes more consistent and fix untrapped behaviour of join button leaking to parent 2021-05-06 13:05:58 +01:00
Michael Telatynski 90538c95aa Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021 2021-05-06 08:05:14 +01:00
Michael Telatynski 650933096a Iterate Spaces admin UX around room management 2021-05-05 17:25:29 +01:00
Michael Telatynski caa772348f Actually fix the layout bug without re-regressing the prior issue 2021-05-04 14:14:06 +01:00
Michael Telatynski 4489f8a6ea Fix hover behaviour of space invites 2021-05-04 14:01:26 +01:00
Michael Telatynski d14ea1bd58 Fix layout issue with expanded space panel 2021-05-04 14:01:10 +01:00
Michael Telatynski c5cbca7c57 Fix edge case with space panel alignment with subspaces on ff 2021-05-04 12:38:55 +01:00
Michael Telatynski 158a0f90cb Further design iteration 2021-04-29 22:02:18 +01:00
Michael Telatynski 279654cc9e Design iterations based on PR feedback 2021-04-29 16:08:59 +01:00
Michael Telatynski a4f02937cb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021
 Conflicts:
	res/css/structures/_SpaceRoomView.scss
	src/components/structures/SpaceRoomView.tsx
2021-04-29 09:52:21 +01:00
Michael Telatynski 9f8955fb6c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/16628
 Conflicts:
	src/components/views/dialogs/AddExistingToSpaceDialog.tsx
2021-04-28 22:49:36 +01:00
Michael Telatynski 1802adb4d2 Iterate styling and decoration for the beta prompts 2021-04-28 22:47:08 +01:00
Michael Telatynski c0f11fd316 Fix communities spaces beta card layout 2021-04-28 09:35:25 +01:00
Michael Telatynski 18a01d9271 Show spaces beta prompt when viewing a space without the beta 2021-04-28 08:41:31 +01:00
Michael Telatynski 4f02dc9050 delint 2021-04-27 17:19:34 +01:00
Michael Telatynski 46d35411b4 Add animated mx_BetaDot atop the legacy Communities button 2021-04-27 17:01:22 +01:00
Michael Telatynski c5f653245a Show Spaces beta card in Labs & My Communities view
the image is temporary
2021-04-27 16:29:42 +01:00
Michael Telatynski 489b4be6cf Fix space hierarchy css not applying as it should 2021-04-26 15:48:33 +01:00
Michael Telatynski 8656212eb9 Space creation prompt user to add existing rooms instead of creating new ones 2021-04-26 12:41:04 +01:00
Travis Ralston 82119ad595 Merge branch 'develop' into travis/error-states 2021-04-23 15:53:37 -06:00
Robin Townsend cc5a7671a7 Keep invite button separate from space info
60828913d2 caused the space info and
invite buttons to have no separation when you are the only person in a
space, since the margin was set on the face pile, which may be absent.

Signed-off-by: Robin Townsend <robin@robin.town>
2021-04-22 11:39:58 -04:00
Michael Telatynski d9dac7b261
Merge pull request #5898 from matrix-org/t3chguy/fix/16976
Iterate the spaces face pile design
2021-04-22 09:29:00 +01:00
Michael Telatynski c0f8098a86
Merge pull request #5890 from matrix-org/t3chguy/fix/17006
Fix alignment issue with nested spaces being cut off wrong
2021-04-22 08:32:54 +01:00
Michael Telatynski 90cd5d0472 Remove old redundant hover effect 2021-04-22 08:18:28 +01:00
Michael Telatynski 60828913d2 Iterate the spaces face pile design 2021-04-22 08:13:03 +01:00
Travis Ralston cc095c85bf Dark theme support 2021-04-21 16:24:17 -06:00
Travis Ralston 91b3688feb Redesign "failed to send messages" status bar 2021-04-21 16:24:17 -06:00
Michael Telatynski c30b62ef35 Fix alignment issue with nested spaces being cut off wrong 2021-04-20 11:12:47 +01:00
Šimon Brandner 548cd38a5c
Remove weird margin from the file panel
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-20 08:22:43 +02:00
J. Ryan Stinnett 495aff898f
Merge pull request #5864 from SimonBrandner/dont-render-msg-option
Render msgOption only if showReadReceipts is enabled
2021-04-15 17:24:13 +01:00
Šimon Brandner aad22903a7
Remove overflow: hidden
This line doesn't seem to do anything * shrug

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-15 18:02:48 +02:00
Travis Ralston eed5efdbe1 Labs: Add quick/cheap "do not disturb" flag
This just disables audio notifications and the popup, which is the easiest way to do "do not disturb" for a device. This needs spec changes to be done properly, as it's a shame that mobile devices for the user will still go off.

Disabling all of push doesn't sound ideal as it would potentially mean missing highlights for when leaving DND mode.
2021-04-15 00:47:09 -06:00
Šimon Brandner ba0384f381
Render msgOption only if showReadReceipts is enabled
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-14 11:43:42 +02:00
Michael Telatynski a00af446b3 Don't hide notification badge on the home space button as it has no context menu 2021-04-12 11:55:47 +01:00
Germain Souquet 0312b55007 Remove status area UI defects when in-call 2021-04-06 11:00:32 +01:00
Michael Telatynski 83612dd4ad
Merge pull request #5792 from matrix-org/t3chguy/spaces4.12
Fixing spaces papercuts
2021-03-26 15:01:31 +00:00
Michael Telatynski af18019314 Final spaces tweaks for the demo 2021-03-26 13:46:01 +00:00
Michael Telatynski eff0e6fcc3 Add facepile to Space landing page and tweak layout slightly 2021-03-26 13:11:57 +00:00
Michael Telatynski d10241b1c4 Fix misalignment on the room search input caused by a 1px transparent border 2021-03-26 13:10:44 +00:00
J. Ryan Stinnett 5f70c625ab
Merge pull request #5807 from matrix-org/jryans/tweak-cs-text
Tweak cross-signing copy
2021-03-26 12:12:25 +00:00
J. Ryan Stinnett fd59a66523 Tweak cross-signing copy
This makes some Design-approved copy tweaks to the recent cross-signing flow
changes.
2021-03-26 11:13:39 +00:00
Michael Telatynski 8c6d92cc99 Move space room discovery & management into the space room view 2021-03-26 09:54:15 +00:00
Michael Telatynski 4df197ac61 Tweak layout of the space room directory for better legibility 2021-03-25 14:09:56 +00:00
Panagiotis aa1f468235 fix: room id sticked with event id 2021-03-25 14:36:40 +02:00
Michael Telatynski b6a57f73c6 Tweak border colours in spaces 2021-03-25 12:17:39 +00:00
Michael Telatynski 20ea1436fc Update iconography for spaces 2021-03-24 19:43:33 +00:00
Michael Telatynski ee5d0d6842 Fix alignment bug with space panel on spaces with subspaces in Chrome 2021-03-24 17:05:21 +00:00
Michael Telatynski f7a3805eed Fix styling inconsistency in space room view 2021-03-24 14:02:25 +00:00
Michael Telatynski fb46815b6a Spaces move away from Form Buttons 2021-03-24 13:15:31 +00:00
Michael Telatynski 03ab2dc8e0
Merge pull request #5776 from matrix-org/t3chguy/spaces4.10
Improve discovery of rooms in a space
2021-03-22 13:24:23 +00:00
Michael Telatynski 1fbbb67e74 Consolidate button styles in Space creation flows 2021-03-19 13:20:30 +00:00
Michael Telatynski 31ce19373b Fix space panel spacings 2021-03-19 13:20:30 +00:00
Michael Telatynski d04c8b3fb4 Improve discovery of rooms in a space 2021-03-19 11:54:10 +00:00
Michael Telatynski 17399c6be6
Merge pull request #5764 from matrix-org/t3chguy/spaces4.9
Fix left panel resizing and lower min-width improving flexibility
2021-03-18 11:34:55 +00:00
Michael Telatynski 0ce78f469f
Merge pull request #5761 from matrix-org/t3chguy/spaces4.8
Iterate space panel visually and functionally
2021-03-16 17:41:14 +00:00
Michael Telatynski 5ce3a05867
Update _SpacePanel.scss 2021-03-16 16:34:28 +00:00
Michael Telatynski 688407abe6
Merge branch 'develop' into t3chguy/spaces4.9 2021-03-16 11:14:38 +00:00
Michael Telatynski 11cd791c76 Tweak left panel min widths for better flexibility 2021-03-16 11:13:39 +00:00
Michael Telatynski baaceccfda Rearrange dom hierarchy to put space panel at same level as LeftPanel
so they don't steal horizontal space from each other
2021-03-16 11:13:39 +00:00
Michael Telatynski 62983ca48e Fix space panel alignments when no scrollbar is present 2021-03-15 12:57:35 +00:00
Michael Telatynski f9eace1729 Rebuild alignment of the menu buttons and notification badges 2021-03-15 11:59:46 +00:00
Travis Ralston 4811154f25 Remove now-unused assets and CSS from CompleteSecurity step 2021-03-12 15:24:16 -07:00
Michael Telatynski 6210614ce7 Rebuild space panel layout to resolve weirdness with selections and nesting 2021-03-12 17:37:15 +00:00
Michael Telatynski 081e745417
Merge pull request #5751 from matrix-org/t3chguy/spaces4.7
Rebuild space previews with new designs
2021-03-11 14:06:31 +00:00
Michael Telatynski 6d81634eec Rebuild space previews with new designs 2021-03-11 11:49:43 +00:00
Michael Telatynski 98338f1505
Merge pull request #5736 from matrix-org/t3chguy/spaces4.5
Spaces suggested rooms support
2021-03-10 10:56:17 +00:00
Michael Telatynski 3ac4cb49fc Tweak styling of manage rooms in space ux 2021-03-09 14:16:29 +00:00
J. Ryan Stinnett d33acaac95
Merge pull request #5713 from panoschal/improve-view-source
Display decrypted and encrypted event source on the same dialog
2021-03-09 11:36:53 +00:00
Travis Ralston 08072aca9a Add upload icon, fix cancel button, refresh styles 2021-03-05 14:42:15 -07:00
Travis Ralston 711181cc69 Rough style for new upload bar
This repurposes ProgressBar which was not used anywhere in code.
2021-03-05 14:14:43 -07:00
Travis Ralston 676259e78c
Merge pull request #5505 from SimonBrandner/improve-file-drop-ui
File drop UI fixes and improvements
2021-03-04 20:30:45 -07:00
Panagiotis 6d792cc08c feat: use <details> to hide encrypted block 2021-03-03 23:48:39 +02:00
Panagiotis ae08f74336 feat: improve "view source"
display encrypted and decrypted event source on the same dialog
keep only one "View Source" action on event context menu
2021-03-03 22:38:30 +02:00
Michael Telatynski 43cc7deeda Show hierarchy of auto_join rooms in the space view 2021-03-02 14:37:28 +00:00
Michael Telatynski 716268b2f9 Add context menu to spaces in the space panel 2021-03-02 14:35:29 +00:00
Michael Telatynski faf7a4b8bc Initial Space room directory view 2021-03-02 14:14:50 +00:00
Michael Telatynski e479edd47a Add an add existing room to space CTA to Space View 2021-03-02 13:34:53 +00:00
Michael Telatynski a687b9883c Add a create room in space CTA to Space View 2021-03-02 13:29:34 +00:00
Michael Telatynski ab4b7b73ea Add a basic Space Settings view 2021-03-02 13:26:00 +00:00
Michael Telatynski 926e226a78 Add Invite CTA to Space View 2021-03-02 10:12:49 +00:00
Michael Telatynski 8efe7dcaa1 Decorate Right Panel cards with Space header for when viewing it in that context 2021-03-02 09:54:32 +00:00
Michael Telatynski c10512fd56 Initial SpaceRoomView work 2021-03-01 18:53:11 +00:00
Michael Telatynski 483d56320c Beginning of space creation UX from space panel 2021-03-01 17:47:40 +00:00
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