3037be11c4
Restore padding for single person state events
2021-07-27 16:24:05 +02:00
39d9ec3ced
Merge branch 'develop' into t3chguy/fix/18071
2021-07-27 15:02:59 +01:00
148571828b
Merge pull request #6474 from matrix-org/gsouquet/fix-18017
...
Make new reply UI clickable
2021-07-27 13:57:41 +01:00
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
59e9704ee8
Merge pull request #6481 from matrix-org/t3chguy/fix/18250
...
Fix broken layout of the space hierarchy view
2021-07-27 13:19:04 +01:00
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
0c79aec19d
Fix broken layout of the space hierarchy view
...
Not sure what this min-height was trying to achieve but removing it prevents the grid layout collapsing on itself
2021-07-27 13:09:43 +01:00
8104ba936c
Add data-layout to MELS for better CSS structure
2021-07-27 11:30:25 +02:00
80bf7d1675
Merge pull request #6468 from SimonBrandner/fix/quotes/18199
2021-07-27 09:48:19 +01:00
788abac74d
Merge pull request #6471 from SimonBrandner/fix/voip-event-tiles/18216
...
Fix VoIP event tile issues
2021-07-27 08:17:31 +01:00
e2688cd5e0
Left align unbubbled events
2021-07-26 16:53:37 +02:00
486d576b23
Merge branch 'develop' into gsouquet/fix-18132
2021-07-26 15:49:55 +02:00
88bd22ded3
Make new reply UI clickable
2021-07-26 13:50:04 +02:00
2114e854f9
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18091
...
Conflicts:
src/components/structures/SpaceRoomView.tsx
2021-07-26 12:36:00 +01:00
7ed5dee74b
Make colors a bit clearer
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-26 13:17:06 +02:00
277fdf1711
voipcall-plinth-color -> quinary-content-color
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-26 12:42:18 +02:00
40947a2a68
Simplifie toast handling
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-26 12:21:58 +02:00
46a370a818
Fix deleted message left offset in the timeline
2021-07-26 11:01:37 +02:00
2577211855
Make CallEvent tiles the same width all the time
2021-07-26 09:42:17 +02:00
468887415a
Merge branch 'develop' into gsouquet/fix-18144
2021-07-26 09:25:31 +02:00
774e743741
Update res/css/views/rooms/_EventBubbleTile.scss
2021-07-26 08:16:13 +01:00
c7bbb497f9
Merge branch 'develop' into gsouquet/fix-18128
2021-07-26 07:41:42 +01:00
93ae5c20d6
Merge pull request #6464 from matrix-org/gsouquet/fix-18172
...
Fix reactions row pushing content on IRC layout
2021-07-26 07:40:49 +01:00
3ef20174f3
Fix issues with the controls disappearing
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-25 18:11:29 +02:00
03a8308ae8
Fix call type icon
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-25 17:24:18 +02:00
aedd535c92
Correct iconography for missed calls
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-25 08:37:25 +02:00
4aa8d8ff21
Add missed call icons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-25 08:36:41 +02:00
b762303102
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-25 08:10:01 +02:00
f2204aa1ff
Remove nonsense comment
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 21:12:29 +02:00
1f9cd79bcf
Fix some spacing and other tiny things
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 20:59:15 +02:00
396fd2d012
Move silence button
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 20:39:44 +02:00
064544369a
Add call type icon
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 19:30:37 +02:00
25d62983de
Add button icons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 19:12:12 +02:00
a6f10a4aaa
Move around some CSS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 18:59:54 +02:00
dd800549d7
Fix the silence icon color
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 14:06:52 +02:00
24e6fc96f6
Reorganize content
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 14:04:22 +02:00
c00174aacc
Correct button sizes
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 13:46:28 +02:00
af22588682
Don't use a spacer
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 13:46:28 +02:00
410928745f
IncomingCallBox -> IncomingCallToast
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 13:46:22 +02:00
1ba601ba22
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096
...
Conflicts:
src/components/structures/SpaceRoomView.tsx
src/components/views/dialogs/BetaFeedbackDialog.tsx
2021-07-23 18:28:21 +01:00
d206a0b8d3
Merge remote-tracking branch 'upstream/develop' into fix/quotes/18199
2021-07-23 18:39:42 +02:00
c6df7e4e41
Style markdown quotes
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-23 17:46:49 +02:00
4fe0e216d6
Use div instead of span for mx_MImageBody to not violate spec
2021-07-23 16:22:35 +01:00
5f2582395f
Fix blurhash rounded corners missing regression
2021-07-23 16:21:59 +01:00
b89434fcbc
avoid abusing spans because you're too lazy to give things a class
2021-07-23 16:03:15 +01:00
dec2c48155
remove unused import and revert removing some needed css
2021-07-23 15:56:00 +01:00
1d1a396c1f
get rid of spurious hr
2021-07-23 15:51:59 +01:00
7ccc429bea
Change spaces beta feedback to not be so beta-centric
2021-07-23 15:47:11 +01:00
9c7fa71a4a
Remove spaces beta feedback prompts except a couple more strategic ones
2021-07-23 15:07:24 +01:00
c7a24746f5
Merge pull request #6462 from matrix-org/t3chguy/fix/18182
2021-07-23 14:52:56 +01:00
43f809ccc8
Fix call events layout for message bubble
2021-07-23 15:15:44 +02:00
3ce6fcc64b
Fix reactions row pushing content on IRC layout
2021-07-23 14:58:27 +02:00
42b213ba8c
Fix clipped avatar in room list
2021-07-23 14:17:26 +02:00
2b133deb63
fix scroll behaviour to match that of prior to the spinner fix
2021-07-23 12:19:54 +01:00
4a4ec596bd
Fix position of the space hierarchy spinner
2021-07-23 11:27:00 +01:00
dcfd5d4793
Overlay avatar on top of bubbles
2021-07-23 12:12:52 +02:00
1ba5f19f2e
Put avatar is right place when sender isnt displayed in message bubbles
2021-07-23 12:10:34 +02:00
f99c0fad3e
Make inline events feel less claustrophobic in bubble layout
2021-07-23 11:40:34 +02:00
358a4e5d3f
Merge pull request #6212 from matrix-org/t3chguy/fix/17686
2021-07-23 09:09:17 +01:00
010baabfe6
Improve subspaces and some utilities around room/space creation
2021-07-23 08:46:20 +01:00
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
d8d0a21e47
Merge pull request #6450 from SimonBrandner/fix/url-scroll/18028
2021-07-23 06:12:02 +01:00
f53de5de99
Make bubble layout background color less agressive
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-22 18:04:24 +02:00
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
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
0768f03097
Migrate ViewSourceEvent to TypeScript
2021-07-22 17:11:23 +02:00
2841383e82
rethemendex
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-22 17:10:57 +02:00
224a9db3ec
Add event selected state for message bubbles
2021-07-22 16:48:55 +02:00
09186f8ee9
Merge pull request #6446 from matrix-org/gsouquet/fix-18145
...
Always display the Sender in the reply tile
2021-07-22 15:12:09 +01:00
02b08888b5
Use modern layout in file and notification panel
2021-07-22 16:00:41 +02:00
78ae4ebc1e
Merge pull request #6444 from matrix-org/gsouquet/fix-18121
...
Add right padding for event replies
2021-07-22 14:28:13 +01:00
229d139568
Always display the Sender in the reply tile
2021-07-22 15:23:08 +02:00
8a9d89ae85
Fix event tile cut off in share preview
2021-07-22 15:05:44 +02:00
2e173d7810
Add right padding for event replies
2021-07-22 14:38:57 +02:00
18bb4bce35
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
...
Conflicts:
src/stores/SpaceStore.tsx
2021-07-22 12:44:27 +01:00
88884bbaad
Merge pull request #6441 from SimonBrandner/feature/smaller-quotes
2021-07-22 12:20:27 +01:00
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
6ae320831a
Make quotes thinner
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-22 13:10:25 +02:00
c4b08d7eca
Merge pull request #6440 from SimonBrandner/fix/codeblocks
...
Revert 100% on codeblocks
2021-07-22 03:49:11 -06:00
85e08d5074
Revert 100%
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-22 11:43:29 +02:00
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
8da2d0fe72
Fix avatar obstructing membership and state changes
2021-07-22 11:31:46 +02:00
9180d478eb
Prevent action bar to overlap the event content
2021-07-22 11:00:34 +02:00
8695beb7ca
Fix overflow issues
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-22 10:03:22 +02:00
2873bf6c3c
Make feeds bit a smaller
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-22 09:50:56 +02:00
72948b9167
Keep aspect ratio for voice feeds
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-22 09:45:33 +02:00
51178735c9
Merge pull request #6428 from matrix-org/gsouquet/fix-18129
2021-07-22 08:44:40 +01:00
7ad62a8b1a
Reorganize some CSS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-22 09:06:20 +02:00
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
ca1a1e488a
Take out the jump when recording a voice message
2021-07-21 14:47:42 -06:00
56290f3d01
Force padding overrides to take precedence over MediaBody styles
2021-07-21 14:47:27 -06:00
87ac2d7cc5
Move padding and width to MediaBody styles
2021-07-21 14:47:02 -06:00
3023fda497
Make MFileBody inherit the MediaBody styles
2021-07-21 14:46:25 -06:00
5386d23008
Fix voice message tile taking up a couple extra px at the bottom
...
... by returning it to the default block shape.
2021-07-21 14:43:26 -06:00
e430381abc
Update colour scheme for message panels
...
Fixes https://github.com/vector-im/element-web/issues/18113
2021-07-21 13:11:11 -06:00
d243f7bad8
Move some CSS to a more correct place
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 18:30:25 +02:00
3fac4adfc7
Fix feed sizing issues
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 18:14:21 +02:00
dc7f6d8286
Show sidebar in PiP mode
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 17:45:21 +02:00
22375e2108
Update res/css/views/rooms/_EventBubbleTile.scss
2021-07-21 15:11:49 +01:00
be52eba027
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
2021-07-21 15:56:08 +02:00
0fb210cadb
Increase hit area for timestamp in message bubbles
2021-07-21 15:31:10 +02:00
c155382445
Improve new layout switcher UI
2021-07-21 14:55:30 +02:00
32e7c58747
Merge branch 'develop' into gsouquet/fix-18099
2021-07-21 11:57:29 +01:00
a4ca52255d
Merge pull request #6421 from matrix-org/gsouquet/fix-18084
...
Fix font slider preview for message bubbles
2021-07-21 11:56:33 +01:00
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
d147aaa984
delint and fix min-height issue
2021-07-21 11:27:36 +01:00
fd64d37305
Add iconography to Create Room Dialog dropdown
...
Remove unused old stale feather-customised/globe.svg
2021-07-21 11:20:41 +01:00
390b05617c
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
...
Conflicts:
src/components/views/dialogs/CreateRoomDialog.tsx
src/components/views/dialogs/RoomUpgradeDialog.tsx
src/components/views/dialogs/RoomUpgradeWarningDialog.tsx
src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
2021-07-21 10:46:41 +01:00
6308dabcfe
Remove forgotten code comment
2021-07-21 10:43:48 +01:00
ef002a2e22
Fix replies line clamping
2021-07-21 11:41:52 +02:00
880dc26847
don't force height if the height can't change (no children edge)
2021-07-21 10:39:04 +01:00
1b2d70d816
Prompt user to leave rooms/subspaces in a space when leaving space
2021-07-21 09:57:10 +01:00
dfa85b00d0
Merge pull request #6423 from matrix-org/gsouquet/fix-18077
2021-07-21 09:43:15 +01:00
a7cd5fc49b
Shift thumbnail dislay to use object-fit to preserve aspect-ratio
2021-07-21 10:03:10 +02:00
6d9ac1de17
Fix font slider preview for message bubbles
2021-07-21 09:34:30 +02:00
fee69884a6
Reintroduce grouped events padding on modern layout
2021-07-21 08:57:09 +02:00
a6308229fb
Add spoiler support for message bubbles
2021-07-21 08:42:42 +02:00
3993e698bd
Put the call controls close togather
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 17:22:36 +02:00
4546df7246
Update sidebar icons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 17:13:54 +02:00
5994111e5d
Merge remote-tracking branch 'origin/develop' into travis/voice-messages/download
2021-07-20 08:55:53 -06:00
0af64504b1
Reverse sidebar order
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 16:53:53 +02:00
15406eaff2
Put the sidebar to the bottom rather than the top
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 16:18:48 +02:00
e5563ac60b
Update the screen-sharing buttons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 16:11:55 +02:00
fadb13e9fb
Center all buttons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 16:02:02 +02:00
c25feb9b9f
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
2021-07-20 15:48:25 +02: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
c47a05cc48
Merge pull request #6121 from SimonBrandner/feature/call-event-tile
...
Add VoIP event tiles
2021-07-20 13:31:53 +01:00
9e5b149291
Fix event highlighthing
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 14:23:28 +02:00
d8c4ab53e0
Merge pull request #6347 from robintown/emojibase-updates
2021-07-20 12:57:00 +01:00
66a3b0fe5f
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 13:24:05 +02:00
c16827272d
Merge remote-tracking branch 'upstream/develop' into feature/copy-version/17603
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 13:19:31 +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
de42a00ca4
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
...
Conflicts:
src/components/views/avatars/RoomAvatar.tsx
test/stores/SpaceStore-test.ts
test/test-utils.js
2021-07-19 16:47:31 +01:00
c1ed023e17
Update Twemoji fonts for Unicode Emoji 13.1
2021-07-19 10:45:26 +01: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
18ba7a280d
Give sources a little padding
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-16 21:30:50 +02:00
Germain Souquet