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
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
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
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
Germain