From 0ac49997e537b45b80ea6a971e55f653145ecacb Mon Sep 17 00:00:00 2001
From: zubiden <19638254+zubiden@users.noreply.github.com>
Date: Wed, 27 Nov 2024 20:34:24 +0400
Subject: [PATCH] Message: Fix paddings in forwards (#5241)

---
 src/components/middle/message/Album.scss      | 12 ----------
 .../middle/message/_message-content.scss      | 23 ++++++-------------
 2 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/src/components/middle/message/Album.scss b/src/components/middle/message/Album.scss
index b23b8f92f..35b5366fe 100644
--- a/src/components/middle/message/Album.scss
+++ b/src/components/middle/message/Album.scss
@@ -3,18 +3,6 @@
   overflow: hidden;
   margin: auto;
 
-  .message-content.media.text & {
-    margin: -0.3125rem -0.5rem 0.3125rem;
-
-    + .message-paid-media-status {
-      margin-right: -0.5rem;
-    }
-  }
-
-  body.is-ios .Message.own .message-content.has-solid-background :not(.forwarded-message) & {
-    margin: -0.3125rem -0.5rem 0.3125rem -0.625rem;
-  }
-
   &,
   .message-content.media.text & {
     > .album-item-select-wrapper .media-inner {
diff --git a/src/components/middle/message/_message-content.scss b/src/components/middle/message/_message-content.scss
index 25b0bbd43..7b9c66694 100644
--- a/src/components/middle/message/_message-content.scss
+++ b/src/components/middle/message/_message-content.scss
@@ -642,7 +642,9 @@
   &.text .media-inner,
   &.is-via-bot .media-inner,
   &.has-subheader .media-inner,
-  &.has-subheader .Album {
+  &.has-subheader .Album,
+  &.is-forwarded .media-inner,
+  &.is-forwarded .Album {
     margin-left: -0.5rem;
     margin-right: -0.5rem;
 
@@ -651,10 +653,6 @@
     }
   }
 
-  &.is-forwarded.text .media-inner {
-    margin-top: 0;
-  }
-
   &.text .media-inner {
     margin-top: -0.3125rem;
   }
@@ -674,10 +672,12 @@
   }
 
   &.has-subheader .media-inner,
-  &.force-sender-name .Album,
   &.has-subheader .Album,
+  &.force-sender-name .Album,
+  &.is-forwarded .media-inner,
+  &.is-forwarded .Album,
   .message-title ~ .media-inner {
-    margin-top: 0.375rem;
+    margin-top: 0.25rem;
     margin-bottom: -0.375rem;
 
     body.is-ios .Message.own & {
@@ -962,11 +962,6 @@
 }
 
 .forwarded-message {
-  .message-content:not(.custom-shape) & {
-    position: relative;
-    margin-top: 0.25rem;
-  }
-
   --border-top-left-radius: 0;
   --border-top-right-radius: 0;
 
@@ -974,10 +969,6 @@
     --border-bottom-left-radius: 0;
     --border-bottom-right-radius: 0;
   }
-
-  .Album {
-    margin-top: 0 !important;
-  }
 }
 
 .text-entity-link {