From 28f65422e9833fc2ff851c490fa6eafa121cb0b5 Mon Sep 17 00:00:00 2001 From: WofWca Date: Sun, 22 Dec 2024 23:36:58 +0400 Subject: [PATCH 1/2] style: stickers being smaller than needed Because of `max-width: 80%`, which refers to 80% of the wrapper square, and not the chat section (the later was apparently the intention). This has been introduced in https://github.com/deltachat/deltachat-desktop/pull/4315, which has later been sort of reverted, but not completely, in https://github.com/deltachat/deltachat-desktop/pull/4407. So, let's remove the residuals, especially that stickers also have fixed `height: 200px`, so `max-height` doesn't make sense. --- CHANGELOG.md | 1 + packages/frontend/scss/message/_message-attachment.scss | 9 --------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 11f2709f8..6e157bac8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - dev: upgrade react to v18 and react pinch pan zoom to v3 ## Fixed +- fix stickers being smaller than they're supposed to #4432 ## [1.50.1] - 2024-12-18 diff --git a/packages/frontend/scss/message/_message-attachment.scss b/packages/frontend/scss/message/_message-attachment.scss index caf780a1d..a665f40e5 100644 --- a/packages/frontend/scss/message/_message-attachment.scss +++ b/packages/frontend/scss/message/_message-attachment.scss @@ -83,15 +83,6 @@ } } -.message.type-sticker { - .message-attachment-media { - & > .attachment-content { - max-height: 200px; - max-width: 80%; - } - } -} - .message-attachment-broken-media { @include button-reset; display: block; From 71633d39d088b2a6d02a596dcb6bfcc3598bc2d7 Mon Sep 17 00:00:00 2001 From: WofWca Date: Mon, 23 Dec 2024 00:11:54 +0400 Subject: [PATCH 2/2] style: fix reactions to stickers overlapping Apparently this `margin-bottom: -7px` is a residue from copy pasting it from `.metadata` for regular text messages. We have `marin: 0` set for image-only messages, so we should set `margin: 0` for sticker messages as well. Similar MR: https://github.com/deltachat/deltachat-desktop/pull/4237. --- CHANGELOG.md | 1 + packages/frontend/scss/message/_message.scss | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e157bac8..7a4104002 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ ## Fixed - fix stickers being smaller than they're supposed to #4432 +- fix reactions to sticker messages overlapping with next message #4433 ## [1.50.1] - 2024-12-18 diff --git a/packages/frontend/scss/message/_message.scss b/packages/frontend/scss/message/_message.scss index c34f5de40..2d142cfa6 100644 --- a/packages/frontend/scss/message/_message.scss +++ b/packages/frontend/scss/message/_message.scss @@ -245,7 +245,11 @@ .message-attachment-media { background-color: transparent; & > .attachment-content { - margin-bottom: 20px; + // Make space for the footer, which is `position: absolute;`. + // However, this does not account for the case + // where the footer text wraps. + margin-bottom: 26px; + cursor: default; } } @@ -253,7 +257,6 @@ .metadata { float: right; padding: 4px 8px 1px 8px; - margin-bottom: -7px; background-color: #01010159; border-radius: 4px; color: black;