From cda9566eb0789c7246772b05fcde9f4943b46634 Mon Sep 17 00:00:00 2001 From: Nolan Lawson Date: Sun, 28 Jan 2018 17:10:03 -0800 Subject: [PATCH] fix links in statuses --- routes/_components/AccountProfile.html | 12 ++++++- routes/_components/status/Status.html | 33 ++++++++++++++----- .../_components/timeline/StatusListItem.html | 7 +++- routes/_components/timeline/Timeline.html | 6 +++- 4 files changed, 46 insertions(+), 12 deletions(-) diff --git a/routes/_components/AccountProfile.html b/routes/_components/AccountProfile.html index b5ef408..5405435 100644 --- a/routes/_components/AccountProfile.html +++ b/routes/_components/AccountProfile.html @@ -6,7 +6,9 @@
- {{profile.display_name}} + + {{profile.display_name}} +
{{'@' + profile.acct}} @@ -127,6 +129,14 @@ text-overflow: ellipsis; min-width: 0; } + .account-profile-name a { + color: var(--body-text-color); + text-decoration: none; + } + .account-profile-name a:hover { + color: var(--body-text-color); + text-decoration: underline; + } .account-profile-note { grid-area: note; padding: 10px 0; diff --git a/routes/_components/status/Status.html b/routes/_components/status/Status.html index 4847e5e..2c9a2a3 100644 --- a/routes/_components/status/Status.html +++ b/routes/_components/status/Status.html @@ -7,22 +7,37 @@ - - {{status.account.username}} - boosted + {{#if timelineType === 'account' && timelineValue === status.account.id}} + {{status.account.username}} + {{else}} + {{status.account.username}} + {{/if}} + boosted
{{/if}}
- - {{originalAccount.display_name || originalAccount.username}} - + {{#if timelineType === 'account' && timelineValue === originalAccount.id}} + + {{originalAccount.display_name || originalAccount.username}} + + {{else}} + + {{originalAccount.display_name || originalAccount.username}} + + {{/if}} {{'@' + originalAccount.acct}} - + {{#if timelineType === 'status'}} + + {{else}} + + {{/if}}
{{#if originalStatus.spoiler_text}} diff --git a/routes/_components/timeline/StatusListItem.html b/routes/_components/timeline/StatusListItem.html index ad369ac..6b9635e 100644 --- a/routes/_components/timeline/StatusListItem.html +++ b/routes/_components/timeline/StatusListItem.html @@ -1,4 +1,9 @@ - +