Commit graph

3200 commits

Author SHA1 Message Date
Travis Ralston
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
Germain Souquet
c155382445 Improve new layout switcher UI 2021-07-21 14:55:30 +02:00
Germain
32e7c58747
Merge branch 'develop' into gsouquet/fix-18099 2021-07-21 11:57:29 +01:00
Germain
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
Germain
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
Germain
6308dabcfe
Remove forgotten code comment 2021-07-21 10:43:48 +01:00
Germain Souquet
ef002a2e22 Fix replies line clamping 2021-07-21 11:41:52 +02:00
Germain
dfa85b00d0
Merge pull request #6423 from matrix-org/gsouquet/fix-18077 2021-07-21 09:43:15 +01:00
Germain Souquet
a7cd5fc49b Shift thumbnail dislay to use object-fit to preserve aspect-ratio 2021-07-21 10:03:10 +02:00
Germain Souquet
6d9ac1de17 Fix font slider preview for message bubbles 2021-07-21 09:34:30 +02:00
Germain Souquet
fee69884a6 Reintroduce grouped events padding on modern layout 2021-07-21 08:57:09 +02:00
Germain Souquet
a6308229fb Add spoiler support for message bubbles 2021-07-21 08:42:42 +02:00
Travis Ralston
5994111e5d Merge remote-tracking branch 'origin/develop' into travis/voice-messages/download 2021-07-20 08:55:53 -06:00
Travis Ralston
4a877300da
Merge pull request #6405 from matrix-org/travis/files-hover
Remove hover effect from files in the files panel
2021-07-20 07:38:04 -06:00
Šimon Brandner
9e5b149291
Fix event highlighthing
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 14:23:28 +02:00
Šimon Brandner
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
Germain
53ae7817bc
Merge pull request #6291 from matrix-org/gsouquet/message-bubbles-4635 2021-07-20 10:22:41 +01:00
Germain Souquet
06c9a060b4 Merge branch 'develop' into gsouquet/message-bubbles-4635 2021-07-20 10:16:21 +02:00
Šimon Brandner
5db20d9431
Fix placeholder centering
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 08:54:32 +02:00
Travis Ralston
097cc858ce Remove hover effect from files in the files panel 2021-07-19 10:07:16 -06:00
David Baker
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
Šimon Brandner
e3eac48d05
Cleanup _ReplyPreview.scss
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-17 15:25:54 +02:00
Šimon Brandner
96acd6c9ef
Cleanup _ReplyThread.scss
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-17 15:06:31 +02:00
Šimon Brandner
75fc1299fb
Merge remote-tracking branch 'upstream/develop' into task/cleanup-replies 2021-07-17 08:26:28 +02:00
Šimon Brandner
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
Travis Ralston
d2de9b432c
Apply suggestions from code review
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-07-16 23:50:06 -06:00
Travis Ralston
942cadc8a3 Merge branch 'develop' into travis/notifications-2 2021-07-16 16:20:23 -06:00
Travis Ralston
31d7de628e Small tweaks 2021-07-16 16:04:23 -06:00
Travis Ralston
b57fff5739 Update visual style and sandbox properly 2021-07-16 15:55:07 -06:00
David Baker
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
Šimon Brandner
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
Šimon Brandner
41d5865dd7
Cleanup _ReplyTile.scss
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-16 19:26:04 +02:00
James Salter
9cb3c71afe Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into copy-room 2021-07-16 09:34:30 +01:00
James Salter
a1c658f187 Set Menu icon to link 2021-07-16 09:07:52 +01:00
Šimon Brandner
a3792b75e2
Fix IRC layout replies
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-16 07:53:20 +02:00
Šimon Brandner
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
Šimon Brandner
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
Šimon Brandner
68640a4dbd
Fix icon postion
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-15 15:16:05 +02:00
Šimon Brandner
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
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
51c5094ca4 Merge branch 'develop' into gsouquet/message-bubbles-4635 2021-07-14 17:47:22 +02:00
Šimon Brandner
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
Travis Ralston
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
Germain Souquet
789d078814 Merge branch 'develop' into gsouquet/message-bubbles-4635 2021-07-14 16:26:22 +02:00
Germain Souquet
fc270b435c fix group layout 2021-07-14 15:32:35 +02:00
Šimon Brandner
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
Šimon Brandner
f26c75bdcc
Use margin instead of padding
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-14 10:23:10 +02:00
Šimon Brandner
586e85cbff
Use MFileBody in replies
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-14 10:14:44 +02:00
Šimon Brandner
18355599e8
Fix senderProfile getting cutoff
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-14 10:07:41 +02:00
Šimon Brandner
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