diff options
| -rw-r--r-- | app/javascript/flavours/glitch/styles/monsterpit.scss | 22 | ||||
| -rw-r--r-- | app/lib/formatter.rb | 5 |
2 files changed, 27 insertions, 0 deletions
diff --git a/app/javascript/flavours/glitch/styles/monsterpit.scss b/app/javascript/flavours/glitch/styles/monsterpit.scss index 495c5c179..75d2691ad 100644 --- a/app/javascript/flavours/glitch/styles/monsterpit.scss +++ b/app/javascript/flavours/glitch/styles/monsterpit.scss @@ -7,6 +7,28 @@ font-size: 12px; text-align: right; } + details.tags { + color: lighten($dark-text-color, 20%); + font-size: 12px; + text-align: right; + + a { + color: darken($secondary-text-color, 20%); + } + } +} + +.composer--reply > .content { + p.signature { + color: $dark-text-color; + } + details.tags { + color: $dark-text-color; + + a { + color: darken($secondary-text-color, 50%); + } + } } div.media-caption { diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb index 2d35a07bc..62047e4bd 100644 --- a/app/lib/formatter.rb +++ b/app/lib/formatter.rb @@ -219,6 +219,11 @@ class Formatter html = "#{html.strip}<p class=\"signature\">— #{footer}</p>" end + unless status.tags.blank? + tags = encode_and_link_urls(status.tags.pluck(:name).sort.map{ |t| "##{t}" }.join(' ')) + html = "#{html}<details class=\"tags\"><summary>\xf0\x9f\x8f\xb7</summary><p class=\"tags\">#{tags}</p></details>" + end + html.html_safe # rubocop:disable Rails/OutputSafety end |