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

1252 commits

Author SHA1 Message Date
Šimon Brandner
f57bffad3c
Soften border color 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-06 09:05:33 +02:00
Šimon Brandner
3677d0c5f2
Merge remote-tracking branch 'upstream/develop' into feature/improved-composer 2021-08-06 08:02:28 +02:00
Šimon Brandner
4f0c800cad
Merge remote-tracking branch 'upstream/develop' into feature/improved-composer 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-06 07:45:17 +02:00
Travis Ralston
9ad72d6daf
Merge pull request #6549 from SimonBrandner/fix/dont-use-start 
Use `flex-start` instead of `start`
 2021-08-05 15:46:12 -06:00
Travis Ralston
280c017238
Merge pull request #6530 from matrix-org/travis/voice-messages/uploading 
Improve voice messages uploading state
 2021-08-05 08:36:53 -06:00
Travis Ralston
51bd740936
Merge pull request #6538 from matrix-org/travis/voice-messages/ui-polish-aug3-21 
Polish up more of the voice messages UI
 2021-08-05 08:34:31 -06:00
Šimon Brandner
443db125a9
Merge remote-tracking branch 'upstream/develop' into fix/replies-bubble/18184 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-05 14:36:55 +02:00
Šimon Brandner
fe643b2401
Use flex-start as it has more universal support 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-04 17:09:48 +02:00
Germain Souquet
b4b788e8d5 Fix right margin for events on IRC layout 
Fixes vector-im/element-web#18354
 2021-08-04 11:21:52 +02:00
Travis Ralston
24da0291a0 Re-center recording LED 
Fixes https://github.com/vector-im/element-web/issues/18375
 2021-08-03 13:34:04 -06:00
Travis Ralston
7b565db02d Update uploading state designs 2021-08-03 12:52:21 -06:00
Travis Ralston
c5d11a9f17 Improve voice messages uploading state 
Fixes https://github.com/vector-im/element-web/issues/18226
Fixes https://github.com/vector-im/element-web/issues/18224
 2021-08-02 23:29:46 -06:00
Jano Garcia
27e432df4b
Merge pull request #6513 from matrix-org/jano/fix-link-decoration 
Fix inconsistent styling for links on hover
 2021-07-30 14:08:15 +02:00
janogarcia
adfbcdce40 Fix the inconsistent styling between non-markdown and markdown parsed links on hover. 
It also improves accessibility by not relying exclusively on color for the hover state. That is even more evident for links that are contained within a parent block link (e.g., a quoted message block linking to the source message).

https://webaim.org/techniques/hypertext/link_text#underlining
 2021-07-30 09:54:28 +02:00
Germain Souquet
11322b8999 Appease linter 2021-07-30 09:19:34 +02:00
Germain
375f7b670a
Merge branch 'develop' into gsouquet/fix-18144 2021-07-30 08:10:15 +01:00
Germain
dac3eda9e3
Merge pull request #6499 from matrix-org/gsouquet/fix-18195 
Prevent timeline flickering on hover
 2021-07-29 14:33:34 +01:00
Germain
3bd393f16b
Merge pull request #6501 from matrix-org/gsouquet/fix-18249 
Restore pointer cursor for SenderProfile in message bubbles
 2021-07-29 12:20:56 +01:00
Germain Souquet
6c68f779ec Restore pointer cursor for SenderProfile in message bubbles 2021-07-29 11:58:32 +02:00
Germain Souquet
9c4101fa89 Align event list summary read receipts when using message bubbles 2021-07-29 11:48:22 +02:00
Germain Souquet
78a9117598 Prevent timeline flickering on hover 2021-07-29 11:12:07 +02:00
Germain Souquet
e140dd6ba1 Merge branch 'develop' into gsouquet/fix-18132 2021-07-29 10:27:00 +02:00
Germain Souquet
ee7f3c000d Merge branch 'develop' into gsouquet/fix-18144 2021-07-29 10:04:47 +02:00
Germain Souquet
a4cf147d72 Merge branch 'develop' into gsouquet/fix-18264 2021-07-28 10:30:29 +02:00
Robin Townsend
3694006d05 Realign reactions row with messages in modern layout 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-07-27 23:48:51 -04:00
Travis Ralston
9707797d45
Merge pull request #6272 from SimonBrandner/fix/explicit-font/14163 
Don't set `font-family` explicitly
 2021-07-27 11:04:23 -06:00
Germain Souquet
3037be11c4 Restore padding for single person state events 2021-07-27 16:24:05 +02:00
David Baker
148571828b
Merge pull request #6474 from matrix-org/gsouquet/fix-18017 
Make new reply UI clickable
 2021-07-27 13:57:41 +01:00
David Baker
72becb73e1
Merge pull request #6473 from matrix-org/gsouquet/fix-18208 
Fix deleted message left offset in the timeline
 2021-07-27 13:40:20 +01:00
Germain
50aee28bf0
Merge pull request #6480 from matrix-org/gsouquet/fix-18137 
Add data-layout to MELS for better CSS structure
 2021-07-27 13:15:02 +01:00
Germain Souquet
8104ba936c Add data-layout to MELS for better CSS structure 2021-07-27 11:30:25 +02:00
Germain
80bf7d1675
Merge pull request #6468 from SimonBrandner/fix/quotes/18199 2021-07-27 09:48:19 +01:00
Germain Souquet
e2688cd5e0 Left align unbubbled events 2021-07-26 16:53:37 +02:00
Germain Souquet
486d576b23 Merge branch 'develop' into gsouquet/fix-18132 2021-07-26 15:49:55 +02:00
Germain Souquet
88bd22ded3 Make new reply UI clickable 2021-07-26 13:50:04 +02:00
Germain Souquet
46a370a818 Fix deleted message left offset in the timeline 2021-07-26 11:01:37 +02:00
Germain Souquet
468887415a Merge branch 'develop' into gsouquet/fix-18144 2021-07-26 09:25:31 +02:00
Germain
774e743741
Update res/css/views/rooms/_EventBubbleTile.scss 2021-07-26 08:16:13 +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
43f809ccc8 Fix call events layout for message bubble 2021-07-23 15:15:44 +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
4d5565b9e8
Fix sender profile alignment in replies 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-22 18:18:37 +02:00
Šimon Brandner
8e7a60a612
Fix replies on the bubble layout 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-22 17:58:18 +02: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
0768f03097 Migrate ViewSourceEvent to TypeScript 2021-07-22 17:11:23 +02: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
Š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
Šimon Brandner
48a6a83745
Set cursor for each pill type separately 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-12 12:41:58 +02:00
Šimon Brandner
667abca31f
Handle pill onclick 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-11 20:02:32 +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
Germain Souquet
1a51ed9ffd Make breadcrumb animation run on the compositing layer 2021-05-28 09:34:08 +01:00
Germain Souquet
aaca71b316 Reintroduce sticky header width 2021-05-27 12:44:53 +01:00
Michael Telatynski
54d8953024 delint 2021-05-26 14:00:53 +01:00
Michael Telatynski
27ad90760d Iterate pinned messages 2021-05-26 13:51:17 +01:00
Germain Souquet
c7c6a818f0 Merge branch 'develop' into gsouquet/switch-rooms 2021-05-26 09:51:27 +01:00
Michael Telatynski
59f4c728c9 Initial cut of Pinned event card in the right panel 2021-05-25 16:10:44 +01:00
Germain Souquet
36dddea338 remove CSS out of sync comment 2021-05-25 14:57:07 +01:00
Germain Souquet
7303166924 fix sticky headers when results num get displayed 2021-05-25 13:53:20 +01:00
Michael Telatynski
13427aaf07 Add a pulse animation to the pinned messages indicator and move it 2021-05-25 13:07:39 +01:00
Germain Souquet
ecff5bd65c Merge branch 'develop' into gsouquet-scroll-to-live-reset-hash 2021-05-24 09:20:12 +01:00
Germain Souquet
f058fd8869 Reduce amount of DOM nodes 2021-05-20 15:39:25 +01:00
Germain Souquet
d362321706 Simplify SenderProfile DOM structure 2021-05-20 15:25:20 +01:00
Robin Townsend
74cc00b319 Merge branch 'develop' into better-spinners 2021-05-16 07:47:34 -04:00
Nique Woodhouse
486350cba2 Update _RoomSublist.scss 2021-05-14 10:41:32 +01:00
Nique Woodhouse
6acf2543f0 Update _RoomSublist.scss 
Fix indentation and remove random spurious blank line
 2021-05-14 10:38:37 +01:00
Nique Woodhouse
b71bc88514 Update _RoomSublist.scss 
Alter border radius of RoomSublist buttons to reflect shape of other buttons in room list.

Add background color on hover to RoomSublist buttons to provide more visual feedback.
 2021-05-14 09:22:40 +01:00
Travis Ralston
d270e232fd Fix voice message playback being squished up against send button 
In the style shuffle of https://github.com/matrix-org/matrix-react-sdk/pull/5970 the playback bar got squished up against the send button. This just fixes the selector to actually hit the composer-based recorder all the time, not just when recording.
 2021-05-06 21:41:04 -06:00
Tulir Asokan
cc919452b5 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-05-07 00:07:51 +03:00
Travis Ralston
ccdc9fbef6 Fix issue where composer styles were being applied to the timeline 2021-05-04 21:15:22 -06:00
Travis Ralston
a94c1a90c1 Update colours and sizing for voice messages 
Fixes https://github.com/vector-im/element-web/issues/17162
 2021-05-04 20:45:15 -06:00
Travis Ralston
ba2da6826f Support a dark theme for voice messages 
Fixes https://github.com/vector-im/element-web/issues/17137
 2021-05-03 16:08:38 -06:00
Tulir Asokan
09f9916916 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-05-01 15:37:32 +03:00
Travis Ralston
c2d37af1cb Move playback to its own set of classes 
This all started with a bug where the clock wouldn't update appropriately, and ended with a whole refactoring to support later playback in the timeline.

Playback and recording instances are now independent, and this applies to the <Playback* /> components as well. Instead of those playback components taking a recording, they take a playback instance which has all the information the components need.

The clock was incredibly difficult to do because of the audio context's time tracking and the source's inability to say where it is at in the buffer/in time. This means we have to track when we started playing the clip so we can capture the audio context's current time, which may be a few seconds by the first time the user hits play. We also track stops so we know when to reset that flag.

Waveform calculations have also been moved into the base component, deduplicating the math a bit.
 2021-04-27 22:23:57 -06:00
Travis Ralston
c1bb0bb0b8 Add a delete button 2021-04-27 15:02:15 -06:00
Travis Ralston
e079f64a16 Adjust pixel dimensions 2021-04-27 15:02:15 -06:00
Travis Ralston
32e3ce3dea Handle basic state machine of recordings 2021-04-27 15:02:15 -06:00
Robin Townsend
3a62f6cdaa Merge branch 'develop' into better-spinners 2021-04-26 14:12:44 -04:00
Robin Townsend
d3db5fe77f Vectorize mini avatar uploader spinner 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-04-26 14:10:09 -04:00
Travis Ralston
c5dd6b4dfb Update action bar to incorporate sending states 
This moves most of them out of the context menu.
 2021-04-21 16:24:17 -06:00
Germain Souquet
c5a1bb2d2c fix sticky tags header in room list 2021-04-21 10:44:20 +01:00
Germain
68fb9a78c4
Merge pull request #5874 from matrix-org/gsouquet-room-events 2021-04-21 09:09:01 +01:00
Tulir Asokan
b8ef67e447 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-04-19 13:37:27 +03:00
Travis Ralston
a821ece128
Merge pull request #5869 from matrix-org/travis/voice/pulse-2 
Pulse animation for voice messages recording state
 2021-04-16 09:41:33 -06:00
Travis Ralston
7878e1cd57
Merge pull request #5870 from matrix-org/travis/voice/disable-composer 
Properly disable composer access when recording a voice message
 2021-04-16 07:36:53 -06:00
Travis Ralston
3e24d6f8ac Change animation speed 2021-04-15 10:49:39 -06:00
Travis Ralston
f0d1e7c565 Document the lamp effect 2021-04-15 10:04:15 -06:00
Travis Ralston
6b3ac20d76 Cleanup 2021-04-15 09:53:15 -06:00
Germain Souquet
02debd12f6 Hide RoomSublist when empty rather than unmounting them 2021-04-15 16:11:45 +01:00
Germain
36e729a626
Merge pull request #5836 from matrix-org/gsouquet-readreceipts-animation 2021-04-15 08:27:28 +01:00
Travis Ralston
fedb5b9f63 Fix disabled state of the composer 2021-04-14 20:12:10 -06:00
Travis Ralston
595225b98b A different animation option for pulsing record icons 2021-04-14 15:14:52 -06:00
Travis Ralston
e77d3bea04 Pulse animation option for voice record button 2021-04-14 15:12:21 -06:00