5994111e5d
Merge remote-tracking branch 'origin/develop' into travis/voice-messages/download
2021-07-20 08:55:53 -06:00
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
9e5b149291
Fix event highlighthing
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 14:23:28 +02:00
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
53ae7817bc
Merge pull request #6291 from matrix-org/gsouquet/message-bubbles-4635
2021-07-20 10:22:41 +01:00
06c9a060b4
Merge branch 'develop' into gsouquet/message-bubbles-4635
2021-07-20 10:16:21 +02:00
5db20d9431
Fix placeholder centering
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 08:54:32 +02:00
097cc858ce
Remove hover effect from files in the files panel
2021-07-19 10:07:16 -06:00
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
e3eac48d05
Cleanup _ReplyPreview.scss
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-17 15:25:54 +02:00
96acd6c9ef
Cleanup _ReplyThread.scss
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-17 15:06:31 +02:00
75fc1299fb
Merge remote-tracking branch 'upstream/develop' into task/cleanup-replies
2021-07-17 08:26:28 +02:00
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
d2de9b432c
Apply suggestions from code review
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-07-16 23:50:06 -06:00
942cadc8a3
Merge branch 'develop' into travis/notifications-2
2021-07-16 16:20:23 -06:00
31d7de628e
Small tweaks
2021-07-16 16:04:23 -06:00
b57fff5739
Update visual style and sandbox properly
2021-07-16 15:55:07 -06:00
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
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
41d5865dd7
Cleanup _ReplyTile.scss
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-16 19:26:04 +02:00
9cb3c71afe
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into copy-room
2021-07-16 09:34:30 +01:00
a1c658f187
Set Menu icon to link
2021-07-16 09:07:52 +01:00
a3792b75e2
Fix IRC layout replies
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-16 07:53:20 +02:00
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
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
68640a4dbd
Fix icon postion
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-15 15:16:05 +02:00
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
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
51c5094ca4
Merge branch 'develop' into gsouquet/message-bubbles-4635
2021-07-14 17:47:22 +02:00
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
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
789d078814
Merge branch 'develop' into gsouquet/message-bubbles-4635
2021-07-14 16:26:22 +02:00
fc270b435c
fix group layout
2021-07-14 15:32:35 +02:00
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
f26c75bdcc
Use margin instead of padding
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-14 10:23:10 +02:00
586e85cbff
Use MFileBody in replies
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-14 10:14:44 +02:00
18355599e8
Fix senderProfile getting cutoff
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-14 10:07:41 +02:00
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
1f131db216
Set a max width on waveform-less tiles
2021-07-13 19:02:12 -06:00
0bbdfefd0d
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
2021-07-13 13:21:27 +02:00
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
8e456b062a
More unused CSS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 12:32:17 +02:00
d149cead5f
Remove unused CSS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 12:27:03 +02:00
b4ae54dcce
Remove unused CSS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 12:15:22 +02:00
866a11d7e3
Fix image alignment issues
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 11:49:49 +02:00
fca5125c5b
Improve redacted body look
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 10:36:44 +02:00
290174b031
fix group layout and IRC layout regressions
2021-07-13 10:36:35 +02:00
ba3e7e24ba
Merge branch 'develop' into gsouquet/message-bubbles-4635
2021-07-13 10:15:27 +02:00
1061cb0ffb
Fix layout regressions in message bubbles
2021-07-13 10:15:12 +02:00
562d43e81c
Font
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:36:31 +02:00
Travis Ralston