Reply: Fix background in custom shape (#4826)

This commit is contained in:
Alexander Zinchuk 2024-08-06 20:06:45 +02:00
parent 4169b5c6ad
commit cebc6ccab9
2 changed files with 41 additions and 6 deletions

View File

@ -3,6 +3,9 @@
@use "../../../styles/icons"; @use "../../../styles/icons";
.EmbeddedMessage { .EmbeddedMessage {
--hover-opacity: 0;
--hover-background-color: black;
display: flex; display: flex;
align-items: center; align-items: center;
font-size: calc(var(--message-text-size, 1rem) - 0.125rem); font-size: calc(var(--message-text-size, 1rem) - 0.125rem);
@ -16,7 +19,35 @@
background-color: var(--accent-background-color); background-color: var(--accent-background-color);
transition: background-color 0.2s ease-in; --ripple-color: rgba(0, 0, 0, 0.08);
html.theme-dark & {
--ripple-color: rgba(255, 255, 255, 0.08);
--hover-background-color: white;
}
&:hover {
--hover-opacity: 0.04;
html.theme-dark & {
--hover-opacity: 0.08;
}
}
&::after {
transition: opacity 0.2s ease-in;
content: '';
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-color: var(--hover-background-color);
opacity: var(--hover-opacity);
pointer-events: none;
}
body.no-page-transitions & { body.no-page-transitions & {
.ripple-container { .ripple-container {
@ -29,11 +60,17 @@
} }
.custom-shape & { .custom-shape & {
--accent-color: white;
max-width: 15rem; max-width: 15rem;
margin: 0; margin: 0;
background-color: var(--color-reply-active); color: white !important;
background-color: var(--pattern-color);
box-shadow: 0 1px 2px var(--color-default-shadow); box-shadow: 0 1px 2px var(--color-default-shadow);
&::before {
background: var(--accent-color);
}
&:dir(rtl) { &:dir(rtl) {
padding: 0.5rem; padding: 0.5rem;
} }
@ -50,10 +87,6 @@
background: var(--bar-gradient, var(--accent-color)); background: var(--bar-gradient, var(--accent-color));
} }
&:active {
background-color: var(--background-active-color);
}
&.is-quote { &.is-quote {
.message-title { .message-title {
padding-inline-end: 0.75rem; padding-inline-end: 0.75rem;

View File

@ -37,6 +37,7 @@ import useThumbnail from '../../../hooks/useThumbnail';
import useMessageTranslation from '../../middle/message/hooks/useMessageTranslation'; import useMessageTranslation from '../../middle/message/hooks/useMessageTranslation';
import ActionMessage from '../../middle/ActionMessage'; import ActionMessage from '../../middle/ActionMessage';
import RippleEffect from '../../ui/RippleEffect';
import Icon from '../icons/Icon'; import Icon from '../icons/Icon';
import MediaSpoiler from '../MediaSpoiler'; import MediaSpoiler from '../MediaSpoiler';
import MessageSummary from '../MessageSummary'; import MessageSummary from '../MessageSummary';
@ -232,6 +233,7 @@ const EmbeddedMessage: FC<OwnProps> = ({
onClick={handleClick} onClick={handleClick}
onMouseDown={handleMouseDown} onMouseDown={handleMouseDown}
> >
<RippleEffect />
{mediaThumbnail && renderPictogram(mediaThumbnail, mediaBlobUrl, isRoundVideo, isProtected, isSpoiler)} {mediaThumbnail && renderPictogram(mediaThumbnail, mediaBlobUrl, isRoundVideo, isProtected, isSpoiler)}
{sender?.color?.backgroundEmojiId && ( {sender?.color?.backgroundEmojiId && (
<EmojiIconBackground <EmojiIconBackground