Commit Graph

1058 Commits

Author SHA1 Message Date
Germain
80bf7d1675
Merge pull request #6468 from SimonBrandner/fix/quotes/18199 2021-07-27 09:48:19 +01:00
Germain
c7bbb497f9
Merge branch 'develop' into gsouquet/fix-18128 2021-07-26 07:41:42 +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
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
Germain Souquet
dcfd5d4793 Overlay avatar on top of bubbles 2021-07-23 12:12:52 +02:00
Germain Souquet
1ba5f19f2e Put avatar is right place when sender isnt displayed in message bubbles 2021-07-23 12:10:34 +02:00
Germain Souquet
f99c0fad3e Make inline events feel less claustrophobic in bubble layout 2021-07-23 11:40:34 +02:00
Germain
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
Michael Telatynski
d8d0a21e47
Merge pull request #6450 from SimonBrandner/fix/url-scroll/18028 2021-07-23 06:12:02 +01:00
Šimon Brandner
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
Germain
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
Germain Souquet
224a9db3ec Add event selected state for message bubbles 2021-07-22 16:48:55 +02:00
Germain Souquet
229d139568 Always display the Sender in the reply tile 2021-07-22 15:23:08 +02:00
Michael Telatynski
88884bbaad
Merge pull request #6441 from SimonBrandner/feature/smaller-quotes 2021-07-22 12:20:27 +01:00
Germain
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
Šimon Brandner
6ae320831a
Make quotes thinner
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-22 13:10:25 +02:00
Travis Ralston
c4b08d7eca
Merge pull request #6440 from SimonBrandner/fix/codeblocks
Revert 100% on codeblocks
2021-07-22 03:49:11 -06:00
Šimon Brandner
85e08d5074
Revert 100%
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-22 11:43:29 +02:00
Travis Ralston
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
Germain Souquet
8da2d0fe72 Fix avatar obstructing membership and state changes 2021-07-22 11:31:46 +02:00
Germain Souquet
9180d478eb Prevent action bar to overlap the event content 2021-07-22 11:00:34 +02:00
Germain
51178735c9
Merge pull request #6428 from matrix-org/gsouquet/fix-18129 2021-07-22 08:44:40 +01:00
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
Travis Ralston
ca1a1e488a Take out the jump when recording a voice message 2021-07-21 14:47:42 -06:00
Germain
22375e2108
Update res/css/views/rooms/_EventBubbleTile.scss 2021-07-21 15:11:49 +01:00
Germain Souquet
0fb210cadb Increase hit area for timestamp in message bubbles 2021-07-21 15:31:10 +02:00
Germain
32e7c58747
Merge branch 'develop' into gsouquet/fix-18099 2021-07-21 11:57:29 +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 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
Š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 Souquet
06c9a060b4 Merge branch 'develop' into gsouquet/message-bubbles-4635 2021-07-20 10:16:21 +02: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
75fc1299fb
Merge remote-tracking branch 'upstream/develop' into task/cleanup-replies 2021-07-17 08:26:28 +02: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
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
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
0bbdfefd0d
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-07-13 13:21:27 +02:00