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
42d6afd4b1
Merge pull request #6497 from matrix-org/t3chguy/fix/18093
2021-07-30 12:25:44 +01:00
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
11322b8999
Appease linter
2021-07-30 09:19:34 +02:00
375f7b670a
Merge branch 'develop' into gsouquet/fix-18144
2021-07-30 08:10:15 +01:00
17e9cf4d2a
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-07-30 12:17:31 +05:30
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
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
94af6db201
Merge pull request #6424 from matrix-org/t3chguy/fix/18071
2021-07-29 15:57:26 +01:00
3ee8f607c0
Switch dropdown out for radio interaction when leaving space
2021-07-29 15:50:18 +01:00
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
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
f69b4549dd
Re-add top border stroke in space create menu
2021-07-29 15:13:02 +01:00
dac3eda9e3
Merge pull request #6499 from matrix-org/gsouquet/fix-18195
...
Prevent timeline flickering on hover
2021-07-29 14:33:34 +01:00
cb89dd408c
Use mic mute icons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-29 15:05:26 +02:00
ab56a16907
Merge pull request #6458 from matrix-org/t3chguy/fix/18091
2021-07-29 13:20:19 +01:00
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
6c68f779ec
Restore pointer cursor for SenderProfile in message bubbles
2021-07-29 11:58:32 +02:00
9c4101fa89
Align event list summary read receipts when using message bubbles
2021-07-29 11:48:22 +02:00
78a9117598
Prevent timeline flickering on hover
2021-07-29 11:12:07 +02:00
e140dd6ba1
Merge branch 'develop' into gsouquet/fix-18132
2021-07-29 10:27:00 +02:00
ee7f3c000d
Merge branch 'develop' into gsouquet/fix-18144
2021-07-29 10:04:47 +02:00
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
ac800ad94d
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18093
2021-07-28 19:24:26 +01:00
40493634ae
Iterate PR
2021-07-28 19:23:33 +01:00
5d9e421de0
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18091
2021-07-28 17:58:34 +01:00
a5606c72de
Update feedback prompt to match designs
2021-07-28 17:56:57 +01:00
6123ccb2eb
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096
2021-07-28 17:45:15 +01:00
cdf0d98c3f
Fix IconizedContextMenuCheckbox layout
2021-07-28 17:39:02 +01:00
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
771dda0341
Merge pull request #6472 from SimonBrandner/fix/call-view/18221
2021-07-28 11:10:37 +01:00
a4cf147d72
Merge branch 'develop' into gsouquet/fix-18264
2021-07-28 10:30:29 +02:00
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
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
8294d324e3
Merge remote-tracking branch 'upstream/develop' into fix/call-view/18221
2021-07-27 16:55:59 +02:00
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
3037be11c4
Restore padding for single person state events
2021-07-27 16:24:05 +02:00
39d9ec3ced
Merge branch 'develop' into t3chguy/fix/18071
2021-07-27 15:02:59 +01:00
148571828b
Merge pull request #6474 from matrix-org/gsouquet/fix-18017
...
Make new reply UI clickable
2021-07-27 13:57:41 +01:00
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
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
8104ba936c
Add data-layout to MELS for better CSS structure
2021-07-27 11:30:25 +02:00
80bf7d1675
Merge pull request #6468 from SimonBrandner/fix/quotes/18199
2021-07-27 09:48:19 +01:00
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
b91309be82
Apply suggestions from review
2021-07-26 23:40:27 +05:30
e2688cd5e0
Left align unbubbled events
2021-07-26 16:53:37 +02:00
486d576b23
Merge branch 'develop' into gsouquet/fix-18132
2021-07-26 15:49:55 +02:00
88bd22ded3
Make new reply UI clickable
2021-07-26 13:50:04 +02:00
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
7ed5dee74b
Make colors a bit clearer
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-26 13:17:06 +02:00
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
40947a2a68
Simplifie toast handling
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-26 12:21:58 +02:00
46a370a818
Fix deleted message left offset in the timeline
2021-07-26 11:01:37 +02:00
2577211855
Make CallEvent tiles the same width all the time
2021-07-26 09:42:17 +02:00
06d84a16d0
Delint
2021-07-26 12:58:17 +05:30
468887415a
Merge branch 'develop' into gsouquet/fix-18144
2021-07-26 09:25:31 +02:00
774e743741
Update res/css/views/rooms/_EventBubbleTile.scss
2021-07-26 08:16:13 +01:00
30a64a1b5a
Gray out and hide some options during export
2021-07-26 12:41:36 +05:30
c7bbb497f9
Merge branch 'develop' into gsouquet/fix-18128
2021-07-26 07:41:42 +01:00
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
b04bfeda33
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations
2021-07-26 00:18:56 +05:30
3d4d1d32d9
Modify design according to the design team
2021-07-26 00:09:59 +05:30
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
03a8308ae8
Fix call type icon
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-25 17:24:18 +02:00
aedd535c92
Correct iconography for missed calls
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-25 08:37:25 +02:00
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
f2204aa1ff
Remove nonsense comment
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 21:12:29 +02:00
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
396fd2d012
Move silence button
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 20:39:44 +02:00
064544369a
Add call type icon
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 19:30:37 +02:00
25d62983de
Add button icons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 19:12:12 +02:00
a6f10a4aaa
Move around some CSS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 18:59:54 +02:00
dd800549d7
Fix the silence icon color
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 14:06:52 +02:00
24e6fc96f6
Reorganize content
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 14:04:22 +02:00
c00174aacc
Correct button sizes
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 13:46:28 +02:00
af22588682
Don't use a spacer
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 13:46:28 +02:00
410928745f
IncomingCallBox -> IncomingCallToast
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 13:46:22 +02:00
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
d206a0b8d3
Merge remote-tracking branch 'upstream/develop' into fix/quotes/18199
2021-07-23 18:39:42 +02:00
c6df7e4e41
Style markdown quotes
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-23 17:46:49 +02:00
4fe0e216d6
Use div instead of span for mx_MImageBody to not violate spec
2021-07-23 16:22:35 +01:00
5f2582395f
Fix blurhash rounded corners missing regression
2021-07-23 16:21:59 +01:00
b89434fcbc
avoid abusing spans because you're too lazy to give things a class
2021-07-23 16:03:15 +01:00
dec2c48155
remove unused import and revert removing some needed css
2021-07-23 15:56:00 +01:00
7ccc429bea
Change spaces beta feedback to not be so beta-centric
2021-07-23 15:47:11 +01:00
43f809ccc8
Fix call events layout for message bubble
2021-07-23 15:15:44 +02:00
3ce6fcc64b
Fix reactions row pushing content on IRC layout
2021-07-23 14:58:27 +02:00
42b213ba8c
Fix clipped avatar in room list
2021-07-23 14:17:26 +02:00
dcfd5d4793
Overlay avatar on top of bubbles
2021-07-23 12:12:52 +02:00
1ba5f19f2e
Put avatar is right place when sender isnt displayed in message bubbles
2021-07-23 12:10:34 +02:00
f99c0fad3e
Make inline events feel less claustrophobic in bubble layout
2021-07-23 11:40:34 +02:00
358a4e5d3f
Merge pull request #6212 from matrix-org/t3chguy/fix/17686
2021-07-23 09:09:17 +01:00
010baabfe6
Improve subspaces and some utilities around room/space creation
2021-07-23 08:46:20 +01:00
ffcc9631df
Merge pull request #6449 from matrix-org/gsouquet/fix-18153
...
Add event selected state for message bubbles
2021-07-23 08:10:50 +01:00
2fd221bc18
Update animation speed
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-23 08:00:51 +02:00
d8d0a21e47
Merge pull request #6450 from SimonBrandner/fix/url-scroll/18028
2021-07-23 06:12:02 +01:00
1b00b304bb
Give image view panel a loading animation
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-22 21:25:11 +02:00
4d5565b9e8
Fix sender profile alignment in replies
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-22 18:18:37 +02:00
8e7a60a612
Fix replies on the bubble layout
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-22 17:58:18 +02:00
bd46275ec6
Don't show scrollbar for url previews
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-22 17:48:17 +02:00
248a758ad6
Merge pull request #6439 from matrix-org/gsouquet/fix-18142
...
Fix avatar obstructing membership and state changes
2021-07-22 16:16:33 +01:00
0768f03097
Migrate ViewSourceEvent to TypeScript
2021-07-22 17:11:23 +02:00
224a9db3ec
Add event selected state for message bubbles
2021-07-22 16:48:55 +02:00
09186f8ee9
Merge pull request #6446 from matrix-org/gsouquet/fix-18145
...
Always display the Sender in the reply tile
2021-07-22 15:12:09 +01:00
78ae4ebc1e
Merge pull request #6444 from matrix-org/gsouquet/fix-18121
...
Add right padding for event replies
2021-07-22 14:28:13 +01:00
229d139568
Always display the Sender in the reply tile
2021-07-22 15:23:08 +02:00
8a9d89ae85
Fix event tile cut off in share preview
2021-07-22 15:05:44 +02:00
2e173d7810
Add right padding for event replies
2021-07-22 14:38:57 +02:00
18bb4bce35
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
...
Conflicts:
src/stores/SpaceStore.tsx
2021-07-22 12:44:27 +01:00
88884bbaad
Merge pull request #6441 from SimonBrandner/feature/smaller-quotes
2021-07-22 12:20:27 +01:00
951ceb194c
Merge pull request #6438 from matrix-org/gsouquet/fix-18074
...
Prevent action bar to overlap the event content
2021-07-22 12:14:29 +01:00
6ae320831a
Make quotes thinner
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-22 13:10:25 +02:00
c4b08d7eca
Merge pull request #6440 from SimonBrandner/fix/codeblocks
...
Revert 100% on codeblocks
2021-07-22 03:49:11 -06:00
85e08d5074
Revert 100%
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-22 11:43:29 +02:00
b9b37f59f1
Merge pull request #6432 from matrix-org/travis/voice-messages/colours
...
Clean up visual style of files and voice messages
2021-07-22 03:39:29 -06:00
8da2d0fe72
Fix avatar obstructing membership and state changes
2021-07-22 11:31:46 +02:00
9180d478eb
Prevent action bar to overlap the event content
2021-07-22 11:00:34 +02:00
8695beb7ca
Fix overflow issues
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-22 10:03:22 +02:00
2873bf6c3c
Make feeds bit a smaller
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-22 09:50:56 +02:00
72948b9167
Keep aspect ratio for voice feeds
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-22 09:45:33 +02:00
51178735c9
Merge pull request #6428 from matrix-org/gsouquet/fix-18129
2021-07-22 08:44:40 +01:00
7ad62a8b1a
Reorganize some CSS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-22 09:06:20 +02:00
fd9241a854
Merge pull request #6355 from SimonBrandner/fix/diff-colors
...
Make diff colors in codeblocks more pleasant
2021-07-21 20:02:03 -06:00
ca1a1e488a
Take out the jump when recording a voice message
2021-07-21 14:47:42 -06:00
56290f3d01
Force padding overrides to take precedence over MediaBody styles
2021-07-21 14:47:27 -06:00
87ac2d7cc5
Move padding and width to MediaBody styles
2021-07-21 14:47:02 -06:00
3023fda497
Make MFileBody inherit the MediaBody styles
2021-07-21 14:46:25 -06:00
5386d23008
Fix voice message tile taking up a couple extra px at the bottom
...
... by returning it to the default block shape.
2021-07-21 14:43:26 -06:00
d243f7bad8
Move some CSS to a more correct place
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 18:30:25 +02:00
3fac4adfc7
Fix feed sizing issues
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 18:14:21 +02:00
dc7f6d8286
Show sidebar in PiP mode
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 17:45:21 +02:00
22375e2108
Update res/css/views/rooms/_EventBubbleTile.scss
2021-07-21 15:11:49 +01:00
be52eba027
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
2021-07-21 15:56:08 +02:00
0fb210cadb
Increase hit area for timestamp in message bubbles
2021-07-21 15:31:10 +02:00
c155382445
Improve new layout switcher UI
2021-07-21 14:55:30 +02:00
32e7c58747
Merge branch 'develop' into gsouquet/fix-18099
2021-07-21 11:57:29 +01:00
a4ca52255d
Merge pull request #6421 from matrix-org/gsouquet/fix-18084
...
Fix font slider preview for message bubbles
2021-07-21 11:56:33 +01:00
e33163c837
Merge pull request #6419 from matrix-org/gsouquet/fix-18125
...
Add spoiler support for message bubbles
2021-07-21 11:54:30 +01:00
d147aaa984
delint and fix min-height issue
2021-07-21 11:27:36 +01:00
fd64d37305
Add iconography to Create Room Dialog dropdown
...
Remove unused old stale feather-customised/globe.svg
2021-07-21 11:20:41 +01:00
390b05617c
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
...
Conflicts:
src/components/views/dialogs/CreateRoomDialog.tsx
src/components/views/dialogs/RoomUpgradeDialog.tsx
src/components/views/dialogs/RoomUpgradeWarningDialog.tsx
src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
2021-07-21 10:46:41 +01:00
6308dabcfe
Remove forgotten code comment
2021-07-21 10:43:48 +01:00
ef002a2e22
Fix replies line clamping
2021-07-21 11:41:52 +02:00
880dc26847
don't force height if the height can't change (no children edge)
2021-07-21 10:39:04 +01:00
1b2d70d816
Prompt user to leave rooms/subspaces in a space when leaving space
2021-07-21 09:57:10 +01:00
dfa85b00d0
Merge pull request #6423 from matrix-org/gsouquet/fix-18077
2021-07-21 09:43:15 +01:00
a7cd5fc49b
Shift thumbnail dislay to use object-fit to preserve aspect-ratio
2021-07-21 10:03:10 +02:00
6d9ac1de17
Fix font slider preview for message bubbles
2021-07-21 09:34:30 +02:00
fee69884a6
Reintroduce grouped events padding on modern layout
2021-07-21 08:57:09 +02:00
a6308229fb
Add spoiler support for message bubbles
2021-07-21 08:42:42 +02:00
1ed316851a
Merge upstream and resolve conflicts
2021-07-21 11:35:27 +05:30
3993e698bd
Put the call controls close togather
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 17:22:36 +02:00
5994111e5d
Merge remote-tracking branch 'origin/develop' into travis/voice-messages/download
2021-07-20 08:55:53 -06:00
0af64504b1
Reverse sidebar order
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 16:53:53 +02:00
15406eaff2
Put the sidebar to the bottom rather than the top
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 16:18:48 +02:00
fadb13e9fb
Center all buttons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 16:02:02 +02:00
c25feb9b9f
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
2021-07-20 15:48:25 +02:00
9e5b149291
Fix event highlighthing
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 14:23:28 +02:00
66a3b0fe5f
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 13:24:05 +02:00
c16827272d
Merge remote-tracking branch 'upstream/develop' into feature/copy-version/17603
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 13:19:31 +02:00
dd6379cf4b
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 13:15:04 +02:00
53ae7817bc
Merge pull request #6291 from matrix-org/gsouquet/message-bubbles-4635
2021-07-20 10:22:41 +01:00
06c9a060b4
Merge branch 'develop' into gsouquet/message-bubbles-4635
2021-07-20 10:16:21 +02:00
5db20d9431
Fix placeholder centering
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 08:54:32 +02:00
de42a00ca4
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
...
Conflicts:
src/components/views/avatars/RoomAvatar.tsx
test/stores/SpaceStore-test.ts
test/test-utils.js
2021-07-19 16:47:31 +01:00
863f4d4f9f
Merge pull request #6394 from matrix-org/dbkr/exorcise_homeserver_checkbox
...
Fix bug where 'other homeserver' would unfocus
2021-07-19 10:09:03 +01:00
fe2cac56f9
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-07-19 12:57:27 +05:30
e3eac48d05
Cleanup _ReplyPreview.scss
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-17 15:25:54 +02:00
96acd6c9ef
Cleanup _ReplyThread.scss
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-17 15:06:31 +02:00
75fc1299fb
Merge remote-tracking branch 'upstream/develop' into task/cleanup-replies
2021-07-17 08:26:28 +02:00
5c5b79a972
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-17 08:13:51 +02:00
d2de9b432c
Apply suggestions from code review
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-07-16 23:50:06 -06:00
942cadc8a3
Merge branch 'develop' into travis/notifications-2
2021-07-16 16:20:23 -06:00
31d7de628e
Small tweaks
2021-07-16 16:04:23 -06:00
b57fff5739
Update visual style and sandbox properly
2021-07-16 15:55:07 -06:00
f9b45677d6
Fix bug where 'other homeserver' would unfocus
...
It turns out the answer to this was not all that complex: we had
two nested <label>s: one for the radio button and one for the Field,
which presumably causes both of them to generate click events and
focus something and what ends up focused is some kind of race condition
depending on, apparently, how fast you click.
Notes: Fix bug where the 'other homeserver' field in the server selection dialog would become briefly focus and then unfocus when clicked.
2021-07-16 22:27:31 +01:00
16ed5c6645
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-16 21:43:33 +02:00
18ba7a280d
Give sources a little padding
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-16 21:30:50 +02:00
31f5d012b8
Improve the look and feel of the picker
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-16 21:16:07 +02:00
d512a83a6c
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-16 19:37:57 +02:00
41d5865dd7
Cleanup _ReplyTile.scss
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-16 19:26:04 +02:00
9cb3c71afe
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into copy-room
2021-07-16 09:34:30 +01:00
a1c658f187
Set Menu icon to link
2021-07-16 09:07:52 +01:00
a3792b75e2
Fix IRC layout replies
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-16 07:53:20 +02:00
5d0afdb706
Don't show line number in replies
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-15 15:38:07 +02:00
88da0f4dcf
Give audio and video replies an icon
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-15 15:17:41 +02:00
68640a4dbd
Fix icon postion
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-15 15:16:05 +02:00
7f9f2dbbcb
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-15 14:54:06 +02:00
dcb9b9b777
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
...
Conflicts:
src/components/views/elements/MiniAvatarUploader.tsx
src/components/views/spaces/SpaceSettingsVisibilityTab.tsx
src/i18n/strings/en_EN.json
src/settings/handlers/RoomSettingsHandler.ts
src/stores/SpaceStore.tsx
2021-07-15 10:04:48 +01:00
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
51c5094ca4
Merge branch 'develop' into gsouquet/message-bubbles-4635
2021-07-14 17:47:22 +02:00
acd37d2aad
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-14 16:53:05 +02:00
fe2eb5ebf0
Merge pull request #6370 from matrix-org/travis/voice_messages/right-panel
...
Fix voice messages in right panels
2021-07-14 08:46:55 -06:00
789d078814
Merge branch 'develop' into gsouquet/message-bubbles-4635
2021-07-14 16:26:22 +02:00
fc270b435c
fix group layout
2021-07-14 15:32:35 +02:00
782563af53
Override audio and video body with file body
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-14 10:47:29 +02:00
f26c75bdcc
Use margin instead of padding
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-14 10:23:10 +02:00
586e85cbff
Use MFileBody in replies
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-14 10:14:44 +02:00
18355599e8
Fix senderProfile getting cutoff
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-14 10:07:41 +02:00
6a285bed5a
Make the buttons easier to hit
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-14 09:06:41 +02:00
1f131db216
Set a max width on waveform-less tiles
2021-07-13 19:02:12 -06:00
0bbdfefd0d
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
2021-07-13 13:21:27 +02:00
1bca5371d1
Fix redacted messages for the 100th #*&@*%^ time
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 13:18:01 +02:00
8e456b062a
More unused CSS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 12:32:17 +02:00
d149cead5f
Remove unused CSS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 12:27:03 +02:00
b4ae54dcce
Remove unused CSS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 12:15:22 +02:00
866a11d7e3
Fix image alignment issues
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 11:49:49 +02:00
fca5125c5b
Improve redacted body look
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 10:36:44 +02:00
290174b031
fix group layout and IRC layout regressions
2021-07-13 10:36:35 +02:00
ba3e7e24ba
Merge branch 'develop' into gsouquet/message-bubbles-4635
2021-07-13 10:15:27 +02:00
1061cb0ffb
Fix layout regressions in message bubbles
2021-07-13 10:15:12 +02:00
562d43e81c
Font
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:36:31 +02:00
43cf7bc611
Remove 0px
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:33:45 +02:00
5f81cfe9d9
Nicer formatting
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 08:24:18 +02:00
ff7a18da56
Rewrite Notifications component for modern UI & processing
2021-07-12 23:57:54 -06:00
3ae76c84f6
Add a simple TagComposer for the keywords entry
2021-07-12 23:55:08 -06:00
4ddcb9a484
Make diffs look a bit better
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-12 16:59:16 +02:00
48a6a83745
Set cursor for each pill type separately
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-12 12:41:58 +02:00
ef944a59f5
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-07-12 15:41:33 +05:30
8a816bb096
Merge pull request #6331 from matrix-org/gsouquet/ghost-button-background
...
Make ghost button background transparent
2021-07-12 09:07:52 +01:00
667abca31f
Handle pill onclick
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-11 20:02:32 +02:00
6a4e2672f6
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-07-10 19:18:01 +05:30
829169ec87
Merge pull request #6342 from matrix-org/t3chguy/fix/vrlp
...
Fix small visual regression with the site name on url previews
2021-07-09 18:05:48 +01:00
8072007782
Fix small visual regression with the site name on url previews
2021-07-09 14:50:55 +01:00
f412fb44a7
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
...
Conflicts:
src/SlashCommands.tsx
src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
src/createRoom.ts
2021-07-09 08:13:39 +01:00
91d208d514
Merge remote-tracking branch 'upstream/develop' into fix/17130/draggable-pip
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 08:26:19 +02:00
b7af39ffff
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 17:17:34 +02:00
722c360de0
Use the correct color for silence button
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 14:42:05 +02:00
1c2bdf3cf4
delint
2021-07-08 13:35:26 +01:00
2615ea7f3f
Add icons to buttons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 14:35:06 +02:00
00a3f5d469
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into revert-6135-t3chguy/fix/17494
2021-07-08 13:29:10 +01:00
9ec3d93402
Better handling of call types
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 14:19:02 +02:00
1cdae54880
Fix text wrapping for Link Preview Widget
2021-07-08 13:16:58 +01:00
6f1fc3fc7e
Fix call button spacing issues
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 13:43:59 +02:00
9c67679b35
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
2021-07-08 13:30:57 +02:00
6ef7ecbe08
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
2021-07-08 13:22:56 +02:00
16dc3c47e1
Make ghost button background transparent
2021-07-08 10:37:40 +02:00
b9a539eaa2
Improve URL Previews
...
only show 2 by default with expand/collapse mechanism
show all hashes again, but dedup requests
clean up hide mechanism, instead of one `x` per preview have one per group
2021-07-07 18:04:30 +01:00
55896223aa
unbubble some type of events
2021-07-07 15:13:58 +02:00
6a03ab825f
Fix style linting
2021-07-07 13:15:25 +02:00
10bdb3cefa
Merge branch 'develop' into gsouquet/message-bubbles-4635
2021-07-07 13:07:43 +02:00
870857f321
Right hand side border radius
2021-07-07 13:00:31 +02:00
7d946ee0db
Restore action bar
2021-07-07 12:04:28 +02:00
b0a1fc7b97
Updated color scheme and spacing
2021-07-07 11:23:38 +02:00
fc239ffd01
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-07 10:53:22 +02:00
9d12439ee7
Give codeblocks a background color
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-07 09:22:56 +02:00
8c1721fc35
Remove the old codeblock code
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-07 09:22:50 +02:00
eb9f4c609a
Make CreateRoomDialog capable of creating restricted rooms in spaces
2021-07-06 10:10:47 +01:00
c5ca98a3ad
Iterate SecurityRoomSettingsTab and ManageRestrictedJoinRuleDialog
2021-07-06 10:10:25 +01:00
82100df9ea
Bring dropdown styling into closer line with rest of our styling
2021-07-06 10:08:57 +01:00
Jano Garcia