[UI] Compact status prepend indicators

3 files changed, 20 insertions, 9 deletions

diff --git a/app/javascript/flavours/glitch/styles/monsterfork/components/status.scss b/app/javascript/flavours/glitch/styles/monsterfork/components/status.scss
index 562be1975..30cd5d668 100644
--- a/app/javascript/flavours/glitch/styles/monsterfork/components/status.scss
+++ b/app/javascript/flavours/glitch/styles/monsterfork/components/status.scss
@@ -34,7 +34,7 @@
         outline: none;
       }
     }
-    
+
     & > summary > span,
     & > ul > li > span,
     & > ul > li > a {
@@ -165,3 +165,20 @@ div.media-caption {
 		}
 	}
 }
+
+.status__prepend {
+  margin-left: 0px;
+
+  .status__prepend-icon-wrapper {
+    left: 0px;
+  }
+
+  & > span {
+    margin-left: 25px;
+  }
+}
+
+.embed .status__prepend,
+.public-layout .status__prepend {
+  margin: -10px 0px 0px 5px;
+}
diff --git a/app/views/statuses/_status.html.haml b/app/views/statuses/_status.html.haml
index 0e3652503..5923316b4 100644
--- a/app/views/statuses/_status.html.haml
+++ b/app/views/statuses/_status.html.haml
@@ -27,17 +27,10 @@
     .status__prepend
       .status__prepend-icon-wrapper
         %i.status__prepend-icon.fa.fa-fw.fa-retweet
-      %span
-        = link_to ActivityPub::TagManager.instance.url_for(status.account), class: 'status__display-name muted' do
-          %bdi
-            %strong.emojify= display_name(status.account, custom_emojify: true)
-        = t('stream_entries.reblogged')
   - elsif pinned
     .status__prepend
       .status__prepend-icon-wrapper
         %i.status__prepend-icon.fa.fa-fw.fa-thumb-tack
-      %span
-        = t('stream_entries.pinned')
 
   = render (centered ? 'statuses/detailed_status' : 'statuses/simple_status'), status: status.proper, autoplay: autoplay
 
diff --git a/config/locales/en-MP.yml b/config/locales/en-MP.yml
index 481c299e5..26931ffe3 100644
--- a/config/locales/en-MP.yml
+++ b/config/locales/en-MP.yml
@@ -112,7 +112,8 @@ en-MP:
     over_daily_limit: You have exceeded the limit of %{limit} scheduled roars for that day
     over_total_limit: You have exceeded the limit of %{limit} scheduled roars
   stream_entries:
-    pinned: Pinned
+    pinned: ''
+    reblogged: ''
   pin_errors:
       limit: You have already pinned the maximum number of roars
       ownership: Someone else's roar cannot be pinned