about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorFire Demon <firedemon@creature.cafe>2020-08-15 20:08:29 -0500
committerFire Demon <firedemon@creature.cafe>2020-08-30 05:45:18 -0500
commit2fa9ed909c5ccd744779ed5dbe9fedc7259df24f (patch)
treee889f5635ffdddc1643e38848415424c407352a7 /app
parentd8d97d4d829a868c57a512677bc3770e30476f42 (diff)
[UI] Compact status prepend indicators
Diffstat (limited to 'app')
-rw-r--r--app/javascript/flavours/glitch/styles/monsterfork/components/status.scss19
-rw-r--r--app/views/statuses/_status.html.haml7
2 files changed, 18 insertions, 8 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