From 59eaff95120bc1278f37f95fc74bc2e2518b9ef1 Mon Sep 17 00:00:00 2001 From: r Date: Sat, 14 Dec 2019 10:57:14 +0000 Subject: Show retweet info in status --- static/main.css | 24 +++++++++- templates/status.tmpl | 122 ++++++++++++++++++++++++++++---------------------- 2 files changed, 91 insertions(+), 55 deletions(-) diff --git a/static/main.css b/static/main.css index e81de2a..5420e40 100644 --- a/static/main.css +++ b/static/main.css @@ -1,6 +1,9 @@ +.status-container-container { + margin: 16px 0; +} + .status-container { display: flex; - margin: 16px 0; } .status-content { @@ -107,3 +110,22 @@ .signin-form input { margin: 4px 0; } + +.retweet-info { + margin: 8px 0 4px 24px; +} + +.retweet-info .status-profile-img { + height: 24px; + width: 24px; + margin-bottom: -8px; + object-fit: contain; +} + +.retweet-info .status-dname{ + margin-left: 4px +} + +.retweet-info .icon.dripicons-retweet.retweeted { + vertical-align: sub; +} diff --git a/templates/status.tmpl b/templates/status.tmpl index fde2309..baccabb 100644 --- a/templates/status.tmpl +++ b/templates/status.tmpl @@ -1,64 +1,78 @@ -
-
+
+ {{if .Reblog}} +
profile-avatar + {{WithEmojis .Account.DisplayName .Account.Emojis}} + + repeated
-
-
- {{WithEmojis .Account.DisplayName .Account.Emojis}} - {{.Account.Acct}} + {{template "status" .Reblog}} + {{else}} + {{block "status" .}} +
+
+ profile-avatar
-
{{WithEmojis .Content .Emojis}}
-
- {{range .MediaAttachments}} - {{if eq .Type "image"}} - - status-image - - {{else if eq .Type "audio"}} - - {{else if eq .Type "video"}} - - {{else}} - attachment - {{end}} - {{end}} -
-
- - - {{DisplayInteractionCount .RepliesCount}} - - {{if .Reblogged}} - - - {{DisplayInteractionCount .ReblogsCount}} +
+
+ {{WithEmojis .Account.DisplayName .Account.Emojis}} + {{.Account.Acct}} +
+
{{WithEmojis .Content .Emojis}}
+
+ {{range .MediaAttachments}} + {{if eq .Type "image"}} + + status-image + {{else if eq .Type "audio"}} + + {{else if eq .Type "video"}} + {{else}} - - - {{DisplayInteractionCount .ReblogsCount}} - + attachment {{end}} - {{if .Favourited}} - - - {{DisplayInteractionCount .FavouritesCount}} - - {{else}} - - - {{DisplayInteractionCount .FavouritesCount}} - {{end}} - - - +
+
+ + + {{DisplayInteractionCount .RepliesCount}} + + {{if .Reblogged}} + + + {{DisplayInteractionCount .ReblogsCount}} + + {{else}} + + + {{DisplayInteractionCount .ReblogsCount}} + + {{end}} + {{if .Favourited}} + + + {{DisplayInteractionCount .FavouritesCount}} + + {{else}} + + + {{DisplayInteractionCount .FavouritesCount}} + + {{end}} + + + +
+ {{end}} + {{end}}
-- cgit v1.2.3