Commit graph

3800 commits

Author SHA1 Message Date
Michael Telatynski
41475a3b94 fix keyboard focus issue around the space hierarchy 2021-08-06 14:12:55 +01:00
Michael Telatynski
381108a9c2
Merge pull request #6227 from SimonBrandner/feature/copy-version/17603 2021-08-06 12:56:38 +01:00
Dariusz Niemczyk
35386078a4
Post-merge changes 2021-08-06 13:25:27 +02:00
Dariusz Niemczyk
3b002c4c1f
Merge remote-tracking branch 'origin/develop' into jitsi-picture-in-picture
* origin/develop: (100 commits)
  Add comments to isRegionalIndicator
  Stop voice messages that are playing when starting a recording
  Properly set style attribute on shared usercontent iframe
  Fix in-call context menus when in PiP mode (#6552)
  Extract tooltipYOffset to a const
  Increase yOffset by 4px away
  i18n
  Post-merge conflict resolution and improve alignment of tooltips
  Fix image & blurhash info when skipping thumbnail due to thresholds
  Skip sending a thumbnail if it is not a sufficient saving over the original
  Null guard space inviter to prevent the app exploding
  Remove seams from pin icon
  Appease Jest
  Fix worklet reference for new webpack pipeline
  i18n
  Update copy
  Fix wrong cursor being used in PiP
  Fix voice feed cut-off
  Use flex-start as it has more universal support
  Wrap cases in {}
  ...
2021-08-06 13:25:14 +02:00
Benedikt Tissot
02be0fd300 allow customizing the bubble layout colors
- correct fallback values in the _legacy_dark.scss files
- read variables to override default values
2021-08-06 13:10:33 +02:00
Michael Telatynski
f7818e0169 iterate PR based on feedback 2021-08-06 12:05:14 +01:00
Michael Telatynski
64995dfae7 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18092 2021-08-06 11:39:24 +01:00
Šimon Brandner
6afd75ac3c
Update/fix licenses
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-06 10:40:26 +02:00
Šimon Brandner
25c6b216b0
Move LayoutSwitcher CSS to a separate file
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-06 10:37:42 +02:00
Šimon Brandner
b1fe59eea3
Revert changes which didn't make much sense and remove some comments
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-06 08:34:46 +02:00
Šimon Brandner
3677d0c5f2
Merge remote-tracking branch 'upstream/develop' into feature/improved-composer 2021-08-06 08:02:28 +02:00
Šimon Brandner
6e688b3c3a
Merge remote-tracking branch 'upstream/develop' into public-e2ee-warn 2021-08-06 07:53:07 +02:00
Šimon Brandner
4f0c800cad
Merge remote-tracking branch 'upstream/develop' into feature/improved-composer
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-06 07:45:17 +02:00
Travis Ralston
27d7daeceb
Merge pull request #6550 from SimonBrandner/fix/voice-cutoff
Fix voice feed being cut-off
2021-08-05 15:46:42 -06:00
Travis Ralston
9ad72d6daf
Merge pull request #6549 from SimonBrandner/fix/dont-use-start
Use `flex-start` instead of `start`
2021-08-05 15:46:12 -06:00
Travis Ralston
4dcf2c7038
Merge pull request #6498 from SimonBrandner/fix/screen-picker-sizing/18281
Fix sizing issues of the screen picker
2021-08-05 15:39:12 -06:00
Travis Ralston
280c017238
Merge pull request #6530 from matrix-org/travis/voice-messages/uploading
Improve voice messages uploading state
2021-08-05 08:36:53 -06:00
Travis Ralston
51bd740936
Merge pull request #6538 from matrix-org/travis/voice-messages/ui-polish-aug3-21
Polish up more of the voice messages UI
2021-08-05 08:34:31 -06:00
Šimon Brandner
443db125a9
Merge remote-tracking branch 'upstream/develop' into fix/replies-bubble/18184
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-05 14:36:55 +02:00
Šimon Brandner
efeae3a84c
Top align the avatar
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-05 13:39:39 +02:00
Šimon Brandner
5fa6ef83d2
Fix button alighnment
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-05 12:35:44 +02:00
Šimon Brandner
9e4f5719a4
Handle narrow layouts
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-05 11:47:58 +02:00
Robin Townsend
5e3b79eeca Remove seams from pin icon
Signed-off-by: Robin Townsend <robin@robin.town>
2021-08-04 18:42:47 -04:00
Germain
7b8a43bd2b
Merge pull request #6551 from SimonBrandner/fix/pip-cursor/18383
Fix wrong cursor being used in PiP
2021-08-04 16:41:49 +01:00
Šimon Brandner
91b4b50969
Fix wrong cursor being used in PiP
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 17:25:12 +02:00
Šimon Brandner
e2bc76a129
Fix voice feed cut-off
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 17:17:21 +02:00
Šimon Brandner
fe643b2401
Use flex-start as it has more universal support
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 17:09:48 +02:00
Germain
724c67bc21
Merge pull request #6548 from robintown/fix-fallback-fonts
Fix fallback fonts
2021-08-04 16:00:22 +01:00
Robin Townsend
5877e936c0 Fix fallback fonts
Signed-off-by: Robin Townsend <robin@robin.town>
2021-08-04 09:24:18 -04: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
Germain Souquet
b4b788e8d5 Fix right margin for events on IRC layout
Fixes vector-im/element-web#18354
2021-08-04 11:21:52 +02:00
Šimon Brandner
c89560691d
Some de-duplication for the light theme
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 10:29:16 +02:00
Šimon Brandner
3c12a5a995
Some de-duplication for the dark theme
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 10:29:16 +02:00
Šimon Brandner
fbb79a17e3
Add Figma colors to light theme
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 10:29:15 +02:00
Šimon Brandner
bc701a182b
Add Figma colors to dark theme
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 10:29:15 +02: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
Šimon Brandner
ca94518de5
Improve bubble colors
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 08:46:09 +02:00
Šimon Brandner
050e260655
Fix weird spacing
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 08:45:58 +02:00
Šimon Brandner
7fc632d0cf
Put font names into "" so that stylelint shuts up about them
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 08:42:07 +02:00
Šimon Brandner
8f3bdf7dad
Merge remote-tracking branch 'upstream/develop' into fix/bubble-bg-color/18081 2021-08-04 08:12:27 +02:00
Travis Ralston
24da0291a0 Re-center recording LED
Fixes https://github.com/vector-im/element-web/issues/18375
2021-08-03 13:34:04 -06:00
Travis Ralston
7b565db02d Update uploading state designs 2021-08-03 12:52:21 -06:00
Dariusz Niemczyk
3ab54bce6e
Move CallViewHeader css to separate file 2021-08-03 15:21:14 +02:00
James Salter
1b87ffb7cb
Merge pull request #6527 from SimonBrandner/fix/font-topic/18339
Fix the wrong font being used in the room topic field
2021-08-03 10:06:58 +01:00
Travis Ralston
c5d11a9f17 Improve voice messages uploading state
Fixes https://github.com/vector-im/element-web/issues/18226
Fixes https://github.com/vector-im/element-web/issues/18224
2021-08-02 23:29:46 -06:00
David Baker
3ea0571c5f
Merge pull request #6486 from SimonBrandner/feature/muting
Show an avatar/a turned off microphone icon for muted users
2021-08-02 17:20:55 +01:00
Šimon Brandner
2dc13dedf0
Fix font
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-02 15:38:45 +02:00
Šimon Brandner
9ef70f027e
Make the version box smaller
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-02 11:36:53 +02:00
Šimon Brandner
44258fd278
Merge remote-tracking branch 'upstream/develop' into feature/copy-version/17603 2021-08-02 11:32:57 +02:00
Andrew Morgan
442992b30e
Fix symbol entry in the in-call dialpad (#6521)
The field had RTL direction set on it, which meant symbols, like *,
appeared at the beginning of the field instead of the end.

RTL was introduced in
https://github.com/matrix-org/matrix-react-sdk/pull/5786,
however its removal seems to have had no adverse affects
from testing.
2021-08-02 10:18:17 +01:00
Travis Ralston
dd53324981
Merge pull request #6509 from matrix-org/travis/voice-messages/download-2
Improve download interactions
2021-07-30 10:50:27 -06:00
Jano Garcia
27e432df4b
Merge pull request #6513 from matrix-org/jano/fix-link-decoration
Fix inconsistent styling for links on hover
2021-07-30 14:08:15 +02:00
Michael Telatynski
42d6afd4b1
Merge pull request #6497 from matrix-org/t3chguy/fix/18093 2021-07-30 12:25:44 +01: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
janogarcia
adfbcdce40 Fix the inconsistent styling between non-markdown and markdown parsed links on hover.
It also improves accessibility by not relying exclusively on color for the hover state. That is even more evident for links that are contained within a parent block link (e.g., a quoted message block linking to the source message).

https://webaim.org/techniques/hypertext/link_text#underlining
2021-07-30 09:54:28 +02:00
Germain Souquet
11322b8999 Appease linter 2021-07-30 09:19:34 +02:00
Germain
375f7b670a
Merge branch 'develop' into gsouquet/fix-18144 2021-07-30 08:10:15 +01:00
Travis Ralston
fb89b45c06 Unify and improve download interactions
With help from Palid.

This does two major things:
1. Makes the tile part of a file body clickable to trigger a download.
2. Refactors a lot of the recyclable code out of the DownloadActionButton in favour of a utility. It's not a perfect refactoring, but it sets the stage for future work in the area (if needed).

The refactoring still has a heavy reliance on being supplied an iframe, but simplifies the DownloadActionButton and a hair of the MFileBody download code. In future, we'd probably want to make the iframe completely managed by the FileDownloader rather than have it only sometimes manage a hidden iframe.
2021-07-29 15:36:50 -06: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
94af6db201
Merge pull request #6424 from matrix-org/t3chguy/fix/18071 2021-07-29 15:57:26 +01:00
Michael Telatynski
3ee8f607c0 Switch dropdown out for radio interaction when leaving space 2021-07-29 15:50:18 +01:00
Michael Telatynski
493cd01ed3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18071
 Conflicts:
	res/css/views/dialogs/_AddExistingToSpaceDialog.scss
	src/utils/space.tsx
2021-07-29 15:22:52 +01:00
Michael Telatynski
efd8a2f9b0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096
 Conflicts:
	src/components/structures/SpaceRoomView.tsx
	src/components/views/spaces/SpaceCreateMenu.tsx
	src/i18n/strings/en_EN.json
2021-07-29 15:16:53 +01:00
Michael Telatynski
f69b4549dd Re-add top border stroke in space create menu 2021-07-29 15:13:02 +01:00
Germain
dac3eda9e3
Merge pull request #6499 from matrix-org/gsouquet/fix-18195
Prevent timeline flickering on hover
2021-07-29 14:33:34 +01:00
Šimon Brandner
cb89dd408c
Use mic mute icons
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-29 15:05:26 +02:00
Michael Telatynski
ab56a16907
Merge pull request #6458 from matrix-org/t3chguy/fix/18091 2021-07-29 13:20:19 +01:00
Michael Telatynski
56cd0e1c4f Merge branch 't3chguy/fix/18091' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18089
 Conflicts:
	src/components/structures/SpaceRoomDirectory.tsx
2021-07-29 12:52:01 +01:00
Germain
3bd393f16b
Merge pull request #6501 from matrix-org/gsouquet/fix-18249
Restore pointer cursor for SenderProfile in message bubbles
2021-07-29 12:20:56 +01:00
Germain Souquet
6c68f779ec Restore pointer cursor for SenderProfile in message bubbles 2021-07-29 11:58:32 +02:00
Germain Souquet
9c4101fa89 Align event list summary read receipts when using message bubbles 2021-07-29 11:48:22 +02:00
Germain Souquet
78a9117598 Prevent timeline flickering on hover 2021-07-29 11:12:07 +02:00
Germain Souquet
e140dd6ba1 Merge branch 'develop' into gsouquet/fix-18132 2021-07-29 10:27:00 +02:00
Šimon Brandner
152168ef2d
Add mic mute icons
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-29 10:20:59 +02:00
Germain Souquet
ee7f3c000d Merge branch 'develop' into gsouquet/fix-18144 2021-07-29 10:04:47 +02:00
Šimon Brandner
f16b1d46b7
Fix sizing issue of the screen picker
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-28 20:58:24 +02: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
40493634ae Iterate PR 2021-07-28 19:23:33 +01:00
Michael Telatynski
5d9e421de0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18091 2021-07-28 17:58:34 +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
cdf0d98c3f Fix IconizedContextMenuCheckbox layout 2021-07-28 17:39:02 +01:00
Michael Telatynski
07b9d6b30b Fix styling of setting flag descriptions in preferences
and add description to spaces all/home setting
and make it an account setting rather than device one
and hide it from the Beta card
2021-07-28 14:39:19 +01:00
Šimon Brandner
e445c9c3ff
Merge remote-tracking branch 'upstream/develop' into public-e2ee-warn
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-28 13:28:11 +02:00
Germain
771dda0341
Merge pull request #6472 from SimonBrandner/fix/call-view/18221 2021-07-28 11:10:37 +01:00
Germain Souquet
a4cf147d72 Merge branch 'develop' into gsouquet/fix-18264 2021-07-28 10:30:29 +02:00
Robin Townsend
3694006d05 Realign reactions row with messages in modern layout
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-27 23:48:51 -04:00
Travis Ralston
9707797d45
Merge pull request #6272 from SimonBrandner/fix/explicit-font/14163
Don't set `font-family` explicitly
2021-07-27 11:04:23 -06:00
Šimon Brandner
8294d324e3
Merge remote-tracking branch 'upstream/develop' into fix/call-view/18221 2021-07-27 16:55:59 +02:00
Šimon Brandner
24f0c760ce
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-27 16:25:38 +02:00
Germain Souquet
3037be11c4 Restore padding for single person state events 2021-07-27 16:24:05 +02:00
Michael Telatynski
39d9ec3ced Merge branch 'develop' into t3chguy/fix/18071 2021-07-27 15:02:59 +01:00
David Baker
148571828b
Merge pull request #6474 from matrix-org/gsouquet/fix-18017
Make new reply UI clickable
2021-07-27 13:57:41 +01:00
David Baker
72becb73e1
Merge pull request #6473 from matrix-org/gsouquet/fix-18208
Fix deleted message left offset in the timeline
2021-07-27 13:40:20 +01:00
Michael Telatynski
59e9704ee8
Merge pull request #6481 from matrix-org/t3chguy/fix/18250
Fix broken layout of the space hierarchy view
2021-07-27 13:19:04 +01:00
Germain
50aee28bf0
Merge pull request #6480 from matrix-org/gsouquet/fix-18137
Add data-layout to MELS for better CSS structure
2021-07-27 13:15:02 +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
Germain Souquet
8104ba936c Add data-layout to MELS for better CSS structure 2021-07-27 11:30:25 +02:00
Germain
80bf7d1675
Merge pull request #6468 from SimonBrandner/fix/quotes/18199 2021-07-27 09:48:19 +01:00
Germain
788abac74d
Merge pull request #6471 from SimonBrandner/fix/voip-event-tiles/18216
Fix VoIP event tile issues
2021-07-27 08:17:31 +01:00
Germain Souquet
e2688cd5e0 Left align unbubbled events 2021-07-26 16:53:37 +02:00
Germain Souquet
486d576b23 Merge branch 'develop' into gsouquet/fix-18132 2021-07-26 15:49:55 +02:00
Germain Souquet
88bd22ded3 Make new reply UI clickable 2021-07-26 13:50:04 +02:00
Michael Telatynski
2114e854f9 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18091
 Conflicts:
	src/components/structures/SpaceRoomView.tsx
2021-07-26 12:36:00 +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
Šimon Brandner
40947a2a68
Simplifie toast handling
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-26 12:21:58 +02:00
Germain Souquet
46a370a818 Fix deleted message left offset in the timeline 2021-07-26 11:01:37 +02:00
Germain Souquet
2577211855 Make CallEvent tiles the same width all the time 2021-07-26 09:42:17 +02:00
Germain Souquet
468887415a Merge branch 'develop' into gsouquet/fix-18144 2021-07-26 09:25:31 +02:00
Germain
774e743741
Update res/css/views/rooms/_EventBubbleTile.scss 2021-07-26 08:16:13 +01:00
Germain
c7bbb497f9
Merge branch 'develop' into gsouquet/fix-18128 2021-07-26 07:41:42 +01:00
Germain
93ae5c20d6
Merge pull request #6464 from matrix-org/gsouquet/fix-18172
Fix reactions row pushing content on IRC layout
2021-07-26 07:40:49 +01:00
Šimon Brandner
3ef20174f3
Fix issues with the controls disappearing
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-25 18:11:29 +02:00
Šimon Brandner
03a8308ae8
Fix call type icon
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-25 17:24:18 +02:00
Šimon Brandner
aedd535c92
Correct iconography for missed calls
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-25 08:37:25 +02:00
Šimon Brandner
4aa8d8ff21
Add missed call icons
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-25 08:36:41 +02:00
Šimon Brandner
b762303102
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-25 08:10:01 +02:00
Šimon Brandner
f2204aa1ff
Remove nonsense comment
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 21:12:29 +02:00
Šimon Brandner
1f9cd79bcf
Fix some spacing and other tiny things
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 20:59:15 +02:00
Šimon Brandner
396fd2d012
Move silence button
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 20:39:44 +02:00
Šimon Brandner
064544369a
Add call type icon
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 19:30:37 +02:00
Šimon Brandner
25d62983de
Add button icons
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 19:12:12 +02:00
Šimon Brandner
a6f10a4aaa
Move around some CSS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 18:59:54 +02:00
Šimon Brandner
dd800549d7
Fix the silence icon color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 14:06:52 +02:00
Šimon Brandner
24e6fc96f6
Reorganize content
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 14:04:22 +02:00
Šimon Brandner
c00174aacc
Correct button sizes
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 13:46:28 +02:00
Šimon Brandner
af22588682
Don't use a spacer
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 13:46:28 +02:00
Šimon Brandner
410928745f
IncomingCallBox -> IncomingCallToast
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 13:46:22 +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
Šimon Brandner
d206a0b8d3
Merge remote-tracking branch 'upstream/develop' into fix/quotes/18199 2021-07-23 18:39:42 +02:00
Šimon Brandner
c6df7e4e41
Style markdown quotes
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-23 17:46:49 +02:00
Michael Telatynski
4fe0e216d6 Use div instead of span for mx_MImageBody to not violate spec 2021-07-23 16:22:35 +01:00
Michael Telatynski
5f2582395f Fix blurhash rounded corners missing regression 2021-07-23 16:21:59 +01:00
Michael Telatynski
b89434fcbc avoid abusing spans because you're too lazy to give things a class 2021-07-23 16:03:15 +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
7ccc429bea Change spaces beta feedback to not be so beta-centric 2021-07-23 15:47:11 +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
c7a24746f5
Merge pull request #6462 from matrix-org/t3chguy/fix/18182 2021-07-23 14:52:56 +01:00
Germain Souquet
43f809ccc8 Fix call events layout for message bubble 2021-07-23 15:15:44 +02:00
Germain Souquet
3ce6fcc64b Fix reactions row pushing content on IRC layout 2021-07-23 14:58:27 +02:00
Germain Souquet
42b213ba8c Fix clipped avatar in room list 2021-07-23 14:17:26 +02: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
dcfd5d4793 Overlay avatar on top of bubbles 2021-07-23 12:12:52 +02:00