From dd8bf46e92ec4c3e41f8f1de5134e6f6a846ba77 Mon Sep 17 00:00:00 2001
From: Alexander Zinchuk <alx.zinchuk@gmail.com>
Date: Wed, 11 Dec 2024 18:16:19 +0100
Subject: [PATCH] Web Page: Change photo preview position (#5308)

---
 src/components/middle/message/WebPage.scss    |  2 ++
 src/components/middle/message/WebPage.tsx     | 22 ++++++++--------
 .../middle/message/_message-content.scss      | 26 ++++++++++---------
 3 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/src/components/middle/message/WebPage.scss b/src/components/middle/message/WebPage.scss
index b827c3560..f5bc4ad85 100644
--- a/src/components/middle/message/WebPage.scss
+++ b/src/components/middle/message/WebPage.scss
@@ -72,6 +72,7 @@
   .WebPage--content {
     position: relative;
     margin-inline-start: 0.375rem;
+    margin-inline-end: 0.25rem;
 
     &.is-story {
       display: flex;
@@ -108,6 +109,7 @@
 
   .media-inner {
     margin: 0 !important;
+    margin-block: 0.25rem !important;
 
     &,
     & img,
diff --git a/src/components/middle/message/WebPage.tsx b/src/components/middle/message/WebPage.tsx
index b8cd22a11..a2cc97b8b 100644
--- a/src/components/middle/message/WebPage.tsx
+++ b/src/components/middle/message/WebPage.tsx
@@ -194,6 +194,17 @@ const WebPage: FC<OwnProps> = ({
         {isStory && (
           <BaseStory story={story} isProtected={isProtected} isConnected={isConnected} isPreview />
         )}
+        {isArticle && (
+          <div className="WebPage-text">
+            <SafeLink className="site-name" url={url} text={siteName || displayUrl} />
+            {!inPreview && title && (
+              <p className="site-title">{renderText(title)}</p>
+            )}
+            {truncatedDescription && (
+              <p className="site-description">{renderText(truncatedDescription, ['emoji', 'br'])}</p>
+            )}
+          </div>
+        )}
         {photo && !video && !document && (
           <Photo
             photo={photo}
@@ -212,17 +223,6 @@ const WebPage: FC<OwnProps> = ({
             onCancelUpload={onCancelMediaTransfer}
           />
         )}
-        {isArticle && (
-          <div className="WebPage-text">
-            <SafeLink className="site-name" url={url} text={siteName || displayUrl} />
-            {!inPreview && title && (
-              <p className="site-title">{renderText(title)}</p>
-            )}
-            {truncatedDescription && (
-              <p className="site-description">{renderText(truncatedDescription, ['emoji', 'br'])}</p>
-            )}
-          </div>
-        )}
         {!inPreview && video && (
           <Video
             video={video}
diff --git a/src/components/middle/message/_message-content.scss b/src/components/middle/message/_message-content.scss
index 963109867..eaa3f265b 100644
--- a/src/components/middle/message/_message-content.scss
+++ b/src/components/middle/message/_message-content.scss
@@ -622,6 +622,20 @@
   }
 }
 
+.message-content:not(.web-page).media {
+  // Moved below `.has-subheader` to overwrite its styles
+  &.is-inverted-media.has-fact-check .media-inner:not(.file-preview),
+  &.is-inverted-media.has-fact-check .Album,
+  &.text:not(.is-inverted-media) .media-inner:not(.file-preview),
+  &.text:not(.is-inverted-media) .Album {
+    margin-bottom: 0.375rem !important;
+
+    body.is-ios .Message.own & {
+      margin-bottom: 0.375rem;
+    }
+  }
+}
+
 .message-content.media,
 .WebPage:not(.with-document) {
   .media-inner {
@@ -696,18 +710,6 @@
     margin-bottom: 0;
   }
 
-  // Moved below `.has-subheader` to overwrite its styles
-  &.is-inverted-media.has-fact-check .media-inner:not(.file-preview),
-  &.is-inverted-media.has-fact-check .Album,
-  &.text:not(.is-inverted-media) .media-inner:not(.file-preview),
-  &.text:not(.is-inverted-media) .Album {
-    margin-bottom: 0.375rem !important;
-
-    body.is-ios .Message.own & {
-      margin-bottom: 0.375rem;
-    }
-  }
-
   .media-loading {
     display: flex;
     align-items: center;