Commit Graph

673 Commits (48bd6583ed3e1431a995074dcb50ca47146f61a0)

Author SHA1 Message Date
Michael Telatynski 93010d34fd
Merge branch 'develop' into t3chguy/fix/6606 2021-06-03 19:33:09 +01:00
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
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