Commit Graph

237 Commits (6801ec76a72cb3e4c7c4210738b0812fa35a64a4)

Author SHA1 Message Date
Šimon Brandner 68640a4dbd
Fix icon postion
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-15 15:16:05 +02:00
Šimon Brandner f26c75bdcc
Use margin instead of padding
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-14 10:23:10 +02:00
Šimon Brandner 18355599e8
Fix senderProfile getting cutoff
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-14 10:07:41 +02:00
Šimon Brandner 866a11d7e3
Fix image alignment issues
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 11:49:49 +02:00
Šimon Brandner 722c360de0
Use the correct color for silence button
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 14:42:05 +02:00
Šimon Brandner 2615ea7f3f
Add icons to buttons
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 14:35:06 +02:00
Šimon Brandner 9ec3d93402
Better handling of call types
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 14:19:02 +02:00
Šimon Brandner 6f1fc3fc7e
Fix call button spacing issues
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 13:43:59 +02:00
Germain Souquet 10bdb3cefa Merge branch 'develop' into gsouquet/message-bubbles-4635 2021-07-07 13:07:43 +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
Michael Telatynski 1f337b28ac Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into travis/blurhash
 Conflicts:
	src/ContentMessages.tsx
	src/components/structures/UploadBar.tsx
	src/components/views/messages/MImageBody.js
	src/components/views/messages/MStickerBody.js
	src/components/views/messages/MVideoBody.tsx
2021-07-01 20:48:34 +01:00
David Baker 5e3c8fae5c put this just on the buttons 2021-07-01 15:22:44 +01:00
David Baker 66d95ed7b2 Fix button styling in verification bubbles 2021-07-01 14:51:20 +01:00
Travis Ralston 12d7be2b6a Merge branch 'develop' into travis/new-audio 2021-06-30 13:25:41 -06:00
Germain Souquet d9eec1c03b Merge branch 'develop' into gsouquet/message-bubbles-4635 2021-06-30 08:58:20 +01:00
Germain Souquet fdced3da1b Remove reminescent references to the tinter 2021-06-30 08:09:55 +01:00
Travis Ralston 964a97d59e Merge remote-tracking branch 'origin/develop' into travis/new-audio 2021-06-28 20:52:44 -06:00
Travis Ralston 9c752680ba Tile styling and early behaviour 2021-06-24 13:56:11 -06:00
Travis Ralston ffef2e58cb Unify audio message types to new media body 2021-06-24 11:38:35 -06:00
Travis Ralston 9f2eba4351 Fix class identifiers 2021-06-24 11:38:35 -06:00
Šimon Brandner 0fe6a28853
Merge remote-tracking branch 'upstream/develop' into feature/pinned-click 2021-06-24 10:57:09 +02:00
Šimon Brandner 8d47ea63c2
Make pinned message text clickable
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 10:41:55 +02:00
Michael Telatynski 5d93216c94 Decrease e2e shield fill mask size so that it doesn't overlap 2021-06-23 16:10:47 +01:00
Šimon Brandner 202cb0f5d8
Fix styling of buttons
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-21 17:05:36 +02:00
Šimon Brandner 401fe1d05b
Add call silencing to CallEvent
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-19 20:03:09 +02:00
Germain Souquet 6271c5c3d8 first iteration for message bubble layout 2021-06-18 18:59:22 +01:00
Šimon Brandner 62de75ab00
Increase height
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-18 16:19:57 +02:00
Šimon Brandner 9b6195317e
Improve padding
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-18 16:14:54 +02:00
Šimon Brandner a781d6f128
Adjust padding and line-height a bit
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-17 18:13:52 +02:00
Šimon Brandner 512c054656
Add call type icon
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-17 17:55:18 +02:00
Šimon Brandner 02e6559330
Set text color to secondary-fg-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-17 17:04:56 +02:00
Šimon Brandner 7b6c3aec63
Change some styling to better match the designs
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-17 16:33:00 +02:00
Šimon Brandner 949532c297
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 2021-06-17 15:53:25 +02:00
Tulir Asokan cdd2773aa6 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-06-15 17:37:49 +03:00
Michael Telatynski 660a849cdd Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into travis/blurhash
 Conflicts:
	package.json
	src/ContentMessages.tsx
	yarn.lock
2021-06-15 12:58:29 +01:00
Šimon Brandner 8174973cfe
Use the same styling as for mx_TextualEvent
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-10 15:31:27 +02:00
Šimon Brandner fccd71f82e
Update styling based on review
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-09 06:23:51 +02:00
Šimon Brandner 025148d9fc
Merge branch 'develop' into show-username
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-07 19:37:22 +02:00
Tulir Asokan 059241b5cc Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-06-07 19:26:12 +03:00
Šimon Brandner 70a5715b3d
Support hangup reasons
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 14:46:41 +02:00
Šimon Brandner 0785997983
Handle missed calls
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 11:28:45 +02:00
Šimon Brandner 86402e9788
Add some styling
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 10:03:23 +02:00
Šimon Brandner 5e4a10ab84
Reorganize HTML
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 07:55:55 +02:00
Šimon Brandner f94230c292
Fix css
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-30 19:44:17 +02:00
Šimon Brandner 5e8df03724
Fix styling a bit
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-30 19:44:17 +02:00
Šimon Brandner 4ae92d8adc
Hook up TimelineCallEventStore and add Avatar
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-30 19:44:17 +02:00
Šimon Brandner cd67d50a85
Add basic CallEvent styling
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-30 19:44:17 +02:00
Nique Woodhouse 153d0ae66d
Merge pull request #6066 from matrix-org/niquewoodhouse-message-action-bar-refine-ui
Improve styling of the message action bar
2021-05-24 13:30:27 +01:00
Michael Telatynski 3f9b6caacd fix missing rounded corners on blurhash placeholder 2021-05-21 21:46:18 +01:00
Nique Woodhouse 8d072cedff Update _MessageActionBar.scss
Correct error on css hover for message action button background colour change
2021-05-19 12:11:24 +01:00
Nique Woodhouse 5daca41bfb Update _MessageActionBar.scss
Increase size of buttons
2021-05-19 11:17:34 +01:00
Nique Woodhouse 8a3db3b40a Update _MessageActionBar.scss
Refine UI of message action bar to increase usability and focus on bar content.
2021-05-19 10:25:54 +01:00
Michael Telatynski f0a0d7f998 Fix add reactions prompt button jumping timeline if font set lower than default 2021-05-17 10:01:24 +01:00
Michael Telatynski 76afc1100a Convert to Typescript and move from ClientPeg to Context 2021-05-13 14:13:00 +01:00
Michael Telatynski 87ae47bd61 tweak reactions row some more, third try lucky 2021-05-13 13:59:10 +01:00
Michael Telatynski 36633ec025 Tweak alignment of reactions row, move add reaction to right and only show on hover 2021-05-13 13:32:38 +01:00
Michael Telatynski b5fa4d88bf Add extra add reactions button to encourage more diverse reactions to content 2021-05-13 10:56:51 +01:00
Michael Telatynski 3af0138e9d Update emoji icons to new style 2021-05-13 10:28:35 +01:00
Tulir Asokan cc919452b5 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-05-07 00:07:51 +03:00
Travis Ralston b0cb996cac Update visual style of plain files in the timeline 2021-05-04 21:13:37 -06:00
Travis Ralston 3f4ee9742a Simple rendering of voice messages in the timeline
Fixes https://github.com/vector-im/element-web/issues/17138
2021-05-03 11:41:14 -06:00
Tulir Asokan 09f9916916 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-05-01 15:37:32 +03:00
Jaiwanth f766f985e4 Change cursor to not-allowed 2021-04-30 08:25:58 +05:30
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
Šimon Brandner 9658a760c8
Use timestamp color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-21 17:41:21 +02:00
Šimon Brandner eee1294374
Make both have the same baseline
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-21 17:37:25 +02:00
Šimon Brandner faca498523
Don't use gap
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-20 11:12:16 +02:00
Šimon Brandner 61a260cd40
Format mxid 2021-04-18 20:02:22 +02:00
Tulir Asokan 99717db762 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-03-19 21:58:30 +02:00
Tulir Asokan 8c8b46b984 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-03-12 14:18:12 +02:00
Travis Ralston a7debdd946 Fix tinting for download icon
As shown in https://github.com/vector-im/element-web/issues/16546
2021-03-10 12:32:18 -07:00
Travis Ralston 5d6e3d5711 UI refresh for uploaded files
Fixes https://github.com/vector-im/element-web/issues/16557
Fixes https://github.com/vector-im/element-web/issues/9482 (technically)

There's two changes in this:
1. The actual file body in the timeline now has a placeholder thing.
2. We're intentionally dropping all the "Travis uploaded a file" sender profile states.
2021-03-04 20:07:48 -07:00
J. Ryan Stinnett 3db6a45010 Revert "Merge pull request #5637 from williamkray/wreck/clean-thumbnail-changes"
This reverts commit 5c1b38a48c, reversing
changes made to ec4a39a694.
2021-02-23 12:03:08 +00:00
Tulir Asokan dfcf701449 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-02-19 21:47:10 +02:00
William Kray e72a7567f7 drop video preview max-height to 300px 2021-02-08 09:25:08 -08:00
Šimon Brandner 84eba59afa
Merge branch 'develop' into improve-codeblock 2021-02-08 15:26:50 +01:00
Šimon Brandner cdb0d1c12e
Move and use icons from widget dir
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-08 15:22:10 +01:00
Šimon Brandner eee9cf153b
Fix trash alignment
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-03 08:15:59 +01:00
Michael Telatynski 44649ca372
Merge pull request #5333 from resynth1943/add-border-radius-for-video
Add border-radius for video
2020-11-19 11:00:07 +00:00
Michael Telatynski 602232a524
Update res/css/views/messages/_CreateEvent.scss
Co-authored-by: Travis Ralston <travpc@gmail.com>
2020-11-05 16:08:36 +00:00
Michael Telatynski 81f1e1d8d7 delint 2020-11-05 15:54:21 +00:00
Michael Telatynski 664079a127 Use MiniAvatarUploader for the new NewRoomIntro component 2020-11-05 15:50:42 +00:00
Michael Telatynski af71b0735d Change icon for the Create Event bubble tile 2020-11-04 17:24:03 +00:00
Michael Telatynski ff25a9b45d Consolidate all EventTile bubble stuff into its own component and use it for the room continuation plinth 2020-11-04 17:06:38 +00:00
Resynth 091143db52 Add border-radius for video
Images have a rounded border, so we may as well add it to videos.
Works fine in Chrome, and in other spec-compliant browsers.

Signed-off-by: Resynth <resynth1943@tutanota.com>
2020-10-18 22:40:19 +01:00
Tulir Asokan 2bb7b6535f Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2020-10-02 17:28:45 +03:00
Travis Ralston b4af0140d4 Render Jitsi widget state events in a more obvious way
A clear improvement to this would be to include join/leave buttons in the tiles, however this is currently deferred.
2020-09-16 12:38:47 -06:00
Tulir Asokan 75a0178dad Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2020-09-04 12:41:38 +03:00
Michael Telatynski 6e2a26443d Fix corner rounding on images not always affecting right side 2020-08-17 10:55:54 +01:00
J. Ryan Stinnett 3ece2dd21d Fix action bar safe area regression
The action bar was recently moved, but the safe area was not, which left a gap
between the event and the action bar, making it quite easy to trigger hover on a
different event instead of reaching the action bar.

Fixes https://github.com/vector-im/element-web/issues/14953
Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/5056
2020-08-13 19:24:11 +01:00
Tulir Asokan db5121aeca Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2020-08-03 16:49:43 +03:00
Jorik Schellekens 8460175389 Move actions above tile 2020-07-27 16:21:44 +01:00
Jorik Schellekens 1d6c2b786e File panel spacing and corner rounding 2020-07-27 16:21:41 +01:00
Michael Telatynski b02175793e Use OpenType tabular numbers in timestamps
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-23 14:52:01 +01:00
Michael Telatynski ee8d885e70
Merge pull request #5020 from matrix-org/t3chguy/fix/14649
Update crypto event icon to match rest of app styling
2020-07-20 15:21:03 +01:00
Michael Telatynski ce398c0b34
Merge pull request #5019 from matrix-org/t3chguy/fix/14650
Fix Reactions Row Button vertical misalignment due to forced height
2020-07-20 15:20:14 +01:00
Michael Telatynski dfed3342b6 Fix white infill and verified/warning icons too
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-20 14:09:16 +01:00