Commit graph

1032 commits

Author SHA1 Message Date
Š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
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
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
Šimon Brandner
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
Šimon Brandner
8e456b062a
More unused CSS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 12:32:17 +02:00
Šimon Brandner
d149cead5f
Remove unused CSS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 12:27:03 +02:00
Šimon Brandner
b4ae54dcce
Remove unused CSS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 12:15:22 +02:00
Šimon Brandner
fca5125c5b
Improve redacted body look
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 10:36:44 +02:00
Germain Souquet
290174b031 fix group layout and IRC layout regressions 2021-07-13 10:36:35 +02:00
Germain Souquet
ba3e7e24ba Merge branch 'develop' into gsouquet/message-bubbles-4635 2021-07-13 10:15:27 +02:00
Germain Souquet
1061cb0ffb Fix layout regressions in message bubbles 2021-07-13 10:15:12 +02:00
Šimon Brandner
562d43e81c
Font
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:36:31 +02:00
Šimon Brandner
43cf7bc611
Remove 0px
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:33:45 +02:00
Šimon Brandner
5f81cfe9d9
Nicer formatting
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 08:24:18 +02:00
Šimon Brandner
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
Michael Telatynski
8072007782 Fix small visual regression with the site name on url previews 2021-07-09 14:50:55 +01:00
Šimon Brandner
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
Michael Telatynski
1c2bdf3cf4 delint 2021-07-08 13:35:26 +01:00
Michael Telatynski
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
Michael Telatynski
1cdae54880 Fix text wrapping for Link Preview Widget 2021-07-08 13:16:58 +01:00
Šimon Brandner
9c67679b35
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 2021-07-08 13:30:57 +02:00
Michael Telatynski
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
Germain Souquet
55896223aa unbubble some type of events 2021-07-07 15:13:58 +02:00
Germain Souquet
6a03ab825f Fix style linting 2021-07-07 13:15:25 +02:00
Germain Souquet
870857f321 Right hand side border radius 2021-07-07 13:00:31 +02:00
Germain Souquet
7d946ee0db Restore action bar 2021-07-07 12:04:28 +02:00
Germain Souquet
b0a1fc7b97 Updated color scheme and spacing 2021-07-07 11:23:38 +02:00
Šimon Brandner
9d12439ee7
Give codeblocks a background color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-07 09:22:56 +02:00
Šimon Brandner
8c1721fc35
Remove the old codeblock code
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-07 09:22:50 +02:00