IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

[MM-58686] Adjust text alignment on custom status tooltip (#27353)

Browse Source 
* Change: Adjust text alignment on custom status tooltip
Change: Update 'Today' expiry time calculation on custom_status_modal

* Change: Use display inline-block instead of flex for custom-status class

---------

Co-authored-by: Mattermost Build <build@mattermost.com>
This commit is contained in:
Ivy Gesare 2024-07-03 18:54:14 +03:00 committed by GitHub
parent 90534b13cf
commit 0e6ed3d490
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
webapp/channels/src/components/custom_status/custom_status.scss
View File

@ -267,8 +267,7 @@
} }
.custom-status { .custom-status {
display: flex; display: inline-block;
justify-content: center;
&-expiry { &-expiry {
font-weight: 400; font-weight: 400;

2
webapp/channels/src/components/custom_status/custom_status_emoji.tsx
View File

@ -76,7 +76,7 @@ function CustomStatusEmoji({
emojiName={customStatus.emoji} emojiName={customStatus.emoji}
size={14} size={14}
emojiStyle={{ emojiStyle={{
marginTop: 2, marginTop: -1,
}} }}
/> />
{customStatus.text && {customStatus.text &&

2
webapp/channels/src/components/custom_status/custom_status_modal.tsx
View File

@ -206,7 +206,7 @@ const CustomStatusModal: React.FC<Props> = (props: Props) => {
case FOUR_HOURS: case FOUR_HOURS:
return moment().add(4, 'hours').seconds(0).milliseconds(0).toISOString(); return moment().add(4, 'hours').seconds(0).milliseconds(0).toISOString();
case TODAY: case TODAY:
return moment().endOf('day').toISOString(); return moment().add(1, 'day').set({hour: 8, minute: 0}).toISOString();
case THIS_WEEK: case THIS_WEEK:
return moment().endOf('week').toISOString(); return moment().endOf('week').toISOString();
case DATE_AND_TIME: case DATE_AND_TIME: