mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Timeline: Spacing and message selection tweaks

Browse source
This commit is contained in:
Scott Nonnenberg 2022-03-17 14:20:40 -07:00 committed by GitHub
parent 0e31659682
commit 53ca6672a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
stylesheets/_modules.scss
View file

@ -84,6 +84,21 @@
} }
} }
@keyframes module-message__highlight {
0% {
filter: none;
}
33% {
filter: brightness(50%);
}
66% {
filter: brightness(50%);
}
100% {
filter: none;
}
}
.module-message--outgoing { .module-message--outgoing {
flex-direction: row-reverse; flex-direction: row-reverse;
} }
@ -143,7 +158,7 @@
.module-message--selected & { .module-message--selected & {
@include mouse-mode { @include mouse-mode {
background-color: $color-ultramarine; background-color: $color-gray-60;
} }
@include dark-mouse-mode { @include dark-mouse-mode {
background-color: $color-white; background-color: $color-white;
@ -152,7 +167,7 @@
.module-message:focus & { .module-message:focus & {
@include keyboard-mode { @include keyboard-mode {
background-color: $color-ultramarine; background-color: $color-gray-60;
} }
@include dark-keyboard-mode { @include dark-keyboard-mode {
background-color: $color-white; background-color: $color-white;
@ -298,12 +313,9 @@
} }
} }
.module-message--selected { .module-message__container--selected {
@include mouse-mode { @include mouse-mode {
background: $color-selected-message-background-light; animation: module-message__highlight 1.2s linear;
}
@include dark-mouse-mode {
background: $color-selected-message-background-dark;
} }
} }
@ -317,7 +329,7 @@
} }
.module-message__container--emoji { .module-message__container--emoji {
padding-top: 0; padding-top: 4px;
.module-message__text--outgoing { .module-message__text--outgoing {
text-align: right; text-align: right;

7
ts/components/conversation/Message.tsx
View file

@ -110,7 +110,8 @@ const EXPIRED_DELAY = 600;
const GROUP_AVATAR_SIZE = AvatarSize.TWENTY_EIGHT; const GROUP_AVATAR_SIZE = AvatarSize.TWENTY_EIGHT;
const STICKER_SIZE = 200; const STICKER_SIZE = 200;
const GIF_SIZE = 300; const GIF_SIZE = 300;
const SELECTED_TIMEOUT = 1000; // Note: this needs to match the animation time
const SELECTED_TIMEOUT = 1200;
const THREE_HOURS = 3 * 60 * 60 * 1000; const THREE_HOURS = 3 * 60 * 60 * 1000;
const SENT_STATUSES = new Set<MessageStatusType>([ const SENT_STATUSES = new Set<MessageStatusType>([
'delivered', 'delivered',
@ -2583,9 +2584,7 @@ export class Message extends React.PureComponent<Props, State> {
const containerClassnames = classNames( const containerClassnames = classNames(
'module-message__container', 'module-message__container',
isGIF(attachments) ? 'module-message__container--gif' : null, isGIF(attachments) ? 'module-message__container--gif' : null,
isSelected && !isStickerLike isSelected ? 'module-message__container--selected' : null,
? 'module-message__container--selected'
: null,
!isStickerLike ? `module-message__container--${direction}` : null, !isStickerLike ? `module-message__container--${direction}` : null,
isEmojiOnly ? 'module-message__container--emoji' : null, isEmojiOnly ? 'module-message__container--emoji' : null,
isTapToView ? 'module-message__container--with-tap-to-view' : null, isTapToView ? 'module-message__container--with-tap-to-view' : null,

2
ts/jobs/helpers/sendGroupUpdate.ts
View file

@ -60,7 +60,7 @@ export async function sendGroupUpdate(
untrustedConversationIds, untrustedConversationIds,
}); });
throw new Error( throw new Error(
`Delete for everyone blocked because ${untrustedConversationIds.length} conversation(s) were untrusted. Failing this attempt.` `Group update blocked because ${untrustedConversationIds.length} conversation(s) were untrusted. Failing this attempt.`
); );
} }