PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
36150 commits 1 branch 0 tags 338 MiB
Commit graph

1094 commits

Author SHA1 Message Date
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
Š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
Germain Souquet
de875bbe1d fix avatar position and outline 2021-07-05 16:22:18 +02:00
Šimon Brandner
0d8f84c769
Delete lozenge effect 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-02 15:35:52 +02:00
Šimon Brandner
e582b1559b
Fix redacted messages (again) 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-02 15:09:02 +02:00
Šimon Brandner
0fe10e4502
Fix replies to deleted messages 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-02 14:22:46 +02:00
Šimon Brandner
b014763cd2
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-02 13:14:14 +02:00
Tulir Asokan
5240209529 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-07-02 12:39:51 +03:00
Germain Souquet
d90d1ca8db event list summary alignment in bubble layout 2021-07-01 14:56:34 +01:00
Germain Souquet
223b40c9d6 Add dark theme support 2021-07-01 14:23:00 +01:00
Germain Souquet
209344d443 improvements to bubble layout 2021-06-30 17:06:51 +01:00
Germain Souquet
d1c6cfe6b9 Improved message bubble layout (no reply) 2021-06-30 12:06:16 +01:00
Germain Souquet
d9eec1c03b Merge branch 'develop' into gsouquet/message-bubbles-4635 2021-06-30 08:58:20 +01:00
J. Ryan Stinnett
52b578fb3f
Merge pull request #6193 from SimonBrandner/fix/irc-layout-mxid/17648 
Fix IRC layout regressions
 2021-06-28 16:10:02 +01:00
Šimon Brandner
ed78bd9096
Remove explicitly set font-family in place where comments talk about FF 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-26 09:12:51 +02:00
Michael Telatynski
1d374f6cbb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17731 2021-06-25 14:50:24 +01:00
Michael Telatynski
5d93216c94 Decrease e2e shield fill mask size so that it doesn't overlap 2021-06-23 16:10:47 +01:00
Michael Telatynski
cdb97d5494 Fix trashcan.svg by exporting it with its viewbox 
then fix sizing and alignment of consumers
 2021-06-23 12:30:23 +01:00
Šimon Brandner
21a960acc7
Fix timestamp issues 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-19 17:53:00 +02:00
Germain Souquet
6271c5c3d8 first iteration for message bubble layout 2021-06-18 18:59:22 +01:00
Šimon Brandner
707ecd8786
Don't highlight bubble events 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-18 17:03:48 +02:00
Šimon Brandner
dbdb61c820
Improve the mxid overlap situation 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-16 17:21:29 +02:00
Šimon Brandner
5dc87869eb
Also override mx_SenderProfile_mxid 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-15 17:22:47 +02:00
Tulir Asokan
cdd2773aa6 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-06-15 17:37:49 +03:00
Šimon Brandner
d08495bde6
Fix display name overlap 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-15 06:30:22 +02:00
Šimon Brandner
5343be7814
Fix buggy hovering/selecting of event tiles 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-10 18:53:56 +02:00
Tulir Asokan
059241b5cc Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-06-07 19:26:12 +03:00
Robin Townsend
ea2120bdfd Fix timestamps 
7f83590846 changed timestamps to be hidden
at the DOM level, not the CSS level. We can keep that approach, we just
need to ensure they still get shown at the right times.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-06 01:55:01 -04:00
Michael Telatynski
93010d34fd
Merge branch 'develop' into t3chguy/fix/6606 2021-06-03 19:33:09 +01:00
Germain
a36063704d
Merge pull request #6138 from matrix-org/gsouquet/containment-event 
Fix mx_Event containment rules and empty read avatar row
 2021-06-03 16:38:55 +01:00
Germain Souquet
5ef78f43a4 fix containment rule to keep height when resizing vertically 2021-06-03 16:26:20 +01:00
Germain
7f83590846
Merge pull request #6079 from matrix-org/gsouquet/switch-rooms 2021-06-03 08:44:01 +01:00
Michael Telatynski
4f50727010 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/6606 
 Conflicts:
	src/components/structures/RoomView.tsx
	src/components/views/right_panel/UserInfo.tsx
 2021-06-03 08:42:05 +01:00
Germain
430cfa9c06
Merge pull request #6127 from matrix-org/gsouquet/css-containment 
Add CSS containment rules for shorter reflow operations
 2021-06-03 08:10:29 +01:00
Germain Souquet
bc50028f70 Merge branch 'develop' into gsouquet-scroll-to-live-reset-hash 2021-06-02 13:57:33 +01:00
Germain
9d126c51e4
Merge pull request #6113 from matrix-org/gsouquet/improve-layout-rendering 2021-06-02 11:41:59 +01:00
J. Ryan Stinnett
2d50325836
Merge pull request #6133 from matrix-org/jryans/event-tile-radius 
Tweak event border radius to match action bar
 2021-06-02 11:39:54 +01:00
J. Ryan Stinnett
234c65b331 Tweak event border radius to match action bar 
This adjusts the `border-radius` used when hovering on an event to match the
recently changed value for the action bar (changed to `8px` in
https://github.com/matrix-org/matrix-react-sdk/pull/6066).
 2021-06-02 10:25:29 +01:00
Germain Souquet
ebd7cd6212 Add CSS containement rules for shorter reflow operations 2021-06-01 11:26:32 +01:00
Germain Souquet
d894cc6f7a Merge branch 'develop' into gsouquet/switch-rooms 2021-06-01 09:02:28 +01:00
Germain Souquet
18188538f6 Move the read receipt animation to the compositing layer 2021-05-28 14:59:54 +01:00