From 08ec438496e6db6feffe77664cb77d70b29b337a Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 14 Jun 2024 17:14:46 +0200
Subject: [PATCH] Change margins

---
 .../components/notification_poll.tsx          |  2 +-
 app/javascript/mastodon/locales/en.json       |  2 +-
 .../styles/mastodon/components.scss           | 30 +++++++++++++++++--
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_poll.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_poll.tsx
index 7d768a7278..ac6c7e5cfc 100644
--- a/app/javascript/mastodon/features/notifications_v2/components/notification_poll.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_poll.tsx
@@ -9,7 +9,7 @@ import { NotificationWithStatus } from './notification_with_status';
 const labelRendererOther = () => (
   <FormattedMessage
     id='notification.poll'
-    defaultMessage='A poll you have voted in has ended'
+    defaultMessage='A poll you voted in has ended'
   />
 );
 
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index f0ad6f1551..eec77079da 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -490,7 +490,7 @@
   "notification.moderation_warning.action_silence": "Your account has been limited.",
   "notification.moderation_warning.action_suspend": "Your account has been suspended.",
   "notification.own_poll": "Your poll has ended",
-  "notification.poll": "A poll you have voted in has ended",
+  "notification.poll": "A poll you voted in has ended",
   "notification.reblog": "{name} boosted your post",
   "notification.relationships_severance_event": "Lost connections with {name}",
   "notification.relationships_severance_event.account_suspension": "An admin from {from} has suspended {target}, which means you can no longer receive updates from them or interact with them.",
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 184d1fc29a..9f46ffde63 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -10184,7 +10184,7 @@ noscript {
   align-items: center;
   border: 1px solid var(--background-border-color);
   border-top: 0;
-  padding: 16px;
+  padding: 16px 24px;
   gap: 8px;
   color: $darker-text-color;
   text-decoration: none;
@@ -10338,7 +10338,7 @@ noscript {
   display: flex;
   align-items: flex-start;
   gap: 8px;
-  padding: 16px;
+  padding: 16px 24px;
   border-bottom: 1px solid var(--background-border-color);
 
   &__icon {
@@ -10466,7 +10466,7 @@ noscript {
 }
 
 .notification-ungrouped {
-  padding: 16px;
+  padding: 16px 24px;
   border-bottom: 1px solid var(--background-border-color);
 
   &__header {
@@ -10513,6 +10513,30 @@ noscript {
     }
   }
 
+  $icon-margin: 48px; // 40px avatar + 8px gap
+
+  .status__content,
+  .status__action-bar,
+  .media-gallery,
+  .video-player,
+  .audio-player,
+  .attachment-list,
+  .picture-in-picture-placeholder,
+  .more-from-author,
+  .status-card,
+  .hashtag-bar {
+    margin-inline-start: $icon-margin;
+    width: calc(100% - $icon-margin);
+  }
+
+  .more-from-author {
+    width: calc(100% - $icon-margin + 2px);
+  }
+
+  .status__content__read-more-button {
+    margin-inline-start: $icon-margin;
+  }
+
   .notification__report {
     border: 0;
     padding: 0;