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

Fix nested border-radius for attachments

Browse source
This commit is contained in:
Fedor Indutny 2021-06-02 17:41:23 -07:00 • committed by GitHub
parent 6642652bdb
commit 430d60093a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
stylesheets/_modules.scss
View file

@ -583,7 +583,6 @@
bottom: -10px; bottom: -10px;
} }
border-radius: 16px;
line-height: 0; line-height: 0;
overflow: hidden; overflow: hidden;
@ -596,18 +595,10 @@
&--with-content-below { &--with-content-below {
margin-bottom: 7px; margin-bottom: 7px;
border-bottom-left-radius: 0px;
border-bottom-right-radius: 0px;
} }
&--with-content-above { &--with-content-above {
margin-top: 4px; margin-top: 4px;
border-top-left-radius: 0px;
border-top-right-radius: 0px;
}
.module-message__container--gif & {
border-radius: inherit;
} }
} }

38
ts/components/conversation/Message.stories.tsx
View file

@ -717,6 +717,44 @@ story.add('Image', () => {
return renderBothDirections(props); return renderBothDirections(props);
}); });
story.add('Multiple Images', () => {
const props = createProps({
attachments: [
{
url: '/fixtures/tina-rolf-269345-unsplash.jpg',
fileName: 'tina-rolf-269345-unsplash.jpg',
contentType: IMAGE_JPEG,
width: 128,
height: 128,
},
{
url: '/fixtures/tina-rolf-269345-unsplash.jpg',
fileName: 'tina-rolf-269345-unsplash.jpg',
contentType: IMAGE_JPEG,
width: 128,
height: 128,
},
{
url: '/fixtures/tina-rolf-269345-unsplash.jpg',
fileName: 'tina-rolf-269345-unsplash.jpg',
contentType: IMAGE_JPEG,
width: 128,
height: 128,
},
{
url: '/fixtures/tina-rolf-269345-unsplash.jpg',
fileName: 'tina-rolf-269345-unsplash.jpg',
contentType: IMAGE_JPEG,
width: 128,
height: 128,
},
],
status: 'sent',
});
return renderBothDirections(props);
});
story.add('Image with Caption', () => { story.add('Image with Caption', () => {
const props = createProps({ const props = createProps({
attachments: [ attachments: [