Commit Graph

238 Commits (0c28d37f4e0c0cc2a9a23b37c1080138ff7c69d4)

Author SHA1 Message Date
Michael Telatynski eee0b2a9c3
Add room topic to right panel room info (#12503)
* Add room topic to right panel room info

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Tweak styles

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Update snapshot

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Iterate

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Update snapshots

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Iterate

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Add snapshot tests

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Update snapshots

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

---------

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2024-05-10 10:00:43 +00:00
David Baker 4ae94ae247
Mark all threads as read button (#12378)
* Mark all threads as read button

* Wrap in TooltipProvider and update snapshots

* Remove TooltipProvider wrapper: just add it to the test

* Add some more tests

* Add test for no-room-context handler because sonarcloud

* Add playwright test

* Make assertNoTacIndicator wait

* Use dedicated useMatrixClientContext function

Co-authored-by: Florian Duros <florianduros@element.io>

* Use dedicated useRoomContext function

Co-authored-by: Florian Duros <florianduros@element.io>

* Compound spacing variables

Co-authored-by: Florian Duros <florianduros@element.io>

* Compound spacing variables

Co-authored-by: Florian Duros <florianduros@element.io>

* Imports

* Use createTestClient()

* Add function to utils

* Use mkRoom

---------

Co-authored-by: Florian Duros <florianduros@element.io>
2024-03-28 17:38:21 +00:00
Robin 80c4c3c28c
Refine styles of menus, toasts, popovers, and modals (#12332)
* Refine styles of menus, toasts, popovers, and modals

This is a reintroduction of https://github.com/matrix-org/matrix-react-sdk/pull/12247, with the difference that modal styles have now been refreshed as well.

* Restore the fixed heights of some dialogs

* Fix formatting and flaky screenshot
2024-03-13 13:38:32 +00:00
Robin 6eafe0e5a8
Refine styles of controls to match Compound (#12299)
This changes the styles of buttons, other form controls, and tabs in settings to:

1. Improve their usage of semantic colors, so that they adapt correctly to custom themes
2. Make them more visually coherent with the new Compound design system, as we integrate more of it into the app

This is a re-introduction of https://github.com/matrix-org/matrix-react-sdk/pull/12241 with the difference that we're now using our branding colors again on form colors, and buttons have become rounded to match the appearance of new Compound buttons.
2024-03-05 04:25:47 +00:00
Florian Duros ac435c8d4e
Revert "Refine menu, toast, and popover colors (#12247)" (#12263)
This reverts commit 0856c7617d.

Co-authored-by: David Langley <langley.dave@gmail.com>
2024-02-20 13:54:33 +00:00
Robin 0856c7617d
Refine menu, toast, and popover colors (#12247)
So that they use Compound semantic colors correctly and appear more similar to the real components now found in Compound.
2024-02-14 22:30:16 +00:00
renovate[bot] a0c8575113
Update dependency prettier to v3 (#12095)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2024-01-02 18:56:39 +00:00
Germain f96583e74a
Update RoomSummaryCard navigation links (#11812)
* Update RoomSummaryCard navigation links

* Fix tests

* remove unneeded test

* "@vector-im/compound-web": "0.8.0"

* Fix: search button no transition on hover

* Fix: disabled invite option is not reflected in UI

* test canInviteTo

* update snapshots for CW 0.8.1

* unit test inviteToRoom

* unit test tagRoom

* add member link to roomsummarycard when using legacy room header

* use onChange instead of onClick for ToggleMenuItem favourite room

* update selectors in cypress tests

* always show people menu item

* add hover style to close button

* add padding around room name

* prettier

---------

Co-authored-by: Kerry Archibald <kerrya@element.io>
2023-11-16 03:25:34 +00:00
Kerry a3f0633037
Fix: align base card close button to the right always (#11861) 2023-11-13 21:57:20 +00:00
Germain 722c5ad493
Update room summary card header (#11823)
* Update room summary card header

* test coverage for public room label

* test coverage for public room label (#11841)

* fix encrypted badge selector in cypress/crypto.spec

---------

Co-authored-by: Kerry <kerrya@element.io>
2023-11-11 07:24:48 +00:00
Kerry 6849afd9fc
fix rightpanel hiding scrollbar (#11831) 2023-11-06 23:22:40 +00:00
Germain f784a085fd
New right panel visual language (#11664)
* New right panel visual language

* Upgrade Compound

* Align old room header with right panel

* Rigth panel look and feel

* Fix linting and e2e tests

* Update snapshot

* Add test

* Lint

* Remove screenshot local script

* Update snapshots and UI based on feedback

* fix i18n key

* Update right panel visuals

* Fix tests

* lintfixes

* fix tests

* fix tests

* Add tests for search icon

* Fix invite dialog spec
2023-10-20 13:30:37 +00:00
Michael Telatynski 5ff965106a
Render timeline separator for late event groups (#11739)
* Use Compound tooltips on MessageTimestamp to improve UX of date time discovery

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Show io.element.late_event in MessageTimestamp when known

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Update snapshot

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Avoid needing new Compound changes

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Move groupers into their own directory

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Refactor date separator code to be more generic

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Render timeline separator for late event groups

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Fix date used in copy

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Update snapshot

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Move groupers into their own directory

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Update copy

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Update copy

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Update snapshot

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* i18n

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Add comments

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Add comments

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

---------

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2023-10-16 14:14:04 +00:00
Manan Sadana 2e0eb63fe2 Room avatar alignment fixed 2023-09-27 21:19:07 +05:30
Manan Sadana 560449676b
Fix: Alignment Fixed (#11648)
* Fix: Alignment Fixed

* Fix: Pinned Widget also aligned

---------

Co-authored-by: Manan Sadana <manan.sadana@cnhteam.onmicrosoft.com>
2023-09-22 12:57:07 +00:00
ElementRobot 06ab698269
[Backport staging] Fix vertical alignment of default avatar font (#11592)
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2023-09-08 10:56:59 +00:00
Germain d551469543
Room header UI updates (#11507)
* Fix performance issues with useRoomMembers

With the current implementation it would create a new function, with leading: true, rendering the whole throttling useless

* Add public room indicator

* Format room members count better

* Add public room test

* Add search to room summary card

* Update settings UI

* Update snapshot

* Remove default title attribute
2023-09-01 09:45:50 +00:00
Germain 09c5e06d12
Change avatar to use Compound implementation (#11448)
* Move avatar to new compound implementation

* Make space avatars square

* Remove reference to the avatar initial CSS class

* remove references to mx_BaseAvatar_image

* Fixe test suites

* Fix accessbility violations

* Add ConfirmUserActionDialog test

* Fix tests

* Add FacePile test

* Fix items clipping in members list

* Fix user info avatar sizing

* Fix tests
2023-08-24 03:48:35 +00:00
Germain 5ec2c35497
Adjust typography in key part of the app (#11313) 2023-08-01 10:31:21 +00:00
Germain 38d24f164a
Compound color pass (#11079)
* Integrate compound design tokens

The icons should not be included in this repo, and should live in the compound design token repo, but for simplicity sake at this phase of the integration they will be added here

* Pareto color pass on the light theme

* bugfixes in the light color pass

* Compound color pass dark theme

* Compound color pass high contrast

* Fix typo

* fix tooltip

* Fix PR feedback

* fix composer button mixin

* Normalise some of the auth page colors

* Update based on figma feedback

* lintfix

* regenerate theme index

* Fix cypress tests

Removed the CSS assertions in the room header as it overlaps with the Percy snapshot

* fix more e2e tests

* update colors based on feedback

* fix color pass

* Fix theme overrides

* Restore -transparent

* fix color mapping

* Final colour pass update

* Do not consume compound colors directly

* rethemedex

* Update pass

* Final tweaks

* a11y pass

* scope opacity to checkbox and not label

* Add missing customisations var for theming

* lintfix

* remove unwanted test
2023-07-12 17:46:49 +00:00
Germain 2034cce235
Scope smaller font size to user info panel (#11178) 2023-07-04 18:02:39 +00:00
Germain cfc13c58cd
Make event info size consistent with state events (#11181) 2023-07-03 15:30:55 +00:00
Germain 9c7d935aae
Compound Typography pass (#11103)
* Integrate compound design tokens

The icons should not be included in this repo, and should live in the compound design token repo, but for simplicity sake at this phase of the integration they will be added here

* Delete unused or incorrect - sass variables

* Typography pass

* Deprecate _font-weights.pcss and use Compound instead

* lint fix

* Fix snapshot

* Fix typography pass feedback

* Remove unwanted e2e test

cypress tests should test functionality not visual output. And we should not test visual output by inspecting CSS properties

* lintfix

* Migration script for baseFontSize

* Updates after design review

* Update font scaling panel to use min/max size

* Fix custom font

* Fix font slider e2e test

* Update custom font

* Update new baseFontSizeV2

* Disambiguate heading props

* Fix appearance test

* change max font size

* fix e2ee test

* fix tests

* test baseFontSize migration code

* typescript strict

* Migrate baseFontSize account setting

* Change assertion for font size

* Fix font size controller test
2023-06-29 10:30:25 +00:00
Suguru Hirahara d340fa8d2a
Remove TODO comments about spacing variables (#10695)
The variables on _spacing.pcss have been deprecated by https://github.com/matrix-org/matrix-react-sdk/pull/10686
2023-06-06 14:03:52 +00:00
Suguru Hirahara ed5c02be6d
Fix long room address and name not being clipped on room info card and update `_RoomSummaryCard.pcss` (#10811)
* Handle a long room address and name with ellipsis on RoomSummaryCard

* Use a class selector for maintainability

Sort the selectors
2023-05-09 07:56:09 +00:00
Suguru Hirahara 00fe0b4316
Fix the color of the verified E2EE icon on RoomSummaryCard (#10812) 2023-05-08 02:26:29 +00:00
Michael Telatynski 99ac9e5029
Ensure tooltip contents is linked via aria to the target element (#10729)
* Ensure tooltip contents is linked via aria to the target element

* Iterate

* Fix tests

* Fix tests

* Update snapshot

* Fix missing aria labels for more tooltips

* Iterate

* Update snapshots
2023-05-05 08:26:11 +00:00
Suguru Hirahara 9fc4410ee9
Update style rules of `MessageTimestamp` (#10780)
* Remove an obsolete variable - `$MessageTimestamp_width_hover`

Added by 9b54aba4c0
Deprecated 5343be7814

* Replace a variable with a custom property - $MessageTimestamp_width

* Merge with an existing property in :root

rename

* Manage the variable on _MessageTimestamp.pcss
2023-05-04 12:19:26 +00:00
Suguru Hirahara f5d79897d9
Remove some obsolete CSS rules (#10754)
* Remove `mx_MImageReplyBody_info` from `_MImageReplyBody.pcss`

Edited by 866a11d7e3
Deprecated by 6b3098d8fe

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Remove `mx_WidgetCard_maxPinnedTooltip` from `_WidgetCard.pcss`

Added by ef0843d4ad
Deprecated by ada6d1aa46

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Remove `mx_AliasSettings_editable` from `_AliasSettings.pcss`

Added by eac50aa800
Deprecated by 2903a0e712

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Remove `mx_AliasSettings_localAliasHeader` from `_AliasSettings.pcss`

Added by 3253d0b93d
Deprecated by 2e3f225520

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Remove `mx_RoomList_explorePrompt` from `_RoomList.pcss`

Added by e20b375433
Deprecated by 328d7ea5eb

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Remove `mx_Stickers_hideStickers` from `_Stickers.pcss`

Added by 79d3cca6e9
Deprecated by 31b3b2e2ed

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

---------

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
2023-05-03 13:26:10 +00:00
Suguru Hirahara 5162cefa78
Replace Sass variables with CSS custom properties - $container-gap-width and $container-border-width (#10776)
* Replace a Sass variable with a CSS custom property - $container-gap-width

* Replace a Sass variable with a CSS custom property - $container-border-width
2023-05-03 09:24:41 +00:00
Suguru Hirahara 92906c2130
Replace Sass variables with custom properties on `_font-weights.pcss` (#10554)
* Replace `$font-normal` and `$font-semi-bold`

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Replace `font-weight: 600` with the custom property

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Replace the existing variables

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

---------

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
2023-04-21 14:16:00 +00:00
Michael Telatynski 782060a26e
ARIA Accessibility improvements (#10674)
* Add missing aria-expanded attributes

* Improve autoComplete for phone numbers & email addresses

* Fix room summary card heading order

* Fix missing label on timeline search field

* Use appropriate semantic elements for dropdown listbox

* Use semantic list elements in keyboard settings tab

* Use semantic list elements in spotlight

* Fix types and i18n

* Improve types

* Update tests

* Add snapshot test
2023-04-20 17:13:30 +00:00
Suguru Hirahara 0e52729083
Edit a test to check timestamp color's value on timeline and thread panel (#10265)
Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
2023-03-02 17:14:41 +00:00
Kerry 923ad4323b
Poll history - setup labs setting (#10039)
* add settings while under development

* very basic tests for roomsummarycard

* empty poll history dialog and option in room summary

* pollS history in settings

* use more user-centric selectors in roomsummarycard test
2023-02-01 20:57:48 +00:00
Nawaraj Shah 64cec31981
changing the color of message time stamp (#10016) 2023-01-29 10:03:38 +00:00
Germain bef8e077f6
Unify notifications panel event design (#9754) 2022-12-21 10:25:50 +00:00
Kerry d3ab11928b
Use compound colours for verification badges (#9794)
* update e2e colour variables to compound colours

* use e2e colour vars for e2e icons
2022-12-20 02:07:28 +00:00
Michael Weimann 526645c791
Apply prettier formatting 2022-12-12 12:24:14 +01:00
Michael Telatynski 4bfb1e7b2f
Make autocomplete pop-up wider in thread view (#9289)
* Make autocomplete pop-up wider in thread view

* Handle non-narrow mode too
2022-09-16 09:12:28 +00:00
Robin 4524291331
Fix the picture-in-picture component being off screen (#9246) 2022-09-06 04:28:01 +00:00
Germain 72c24af5c0
Disallow invalid inline style comments in stylesheets (#9099) 2022-07-27 14:39:29 +01:00
Kerry 594439222d
Replace mask-images with svg components in MessageActionBar (#9088)
* Use svg components in messageactionbar

* highlight options button in pinned messages mock buttons
2022-07-25 12:43:41 +02:00
Michael Telatynski 01f4bb8c78
Rename PostCSS files to `.pcss` (#9013)
* Rename PostCSS files to `.pcss`

* Make Stylelint happy

* Delint

* Rename new files too

* delint

* Fix bad comment placement
2022-07-15 14:53:23 +01:00
Suguru Hirahara 49c6d10ddb
Manage style rules of ReadReceiptGroup position on one file (#8993)
* Specify positon of RR on IRC layout on _EventTile.scss

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Manage a declaration for position of RR on modern/group layout on _EventTile.scss, instead of applying it as a default one

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Use logical properties

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Include mx_ReadReceiptGroup in mx_EventTile_msgOption to prevent a regression

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Manage style blocks of mx_ReadReceiptGroup for every layout on one file

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Use logical properties

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Include mx_ReadReceiptGroup in mx_EventTile_msgOption for bubble layout same as the other layouts

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Include mx_ReadReceiptGroup in mx_EventTile_msgOption on TimelineCard

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
2022-07-12 15:30:59 -06:00
Suguru Hirahara 58b81f604a
Ensure timestamp on generic event list summary is not hidden from TimelineCard (#9000)
Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
2022-07-07 08:38:19 +02:00
Suguru Hirahara 5349f301da
Stop using :not() pseudo class for mx_GenericEventListSummary (#8944)
* Stop using :not() pseudo class for mx_GenericEventListSummary

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Use a CSS variable for mx_GenericEventListSummary on _EventTile.scss - icon-width

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Use a CSS variable for mx_GenericEventListSummary on _EventTile.scss - right-padding

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Move declarations for EventTile_line of GenericEventListSummary for IRC layout from _IRCLayout.scss to _EventTile.scss

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Move mx_EventTile_line out of mx_GenericEventListSummary:not([data-layout=bubble])

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Move common style rules up

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Set zero inline start padding to mx_EventTile_line of info tile of mx_GenericEventListSummary_unstyledList on IRC layout

There should not be spacing between avatars and info tile line on IRC Layout

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Apply the rule to group/modern layout only

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Apply the inline start padding to modern/group layout only

Overriding $left-gutter is not necessary for IRC layout

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Merge the style block for mx_EventTile_info .mx_EventTile_line

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Remove padding from info event tile line from mx_GenericEventListSummary on IRC layout

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Add spacing between avatar and a single info event tile line on IRC layout

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Stop using :not() pseudo class for mx_GenericEventListSummary on TimelineCard

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Fix padding of line with redacted body text

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
2022-07-06 11:44:23 +01:00
Suguru Hirahara 6f10cd6404
Fix font size of MessageTimestamp on TimelineCard (#8950)
Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
2022-07-05 12:02:55 -04:00
Suguru Hirahara 0bf5d54041
Improve style rules for thread summary (#8868)
* Use mixin ThreadSummaryIcon

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Tidy mx_ThreadSummary

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Move style blocks from _EventTile.scss to _ThreadSummary.scss

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Merge mx_ThreadSummaryIcon::before

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* From threads amount to replies amount

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Remove obsolete declaration and class names

mixin ThreadSummaryIcon has "background-color: $secondary-content !important"

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Move mx_ThreadPanel_replies::before from _ThreadSummary to _EventTile.scss

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Rename mx_ThreadSummaryIcon to mx_ThreadSummary_icon

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Use variables and remove obsolete one

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Merge style rules, renaming a variable

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Include mx_MessagePanel_narrow in mx_ThreadSummary

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Remove a redundant declaration

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Use a variable

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Include mx_ThreadSummary_sender and mx_ThreadSummary_content in mx_ThreadSummary

Expected according to tests

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Remove a variable used only once

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Ensure the same line-height is applied

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Remove !important

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
2022-07-04 13:07:50 -06:00
Suguru Hirahara 37d8cfbc50
Fix read receipts group position on TimelineCard in compact modern/group layout (#8971) 2022-07-02 15:51:57 +00:00
Suguru Hirahara 3329b35bd0
Move mx_ThreadSummary style block out of mx_GenericEventListSummary on TimelineCard (#8938)
Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
2022-06-30 16:56:03 +00:00