From 5478b344796798e6aadd5554007f4ee85c347ebc Mon Sep 17 00:00:00 2001 From: r Date: Tue, 22 Sep 2020 15:42:16 +0000 Subject: [PATCH] Use '@' prefix for all usernames --- static/style.css | 4 ---- templates/nav.tmpl | 2 +- templates/notification.tmpl | 18 +++++++++++------- templates/status.tmpl | 11 +++++++---- templates/user.tmpl | 2 +- templates/userlist.tmpl | 4 ++-- 6 files changed, 22 insertions(+), 19 deletions(-) diff --git a/static/style.css b/static/style.css index d27b9e6..db2ae1b 100644 --- a/static/style.css +++ b/static/style.css @@ -157,10 +157,6 @@ overflow: auto; } -.notification-follow-uname { - margin-top: 8px; -} - .notification-time { margin-left: 8px; } diff --git a/templates/nav.tmpl b/templates/nav.tmpl index cfac439..d98410f 100644 --- a/templates/nav.tmpl +++ b/templates/nav.tmpl @@ -10,7 +10,7 @@
{{EmojiFilter .User.DisplayName .User.Emojis}} - {{.User.Acct}} + @{{.User.Acct}}
diff --git a/templates/notification.tmpl b/templates/notification.tmpl index 2943847..55424da 100644 --- a/templates/notification.tmpl +++ b/templates/notification.tmpl @@ -22,7 +22,7 @@
@@ -33,8 +33,8 @@ -
-
- @{{.Account.Acct}} +
+ @{{.Account.Acct}}
@@ -45,9 +45,11 @@ {{else if eq .Type "reblog"}}
- avatar + avatar + + + @{{.Account.Acct}} - {{EmojiFilter .Account.DisplayName .Account.Emojis}} retweeted your post - @@ -58,9 +60,11 @@ {{else if eq .Type "favourite"}}
- avatar + avatar + + + @{{.Account.Acct}} - {{EmojiFilter .Account.DisplayName .Account.Emojis}} liked your post - diff --git a/templates/status.tmpl b/templates/status.tmpl index 7d510e2..1e3d514 100644 --- a/templates/status.tmpl +++ b/templates/status.tmpl @@ -3,9 +3,12 @@ {{if .Reblog}}
- avatar + avatar {{EmojiFilter .Account.DisplayName .Account.Emojis}} + + @{{.Account.Acct}} + retweeted
{{template "status" (WithContext .Reblog $.Ctx)}} @@ -15,14 +18,14 @@
{{EmojiFilter .Account.DisplayName .Account.Emojis}} - {{.Account.Acct}} + @{{.Account.Acct}}