Commit graph

635 commits

Author SHA1 Message Date
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
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