Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-16 21:24:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
25,554 Commits 206 Branches 552 Tags 519 MiB
47a825be7c
Commit Graph

388 Commits

Author SHA1 Message Date
Bruno Windels
e86d2b616e add ToastContainer 2019-11-22 16:04:51 +01:00
J. Ryan Stinnett
2a5dc9bfac Remove lint comments about no-descending-specificity 
We have disabled the `no-descending-specificity` stylelint rule, so we no longer
need these block comments.
 2019-11-08 16:35:42 +00:00
Michael Telatynski
c00974d22d Now that part of spacing is padding, make it smaller when collapsed 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-11-07 10:16:57 +00:00
David Baker
d14c0c342d
Merge pull request #3594 from matrix-org/bwindels/fixfilenotifpanel 
Fix: file and notifications panel back-paginating forever.
 2019-11-06 10:52:15 +00:00
Bruno Windels
eb4220a836 scroll panels should be in flex container so they don't grow w/ content 2019-11-06 10:34:22 +01:00
Michael Telatynski
99c8a909b3 Fix focus-within on EventTile and more showing onClick 2019-11-04 16:47:20 +00:00
Michael Telatynski
10a63ada48 Fix SVG mask-image usage in a bunch of places for correct outlining 2019-11-01 14:46:30 +00:00
Michael Telatynski
ebc5628782 fix typo 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-10-22 11:30:47 +01:00
Michael Telatynski
2a3655e9b8 Focus highlight room sublist label, catch right arrow and simplify code 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-10-22 11:10:25 +01:00
Michael Telatynski
f09a3b4281 Fix outline on RoomSubList badges 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-10-17 16:21:33 +01:00
Bruno Windels
15b7a5af31 fix contrast issue 
when badges with and without highlighted state have a very
different brightness (as they might do in dark mode), hardcoding
the fg color of a badge independent of it's highlighted state
to $accent-fg-color doesn't work well, so add an extra SASS
variable we can reassign to something more specific in the custom theme
 2019-10-01 16:58:14 +02:00
David Baker
6f3f0f0a3c
Merge pull request #3430 from matrix-org/bwindels/roomdirectorybuttonwrap 
Dont wrap text in room directory buttons
 2019-09-12 16:56:45 +01:00
Bruno Windels
2bed264b0d dont wrap text in room directory buttons 2019-09-12 15:59:15 +02:00
Bruno Windels
95060d4e95 reduce vertical padding around explore/filter 2019-09-12 11:27:20 +02:00
Bruno Windels
4ae4e68967 make explore button and filter field equal width 2019-09-12 11:11:32 +02:00
Bruno Windels
24c4a16da1 adapt design of room list in directory 2019-09-11 16:23:59 +02:00
Bruno Windels
6f62cdb22c basic styling to make it look ok before applying new design 2019-09-11 15:45:51 +02:00
Bruno Windels
fdadc615f7 make explore button white on hover 2019-09-10 11:11:08 +02:00
Bruno Windels
1c4093eb0f make filter feed transparent when not focussed 2019-09-10 11:11:08 +02:00
Bruno Windels
da98080859 hide explore button when focusing filter field 2019-09-10 10:57:25 +02:00
Bruno Windels
80dd5a1b0a add explore button next to filter field 2019-09-10 10:55:55 +02:00
Anton Zuenko
a3eb45e0b9 Fix waste of space of collapsed left panel 
Signed-off-by: Anton Zuenko <anton@zuenko.ru>
 2019-08-05 18:03:20 +02:00
J. Ryan Stinnett
7fc1288614 Fix login type selector border 
This fixes a regression in the login type selector's border and placement.

Fixes https://github.com/vector-im/riot-web/issues/10223
 2019-07-02 15:09:51 +01:00
Travis Ralston
7e8eda33fc Flexboxify generic error page 2019-06-27 12:10:58 -06:00
Bruno Windels
15d286ed93
Merge pull request #3144 from matrix-org/bwindels/edit-history 
Edit history dialog
 2019-06-26 14:38:53 +00:00
Jonas Schürmann
92c2a119c9 Remove top margin of community panel container 
This is a simpler fix for the scrollbar problem than changing the definition
for height, which was my previous attempt at solving this problem.
Additionally, the top and bottom margins are now consistent.

Signed-off-by: Jonas Schürmann <jonasschuermann@aol.de>
 2019-06-26 15:27:52 +02:00
Bruno Windels
ddae4de7bd cleanup: RoomDirectory doesn't use gemini anymore 2019-06-26 11:59:56 +02:00
Jonas Schürmann
2d9fbcab70 Fix the scrollbar in the community bar 
Currently the scrollbar is always visible because the inner container is 5px
bigger in height than the outer container. This is hereby fixed.

Signed-off-by: Jonas Schürmann <jonasschuermann@aol.de>
 2019-06-26 10:49:46 +02:00
J. Ryan Stinnett
b5598df3f7 Remove redundant extra chevrons from ContextualMenu 
This removes a seemingly redundant layer of extra chevrons from
`ContextualMenu`. Since both chevrons are the same color, there should be no
visual change.
 2019-06-21 11:13:08 +01:00
J. Ryan Stinnett
dc9282c539 Remove unused ContextualMenu features 2019-06-19 14:47:15 +01:00
David Baker
3f6bb0c7ca Use default cursor for disabled submit button 2019-06-17 16:57:13 +01:00
J. Ryan Stinnett
413bff084c
Merge pull request #3087 from matrix-org/jryans/context-menu-clipping 
Align message context menu to right and vertically where space available
 2019-06-12 10:19:47 +01:00
Travis Ralston
aacb942d57 Don't handle identity server failure as fatal, and use the right message 
Fixes https://github.com/vector-im/riot-web/issues/10002
 2019-06-10 19:28:32 -06:00
J. Ryan Stinnett
3126880345 Extend context menu alignment without chevrons 
For context menus without chevrons, this changes the menu components to still
set default styles that align the menu based on the edges used to specify the
menu's position. This is not intended to change the positioning of any existing
menus.
 2019-06-10 16:07:28 +01:00
Travis Ralston
ace1bde238 Implement design and copy for errors 2019-06-05 11:32:02 -06:00
Travis Ralston
5c85f4609e Accept JSX into the GenericErrorPage and expose local session vars 2019-05-29 12:09:04 -06:00
Travis Ralston
e4576dac28 Render underlines and tooltips on custom server names in auth pages 
See https://github.com/vector-im/riot-web/issues/9290
 2019-05-13 17:16:40 -06:00
Bruno Windels
faecceb3b4 remove manual order so component order follows markup order 2019-04-18 09:20:26 +02:00
Travis Ralston
aadc1a8d75 Add a generic error page element for startup errors 
Used by Riot to communicate configuration problems.
 2019-04-11 15:52:37 -06:00
David Baker
04b69116ee Fix tedious CSS stuff with stylelint --fix 2019-04-09 15:05:39 +01:00
David Baker
eb6f3f6008 Fix up some CSS things stylelint was complaining about 
And also disable a load of rules that feel like they're probably
causing more headaches than they fix.
 2019-04-09 15:03:13 +01:00
David Baker
670f6e4f99 Simplify settings dialog CSS 
Stop the settings dialogs from requiring special styles on the
mx_Dialog which required passing in a classname from anywhere the
settings dialogs were opened (although this still requires
static=true). Some of the things have now been adopted for all dialogs
(border-radius), others have been moved to within the dialog content.
 2019-04-08 16:48:42 +01:00
Bruno Windels
a326c83016
Merge pull request #2842 from matrix-org/bwindels/bacat-scrolling-merged-develop 
BACAT Scrolling
 2019-03-29 14:02:15 +00:00
Nad Chishtie
5ac3905a37
Use same horizontal padding as room avatar to align to grid 2019-03-27 13:15:03 +01:00
Travis Ralston
04a9038a05 Alert the user to unread notifications in prior versions of rooms 
Fixes https://github.com/vector-im/riot-web/issues/8161
 2019-03-26 19:22:41 -06:00
Bruno Windels
7e56a9a80e prevent resize handle hit area overlapping with (native) scrollbar 2019-03-26 17:14:58 +01:00
Bruno Windels
71f6b08b26 first impl of new scrolling, still a bit broken 2019-03-19 13:42:22 +01:00
Bruno Windels
987a1a00b3 chrome apparently anchors the scroll position, which fights against our restore position logic. Disable it like this. 2019-03-15 10:16:21 +01:00
Bruno Windels
30d848b86e use AutoHideScrollbar in ScrollPanel 2019-03-15 10:16:21 +01:00
J. Ryan Stinnett
8bf5e1d19f
Merge pull request #2749 from jryans/auth-field 
Use Field component in auth flows
 2019-03-06 11:18:24 +00:00
J. Ryan Stinnett
bc54ea5623 Convert login type to Field component 
This converts the login type Dropdown on the login flow to also use the Field
component so that every presents a similar visual style.
 2019-03-05 17:58:42 +00:00
J. Ryan Stinnett
5a491ac053 Convert login inputs to Field component 
As with other auth flows, this converts inputs on the login page to use the
Field component for consistent styling. The login type dropdown is left as-is
for now.
 2019-03-05 17:58:42 +00:00
J. Ryan Stinnett
5b1d361577 Convert registration phone number to Field component 
Now that we have prefix support in the Field component, we can also convert the
phone number with country dropdown on registration.
 2019-03-05 17:58:42 +00:00
David Baker
57d8f6d8a2 Support linking to hosting providers 
From link in app config
 2019-03-05 16:12:02 +00:00
J. Ryan Stinnett
bfe120fbf4 Convert registration to Field component 
This converts most fields in the registration form to use the Field component,
except for the phone number, which is a left as a separate task because of the
country dropdown menu.
 2019-03-05 15:25:42 +00:00
J. Ryan Stinnett
4b340450b9 Rename Feather icon directory to feather-customised 
These icons are based on Feather as the original source, but they have various
tweaks applied, such as stroke width, color, etc. Hopefully the tweaked name
makes this more obvious in the future.
 2019-02-27 10:42:10 +00:00
Michael Telatynski
7b88d5d21c make ViewSource less awkward 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-02-24 03:43:44 +00:00
Bruno Windels
ef704085f9 remove display: flex declarations now present on mx_MainSplit itself 2019-02-21 10:50:41 +01:00
Bruno Windels
b364c9cb8e update copyright header 2019-02-21 10:50:30 +01:00
Bruno Windels
f11505a9de bring back user page 
Adds a UserView that contains a MainSplit with an empty div
and a RightPanel, preset to the given member.

UserView fetches the profile and creates a fake member, which
it passed on to the RightPanel.

this doesn't use the view_user action on purpose, to avoid any
interference of the UserView when trying to view a room member.
 2019-02-20 12:45:55 +01:00
J. Ryan Stinnett
402992cee4 Adjust add room button for dark theme 2019-02-18 11:34:25 +00:00
Travis Ralston
96619afc7c Fix icons being cut off in settings 
Fixes https://github.com/vector-im/riot-web/issues/8578
 2019-02-14 09:09:07 -07:00
Nad Chishtie
4aa0f56b06 Normalised icon strokes to 1px 2019-02-13 16:11:18 +00:00
J. Ryan Stinnett
5f6907c85e Improve gradients for Safari 2019-02-13 15:06:40 +00:00
J. Ryan Stinnett
93324896f3 Force authpage to act like light theme 2019-02-13 14:24:03 +00:00
J. Ryan Stinnett
4409636c0b Tweak panel button divider color 2019-02-13 13:57:59 +00:00
J. Ryan Stinnett
fb4fd54f6f Stop gradients at panel bg color 2019-02-13 13:48:56 +00:00
J. Ryan Stinnett
59b58cbbac Restore highlighted right panel marker 2019-02-13 11:31:30 +00:00
J. Ryan Stinnett
1359ac62cb Tweak header divider line 2019-02-13 10:52:03 +00:00
J. Ryan Stinnett
e1edd56643 Allow theming group header buttons 2019-02-13 10:47:04 +00:00
J. Ryan Stinnett
3cba5edd6f Allow theming right panel header buttons 2019-02-13 10:47:04 +00:00
J. Ryan Stinnett
c00495304f Explicit color for tagpanel buttons 2019-02-13 10:47:04 +00:00
J. Ryan Stinnett
d7fb39fd08 First pass at dark theme colors 2019-02-13 10:47:04 +00:00
Bruno Windels
ccaa017980 add divider between tabs and regular buttons in room header 2019-02-12 20:05:01 +01:00
Travis Ralston
e7e322d513
Merge pull request #2604 from matrix-org/travis/settings/scale-up 
Scale up settings UI to be easier to read
 2019-02-11 07:58:10 -07:00
Matthew Hodgson
84082ebb34 fix horizontal CSS scrollbars on webkit 2019-02-10 22:35:37 +00:00
Travis Ralston
60950b258a Scale up settings UI to be easier to read 
Part of https://github.com/vector-im/riot-web/issues/8207
 2019-02-08 15:23:14 -07:00
David Baker
f99c56fedb
Merge pull request #2597 from matrix-org/jryans/add-welcome-page 
SDK support for welcome page
 2019-02-08 17:17:22 +00:00
Bruno Windels
d4ed0bc038 make sure scroller doesn't overflow parent 2019-02-07 17:08:40 +00:00
Travis Ralston
5b4ebf3b76
Merge pull request #2579 from matrix-org/travis/settings/fix-ff-scroll 
Fix firefox scrolling settings tabs differently
 2019-02-07 08:14:08 -07:00
Bruno Windels
5b85f8928d show a hand cursor on the badge while we're at it 2019-02-07 13:40:50 +00:00
Bruno Windels
87ddb8a453
Merge pull request #2575 from matrix-org/bwindels/customtags 
Bring back custom tags, also badges on communities
 2019-02-07 11:37:17 +00:00
J. Ryan Stinnett
73de56d72d Generalize HomePage into EmbeddedPage 2019-02-07 11:12:28 +00:00
Bruno Windels
7b23fa7a4f implement PR feedback 2019-02-07 10:49:23 +00:00
Travis Ralston
9ca1e875a3 Fix firefox scrolling settings tabs differently 
Fixes https://github.com/vector-im/riot-web/issues/8408
 2019-02-06 14:11:09 -07:00
Bruno Windels
699023ea40 prevent tagtiles jumping when selected 2019-02-06 16:53:48 +00:00
Bruno Windels
97db9cd99e fix css regression of context menu 2019-02-06 14:24:44 +00:00
Bruno Windels
0ab6ab639e render badge on custom tag in LLP 2019-02-06 11:21:50 +00:00
Bruno Windels
b79394722a make sure scrollbar is at the far right edge of the LLP 2019-02-05 18:03:16 +00:00
Bruno Windels
604020dd59 add selectable custom tags below tag panel 2019-02-05 17:39:02 +00:00
Bruno Windels
bdc7936130 move help & communities button out of tag panel 
so we can shove the custom tag buttons between them
in the next commit
 2019-02-05 17:36:33 +00:00
Travis Ralston
eac50aa800 Remove old user and room settings 
This takes out the old user and room settings, replacing the paths with the new dialog editions. The labs setting has been removed in order to support this change.

In addition to removing the old components outright, some older components which were only used by the settings pages have been removed. The exception is the ColorSettings component as it has a high chance of sticking around in the future.

Styles that were shared by the settings components have been broken out to dedicated sections, making it easier to remove the old styles entirely.

Some stability testing of the app has been performed to ensure the app still works, however given the scope of this change there is a possibility of some broken functionality.
 2019-02-04 13:40:21 -07:00
Bruno Windels
45e982ac13
Merge pull request #2557 from matrix-org/bwindels/e2eicons 
Add e2e icon to room header/composer/member info, more ...
 2019-02-01 22:02:28 +00:00
J. Ryan Stinnett
3bfd603dab Remove guest warning bar 2019-02-01 15:28:16 -06:00
Bruno Windels
9134548558 update room status bar warning icon 2019-02-01 17:52:57 +01:00
Travis Ralston
b12b731781 Minor CSS tweaks 2019-01-31 21:20:30 -07:00
Travis Ralston
4036e52c24 Fixed settings dialog header; Adjust padding on dialog 
Some recent changes to dialogs changed how this works and altered the look of the settings dialogs. This fixes that and makes it so that the header and content scroll independently.

Fixes https://github.com/vector-im/riot-web/issues/8329
Fixes https://github.com/vector-im/riot-web/issues/8328
 2019-01-31 15:52:22 -07:00
Matthew Hodgson
c432c79953 remove the bottom gradient entirely for now 2019-01-31 15:03:32 +01:00
Matthew Hodgson
1ee0dc4b66 make overflow gradients much smaller and turn bottom into drop shadow 2019-01-31 13:31:55 +01:00
Bruno Windels
60f28266ae
Merge pull request #2538 from matrix-org/bwindels/community-redesign-cleanup 
Redesign: community page cleanup
 2019-01-31 12:01:08 +00:00
J. Ryan Stinnett
de46e6aa0d Use dropdown-arrow for all toggle arrows 2019-01-30 16:39:07 -06:00
Bruno Windels
405cc5cc24 show avatars for members & rooms in group like we do in room right panel 
also apply padding with hacky :not selector to exclude full-width avatar
 2019-01-30 16:59:28 +01:00
Bruno Windels
be0de104ff make group header as tall as top left menu/room header 2019-01-30 16:24:02 +01:00
Bruno Windels
4d2a93eaaf
Merge pull request #2527 from jryans/auth-registration 
Style registration flow
 2019-01-30 11:27:45 +00:00
Travis Ralston
68cd87a1c7 Fix indentation on all new settings CSS 2019-01-29 23:11:16 -07:00
J. Ryan Stinnett
01d28bc137 Squeeze country dropdowns to match design 2019-01-29 17:38:28 -06:00
J. Ryan Stinnett
88fd2e79cd Prune unused auth styles 2019-01-29 17:38:28 -06:00
Bruno Windels
855dbd7d2b Merge branch 'experimental' into bwindels/roomdirectory-makeover 2019-01-29 18:33:03 +01:00
Bruno Windels
6ffc5e093d add icons to top left menu options 2019-01-29 16:56:07 +01:00
Bruno Windels
9f1b4ac4cc room directory makeover 2019-01-29 15:34:58 +01:00
Bruno Windels
cc2b6f9524
Merge pull request #2470 from matrix-org/bwindels/css-scrollbars 
Make native scrollbars prettier
 2019-01-29 08:20:21 +00:00
J. Ryan Stinnett
20bf683df8
Merge pull request #2517 from jryans/auth-server-type-selector 
Add server type selector and style login flow
 2019-01-28 22:11:14 -06:00
Travis Ralston
d34390d230
Merge pull request #2512 from matrix-org/travis/usettings/tab/flair 
Implement flair tab in user settings
 2019-01-28 20:37:22 -07:00
J. Ryan Stinnett
8e9fc8a8e7 Make existing fields full width 2019-01-28 15:29:36 -06:00
J. Ryan Stinnett
398ded4a91 Switch to two phase login 2019-01-28 14:58:21 -06:00
Travis Ralston
3d59cf996f Icon for flair tab 2019-01-28 10:24:18 -07:00
Bruno Windels
55e0838c82
Merge pull request #2507 from matrix-org/bwindels/roomlistjslayout 
Redesign: new layout algorithm for room sublists.
 2019-01-28 14:55:31 +00:00
J. Ryan Stinnett
b1f698586e Style SSO login like a button 2019-01-28 08:52:20 -06:00
J. Ryan Stinnett
344a5d1547 Style login type with primary color 2019-01-28 08:52:20 -06:00
J. Ryan Stinnett
73aeb26a79 Remove dead code for empty matrixIdText in PasswordLogin 2019-01-28 08:52:20 -06:00
Travis Ralston
535d42684f Initial structure for new room settings 2019-01-25 13:09:44 -07:00
Travis Ralston
5dc75e2d3c Have the settings dialog be fixed in size 
This also brings out some classes that aren't solely applicable to the user settings and will be applicable to the room settings as well.
 2019-01-24 19:12:09 -07:00
Travis Ralston
f1c1caac62 Implement labs tab in new user settings 2019-01-24 08:52:45 -07:00
Travis Ralston
2a9f6186d7
Merge pull request #2491 from matrix-org/travis/usettings/tab/general 
Implement the "General" tab of new user settings
 2019-01-24 08:51:11 -07:00
Bruno Windels
a5297303b0 remove flexbox layout 2019-01-24 15:44:16 +01:00
J. Ryan Stinnett
41c79a93c0
Merge pull request #2489 from jryans/auth-text-and-links 
Update text and links in authentication flows
 2019-01-23 18:40:55 -06:00
Travis Ralston
3f897468a6 Add a ToggleSwitch and use it for SettingsFlag 
Also bring in the compact timeline option.

Without minor CSS changes, the old user settings are completely unusable with this change. As such, minimal effort has been put in to have it be useful. Similarly, the changes drop the use of radio groups and the old theme selector was the only one that used it. See the comments for more details on how/why this was mitigated the way it was.
 2019-01-23 15:50:41 -07:00
J. Ryan Stinnett
9f5f552be1 Move LanguageSelector to views 
It's too simple to be called a structure.
 2019-01-23 16:14:03 -06:00
J. Ryan Stinnett
f4bbfc4aeb Remove unneeded style from forgot password 2019-01-23 15:50:44 -06:00
J. Ryan Stinnett
9b3d674a92 Rename links for changing auth flow 2019-01-23 15:50:44 -06:00
J. Ryan Stinnett
2bb5a1d6ef Clear out other login link styles 2019-01-23 15:50:44 -06:00
J. Ryan Stinnett
e396954a20 Update forgot password link text and style 2019-01-23 15:50:44 -06:00
J. Ryan Stinnett
523d910c66 Use new dropdown arrow for language selector 2019-01-23 10:18:06 -06:00
J. Ryan Stinnett
05254f0e82 Tweak language selector to match design 2019-01-23 10:18:06 -06:00
J. Ryan Stinnett
f9793fa567 Extract language selector styles 2019-01-23 10:18:06 -06:00
Travis Ralston
94b1d739fb
Merge pull request #2476 from matrix-org/travis/modal-tab-settings 
Basic structure for tabbed user settings
 2019-01-23 07:52:44 -07:00
Travis Ralston
0deb210fd8 Collapse DOM around tab label icon 2019-01-22 09:54:35 -07:00
Bruno Windels
3c8bd3fc78
Merge pull request #2456 from matrix-org/bwindels/extendtypingbartiming 
Avoid "jumpiness" with inline typing indicator
 2019-01-22 11:04:25 +00:00
J. Ryan Stinnett
1d01ac398c Rename mx_Login_box to mx_AuthPage_modal and fold into AuthPage 2019-01-21 19:11:43 -06:00
J. Ryan Stinnett
3bd765f63f Rename LoginPage, Header, Footer views to Auth* 2019-01-21 19:11:43 -06:00
J. Ryan Stinnett
c7354f483b Rename LoginBox to AuthButtons 
This component displays login and register buttons. It's currently used in the
composer when viewing a room as a guest.

The name is confusing because the login flow uses are very similarly named
`mx_Login_box` as a wrapping around forms, which is totally different than these
buttons.

Additionally, the components is moved to `views/auth` since it is very simple
and auth related.
 2019-01-21 19:11:43 -06:00
Travis Ralston
15a56fa90b Improve the profile section a bit and add a highlight to the temp tab 2019-01-21 17:27:43 -07:00
Travis Ralston
c3692aa9ae Use the right icons, sizing, and font families for things 2019-01-21 16:51:43 -07:00
Travis Ralston
d907647e61 Spread the tabs out a bit 2019-01-21 16:51:43 -07:00
Travis Ralston
f1e44757f0 Very early work on the "General" tab 2019-01-21 16:51:43 -07:00
Travis Ralston
22435bf8d2 Make the dialog look more like a new dialog 2019-01-21 16:51:43 -07:00
Travis Ralston
a7e3d7df28 Make the tabs look like the design 2019-01-21 16:51:43 -07:00
Travis Ralston
15709040e7 Make tabs be their own panels 2019-01-21 16:51:43 -07:00
Travis Ralston
5adfc09237 Bring in TabbedView nearly verbatim from prior work 
Sourced from https://github.com/matrix-org/matrix-react-sdk/pull/1644 and related PRs.
 2019-01-21 16:51:43 -07:00
J. Ryan Stinnett
29be3ee4b5 Rename login directory to auth 2019-01-21 17:45:55 -06:00