mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-27 03:36:07 +03:00
Code Issues Projects Releases Packages Wiki Activity
42314 commits 215 branches 561 tags 411 MiB
Commit graph

903 commits

Author SHA1 Message Date
Oliver Pham
ab835c0e0d
Merge branch 'matrix-org:develop' into issue-19180 2021-10-05 10:15:11 -04:00
Phu Thong Pham
70106f979e Fix text overflows button on Home page 2021-10-05 10:11:25 -04:00
Faye Duxovni
651e943b31 Merge branch 'develop' into fayed/fix-verification-dialog 2021-10-05 08:48:52 -04:00
Faye Duxovni
9a16b4636f Make cross-signing dialog clearer and more context-aware 
- Don't show loading spinners while waiting for user action
- When checking if there are other devices we can verify against, only
  look for devices that are actually cross-signed.
- Adjust displayed options depending on whether other devices and/or
  recovery keys exist, and add an option to reset cross-signing keys
  if necessary.
- Various minor clarifying adjustments to UI styling/text

Signed-off-by: Faye Duxovni <fayed@element.io>
 2021-10-05 00:54:20 -04:00
Šimon Brandner
8a9c493f3a
Use correct color for a selected room in the 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-10-01 20:40:18 +02:00
Dariusz Niemczyk
17f59131d8
Merge pull request #6868 from SimonBrandner/task/colors-3-mk2 
Color clean-up #3 mk2
 2021-10-01 11:04:15 +02:00
Travis Ralston
77ad0a9142
Merge pull request #6699 from SimonBrandner/fix/improve-aux-panel/18787 
Improve AUX panel behaviour
 2021-09-27 10:16:05 -06:00
Šimon Brandner
42d332ce41
Fix Toast container color 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-27 08:59:33 +02:00
J. Ryan Stinnett
7071092fa4
Merge pull request #5555 from 2580ayush2580/ayush25802 
Improve room directory UX for mobile devices
 2021-09-21 11:44:07 +01:00
Michael Telatynski
e17318a364 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 2021-09-16 10:05:20 +01:00
Michael Telatynski
6672be91a1 Simplify Space Panel layout 2021-09-14 15:00:44 +01:00
Michael Telatynski
80fd960304 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 2021-09-10 09:53:04 +01:00
Michael Telatynski
82cd7acdae Use cursor:pointer on space panel buttons 2021-09-09 11:40:43 +01:00
Michael Telatynski
29b4ba6675 Use new SCSS vars 2021-09-08 15:30:19 +01:00
Michael Telatynski
a688e5b8b3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 
 Conflicts:
	src/components/structures/LoggedInView.tsx
	src/stores/SpaceStore.tsx
 2021-09-06 11:41:09 +01:00
Dariusz Niemczyk
1e50246a78
Merge pull request #6636 from matrix-org/palid/fix/forgot-password-ux 
Make ForgotPassword UX slightly more user friendly
 2021-09-06 10:55:25 +02:00
Šimon Brandner
54cd385e6d
Improve AUX panel behaviour 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-27 13:31:43 +02:00
Dariusz Niemczyk
fc1dd51046
Fix commit edit history 
Fix https://github.com/vector-im/element-web/issues/18742
 2021-08-26 15:05:35 +02:00
Travis Ralston
49453f2d49
Merge pull request #6604 from SimonBrandner/task/colors-2 
Color de-duplication #2
 2021-08-24 12:37:18 -06:00
Dariusz Niemczyk
a62717ed85
Force a new layer for backdrop panel 2021-08-24 19:23:12 +02:00
Dariusz Niemczyk
4cd79e30af
Improve layering for chat 
Currently we have a lot of unnecessary layers being created in the app,
which is extremely problematic on Windows when using Chrome, as it
deoptimises fonts rendering due to layers mismatch; chrome's algorithm
can't figure out if the layers won't resize or overlap so it creates a
lot of additional layers, which has a side effect of turning off
sub-pixel antialiasing on Windows.
This is a first step to improve the layering in the entire app.
 2021-08-24 19:22:35 +02:00
Dariusz Niemczyk
1e1fc64769
Fix breadcrumbs overflowing left-panel 2021-08-24 16:06:20 +02:00
Dariusz Niemczyk
a93d5cde09
Simplify rendering to css-only 2021-08-24 14:38:39 +02:00
Dariusz Niemczyk
0746fab09d
Make stylelint happy 2021-08-24 14:23:30 +02:00
Dariusz Niemczyk
a5c005756e
Fix resizer on left panel 2021-08-24 13:05:46 +02:00
Dariusz Niemczyk
e2c55c61f3
Fix difficult to grab scrollbar 
Fixes https://github.com/vector-im/element-web/issues/18689
 2021-08-24 09:37:33 +02:00
Šimon Brandner
bf87413442
Revert "$roomlist-header-color -> $tertiary-content" 
This reverts commit 25a3a8ddfd.
 2021-08-24 09:02:17 +02:00
Šimon Brandner
8aacd968c7
Remove comment 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-24 09:00:49 +02:00
Šimon Brandner
a5f6a2dd64
Remove comment 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-24 08:57:54 +02:00
Šimon Brandner
b6ea75b681
Merge remote-tracking branch 'upstream/develop' into task/colors-2 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-24 08:57:12 +02:00
Travis Ralston
15c731d574
Merge pull request #6507 from matrix-org/t3chguy/fix/18089 
Allow pagination of the space hierarchy and use new APIs
 2021-08-23 15:51:34 -06:00
Dariusz Niemczyk
6205cbbdec
Merge pull request #6659 from matrix-org/palid/fix/backdrop-blur 
Optimize background image from avatar on left panel
 2021-08-23 20:05:49 +02:00
Dariusz Niemczyk
618cc70cbd
Make stylelint happy 2021-08-23 19:43:08 +02:00
Dariusz Niemczyk
e54191f6b0
Move background-blur to fully css version 2021-08-23 19:26:57 +02:00
Dariusz Niemczyk
01eda5158b
Revert "Make the background-blur always 100%" 
This reverts commit e8c974a71e.
 2021-08-23 17:39:06 +02:00
Dariusz Niemczyk
e8c974a71e
Make the background-blur always 100% 2021-08-23 17:30:02 +02:00
Dariusz Niemczyk
7dfe57833a
Fix GroupFilterPanel not having proper backdrop 2021-08-23 16:57:24 +02:00
Dariusz Niemczyk
ca92101c72
Optimize and rewrite backdrop rendering 2021-08-23 16:20:21 +02:00
Dariusz Niemczyk
9a3a5a7e63
Fix spaces preview screen 2021-08-21 10:47:34 +02:00
Dariusz Niemczyk
d9b79888fd
Fix content not being centered 2021-08-20 18:15:57 +02:00
Dariusz Niemczyk
86b6c6a836
Fix room views not having proper container 2021-08-20 16:32:56 +02:00
Dariusz Niemczyk
67ce081510
Fix one line too much in scss 2021-08-20 13:04:45 +02:00
Dariusz Niemczyk
f5a284a1f0
Fix flex values after blur changes 2021-08-19 16:10:09 +02:00
Dariusz Niemczyk
8fe28fe864
Update res/css/structures/auth/_Login.scss 
Co-authored-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-19 09:19:02 +02:00
Dariusz Niemczyk
b9604d1fb5
Make ForgotPassword UX slightly more user friendly 2021-08-19 09:12:52 +02:00
Dariusz Niemczyk
e83722e9d9
Fix missing background color in GroupFilterPanel 2021-08-18 13:56:19 +02:00
Dariusz Niemczyk
3fd95ad374
Fix missing coma 2021-08-17 19:09:58 +02:00
Dariusz Niemczyk
eb242041a5
Fix missing background tonality without avatar 2021-08-17 18:56:19 +02:00
Dariusz Niemczyk
515fc244b6
Revert useless change 2021-08-17 18:00:39 +02:00
Dariusz Niemczyk
de2eb5b6dd
Satisfy linter 2021-08-17 17:59:26 +02:00
Dariusz Niemczyk
2ee26d0681
Make the blur as-close to the css one as possible 2021-08-17 17:47:40 +02:00
Dariusz Niemczyk
a999cad49d
Properly cache blur effect 2021-08-17 16:07:17 +02:00
Dariusz Niemczyk
a2797795b2
Add proper glass-like look 2021-08-16 16:52:41 +02:00
Dariusz Niemczyk
bad37e65db
Add missing position:relative; 2021-08-16 16:52:32 +02:00
Dariusz Niemczyk
582b5c90a4
Properly sepearate left column from timeline 2021-08-16 14:26:21 +02:00
Michael Telatynski
9d909dcdf8 tweaks 2021-08-13 15:44:43 +01:00
Dariusz Niemczyk
5f9b55eaa9
Merge remote-tracking branch 'origin/develop' into gsouquet/fix-backdrop-filter 
* origin/develop: (1278 commits)
  Add a little padding
  Keep number field in focus when pressing dialpad buttons (#6520)
  Remove old version
  Fix video call persisting when widget removed
  Update link to matrix-js-sdk CONTRIBUTING file (#6557)
  $toast-bg-color -> $system
  $system-... -> $system
  Iterate PR based on feedback
  Remove unnecessary code
  Use AccessibleTooltipButton
  Just upload the PR object itself
  Edit PR Description instead of commenting
  publish the right directory
  Fix Netflify builds from fork PRs
  This doesn't need to be here as it was moved into CallViewButtons
  Make scrollbar dot transparent
  Iterate PR based on feedback
  Don't set hidden RRs labs setting at account level
  Add a comment for weirdly placed div
  Add full class names to animations.scss
  ...
 2021-08-13 15:12:07 +02:00
Šimon Brandner
25a3a8ddfd
$roomlist-header-color -> $tertiary-content 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 17:19:31 +02:00
Šimon Brandner
4604d817c4
$roomlist-filter-active-bg-color -> $background 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 17:19:31 +02:00
Šimon Brandner
8b59bf3d18
$tertiary-fg-color -> $tertiary-content 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 17:19:29 +02:00
Šimon Brandner
10bc85724a
$secondary-fg-color -> $secondary-content 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 17:19:26 +02:00
Šimon Brandner
e5fd19c332
$primary-fg-color -> $primary-content 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 17:18:18 +02:00
Šimon Brandner
2afee596a9
$primary-bg-color -> $background 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 17:17:34 +02:00
Šimon Brandner
7ce88c9966
$toast-bg-color -> $system 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 16:20:30 +02:00
Michael Telatynski
57bf64bd28 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 
 Conflicts:
	src/components/views/spaces/SpacePanel.tsx
 2021-08-12 12:05:55 +01:00
Michael Telatynski
85b1f166e8 post-merge tidy up 2021-08-12 12:03:14 +01:00
Michael Telatynski
0a209afdc2 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18089 
 Conflicts:
	res/css/structures/_SpaceHierarchy.scss
	src/components/structures/SpaceHierarchy.tsx
	src/i18n/strings/en_EN.json
 2021-08-12 11:41:03 +01:00
Michael Telatynski
228d623024
Merge pull request #6543 from matrix-org/t3chguy/fix/18092 2021-08-12 11:28:14 +01:00
Michael Telatynski
9d3569a577 Iterate PR based on feedback 2021-08-12 10:58:56 +01:00
Michael Telatynski
d74e9c4f90 Remove impossible space hierarchy size string 2021-08-11 16:47:14 +01:00
Michael Telatynski
be85dcd1bf Delabs Spaces, keeping it as a default-on preference for the time being 2021-08-11 14:52:40 +01:00
Michael Telatynski
f98de18427 Add blue beta dot to the space panel create button 2021-08-10 16:45:56 +01:00
Michael Telatynski
1272b375d5 Tweak space panel new/cancel button colouring 2021-08-10 16:45:21 +01:00
Michael Telatynski
0f49fe92c6 iterate spaces treeview stuff 2021-08-09 14:01:34 +01:00
Michael Telatynski
41475a3b94 fix keyboard focus issue around the space hierarchy 2021-08-06 14:12:55 +01:00
Michael Telatynski
2d3211ccf6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18092 2021-08-04 12:14:29 +01:00
Michael Telatynski
a6e5112be0 Offer a way to create a space based on existing community 2021-08-04 10:37:35 +01:00
Šimon Brandner
d479373af9
Merge remote-tracking branch 'upstream/develop' into feature/incoming-call-toast 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-04 09:21:45 +02:00
Michael Telatynski
9eb0986353 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18089 
 Conflicts:
	src/i18n/strings/en_EN.json
 2021-07-30 11:34:52 +01:00
Michael Telatynski
259627fba2 Clean up SpaceHierarchy 2021-07-30 11:01:49 +01:00
Michael Telatynski
02dbdc5c0a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18093 
 Conflicts:
	src/components/views/spaces/SpaceTreeLevel.tsx
	src/dispatcher/actions.ts
	src/i18n/strings/en_EN.json
 2021-07-29 16:11:16 +01:00
Michael Telatynski
9fb1c8e4cd Iterate PR 2021-07-28 19:33:07 +01:00
Michael Telatynski
ac800ad94d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18093 2021-07-28 19:24:26 +01:00
Michael Telatynski
a5606c72de Update feedback prompt to match designs 2021-07-28 17:56:57 +01:00
Michael Telatynski
6123ccb2eb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096 2021-07-28 17:45:15 +01:00
Michael Telatynski
67ef263940 Refactor SpaceButton to be more reusable and add context menu to Home button 2021-07-28 17:40:33 +01:00
Michael Telatynski
0c79aec19d Fix broken layout of the space hierarchy view 
Not sure what this min-height was trying to achieve but removing it prevents the grid layout collapsing on itself
 2021-07-27 13:09:43 +01:00
Šimon Brandner
7ed5dee74b
Make colors a bit clearer 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-26 13:17:06 +02:00
Šimon Brandner
277fdf1711
voipcall-plinth-color -> quinary-content-color 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-26 12:42:18 +02:00
Michael Telatynski
1ba601ba22 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096 
 Conflicts:
	src/components/structures/SpaceRoomView.tsx
	src/components/views/dialogs/BetaFeedbackDialog.tsx
 2021-07-23 18:28:21 +01:00
Michael Telatynski
dec2c48155 remove unused import and revert removing some needed css 2021-07-23 15:56:00 +01:00
Michael Telatynski
1d1a396c1f get rid of spurious hr 2021-07-23 15:51:59 +01:00
Michael Telatynski
9c7fa71a4a Remove spaces beta feedback prompts except a couple more strategic ones 2021-07-23 15:07:24 +01:00
Michael Telatynski
2b133deb63 fix scroll behaviour to match that of prior to the spinner fix 2021-07-23 12:19:54 +01:00
Michael Telatynski
4a4ec596bd Fix position of the space hierarchy spinner 2021-07-23 11:27:00 +01:00
Germain Souquet
02b08888b5 Use modern layout in file and notification panel 2021-07-22 16:00:41 +02:00
Travis Ralston
097cc858ce Remove hover effect from files in the files panel 2021-07-19 10:07:16 -06:00
Andrew Morgan
f4788a6427
Add dialpad to transfer dialog + various dialpad UI improvements (#6363) 
Co-authored-by: Germain <germain@souquet.com>
Co-authored-by: Andrew Morgan <andrew@amorgan.xyz>
Co-authored-by: David Baker <dbkr@users.noreply.github.com>
 2021-07-15 09:55:58 +01:00
Germain Souquet
8f345dc1ba Rework backdrop to draw one image with two different level of blur 2021-07-12 13:51:46 +02:00
Germain Souquet
edae9a4844 Merge branch 'develop' into gsouquet/fix-backdrop-filter 2021-07-06 10:19:25 +02:00
Germain Souquet
a22baa1b2b move file drop image animation to compositor 2021-07-02 15:23:27 +01:00
Germain Souquet
a093ea6357 Move RightPanel animation to compositor 2021-07-02 15:23:03 +01:00
Germain Souquet
fdced3da1b Remove reminescent references to the tinter 2021-06-30 08:09:55 +01:00
Germain Souquet
4cfdad8aa2 Add spacing between toast buttons with cross browser support in mind 2021-06-29 11:59:13 +01:00
Michael Telatynski
1d374f6cbb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17731 2021-06-25 14:50:24 +01:00
Michael Telatynski
2e940b7763
Update res/css/structures/_RoomStatusBar.scss 
Co-authored-by: Germain <germain@souquet.com>
 2021-06-25 14:47:17 +01:00
Germain Souquet
5932b93325 make backdrop closer to what is happening in production 2021-06-25 14:09:49 +01:00
Andrew Morgan
a8e2c1bc2a
Move the dial pad button next to Explore button from Create Room context menu (#6237) 
This commit moves the dial pad from a context menu to sit right by the explore button, in line with the designs in the linked issue. The dial pad button is only shown when PSTN support is detected.
 2021-06-25 11:45:15 +01:00
Germain Souquet
6d293d1092 Merge branch 'develop' into gsouquet/fix-backdrop-filter 2021-06-25 09:43:54 +01:00
Germain Souquet
652ad3617d Backdrop filter compatibility for Firefox and Safari 2021-06-25 09:20:03 +01:00
Germain Souquet
27ee7c5836 Move backdrop filter to a canvas based solution 2021-06-24 17:51:11 +01:00
Michael Telatynski
5d93216c94 Decrease e2e shield fill mask size so that it doesn't overlap 2021-06-23 16:10:47 +01:00
Michael Telatynski
cdb97d5494 Fix trashcan.svg by exporting it with its viewbox 
then fix sizing and alignment of consumers
 2021-06-23 12:30:23 +01:00
Michael Telatynski
6e3c647109 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282 
 Conflicts:
	package.json
	src/components/views/spaces/SpacePanel.tsx
	src/i18n/strings/en_EN.json
	src/stores/SpaceStore.tsx
	yarn.lock
 2021-06-22 21:15:53 +01:00
Germain Souquet
adb42b7927 Deprecate FormButton to use AccessibleButton everywhere 2021-06-21 14:16:37 +01:00
Michael Telatynski
f8eea2ae23 Fix word wrap in space descriptions 2021-06-14 22:18:02 +01:00
Michael Telatynski
66fce64ee0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282 
 Conflicts:
	package.json
	yarn.lock
 2021-06-14 21:39:06 +01:00
Michael Telatynski
801b5f9c1a
Merge pull request #6155 from matrix-org/t3chguy/spacesteammatewarning 
Add warning to private space creation flow
 2021-06-07 22:21:07 +01:00
J. Ryan Stinnett
a895b083a2 Fix notif panel timestamp padding 
This restores some space around the timestamp in the notif panel. We were
previously relying somewhat randomly on the presence on empty flair elements to
create space.

Fixes https://github.com/vector-im/element-web/issues/17580
 2021-06-07 16:21:53 +01:00
Michael Telatynski
f3aa505673 Add warning to private space creation flow 2021-06-07 14:14:31 +01:00
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
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