Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: reaction emoji pills and count size update #15643

Merged
merged 12 commits into from
Aug 24, 2023
Merged

fix: reaction emoji pills and count size update #15643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
bc3c0ef
fix: add conversation max width, fix video, image, link preview display
arjita-mitra Aug 21, 2023
a3ddd21
correct position of read receipt and quote width
V-Gira Aug 22, 2023
0345a09
correct display of failure to add errors
V-Gira Aug 22, 2023
dee68b2
assign correct width to wrapping div
V-Gira Aug 22, 2023
346a607
fix image responsivity issue
V-Gira Aug 22, 2023
f287d0b
fix: message action menu stop font size scaling
arjita-mitra Aug 22, 2023
e77b7f8
Merge branch 'bugfix/reaction-dev' of https://github.com/wireapp/wire…
arjita-mitra Aug 22, 2023
de9d098
Update src/script/components/MessagesList/Message/FailedToAddUsersMes…
arjita-mitra Aug 22, 2023
da88c44
remove extraneous asset padding
V-Gira Aug 22, 2023
1d09c2e
restore some margin top to assets
V-Gira Aug 23, 2023
9be69a6
fix: update emoji pill and count size
arjita-mitra Aug 24, 2023
47c9e5b
Merge branch 'dev' of https://github.com/wireapp/wire-webapp into bug…
arjita-mitra Aug 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion ...ponents/MessagesList/Message/ContentMessage/MessageActions/MessageReactions/EmojiPill.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,13 @@ const EmojiPill: FC<EmojiPillProps> = ({
}
}}
>
<EmojiImg emojiUrl={emojiUrl} emojiName={emojiName} />
<EmojiImg
emojiUrl={emojiUrl}
emojiName={emojiName}
emojiImgSize={{
width: 'var(--font-size-medium)',
}}
/>
<span css={messageReactionCount(isActive)}>{emojiCount}</span>
</button>
</Tooltip>
Expand Down
2 changes: 1 addition & 1 deletion ...gesList/Message/ContentMessage/MessageActions/MessageReactions/MessageReactions.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ export const messageReactionButtonTooltipTextLink: CSSObject = {
export const messageReactionCount = (isActive?: boolean): CSSObject => {
return {
color: isActive ? 'var(--accent-color)' : 'var(--message-reactions-count)',
fontSize: 'var(--font-size-base)',
fontSize: 'var(--font-size-small)',
letterSpacing: '0.031rem',
};
};
Expand Down
Loading