From f15ade5ebb9d9486d7c673393aa590e207ba40ac Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Sun, 19 Jan 2020 17:28:06 -0700 Subject: [PATCH] Make the article datetime always a link to the article permalink. Issue #1655 --- Shared/Article Rendering/ArticleRenderer.swift | 12 +----------- iOS/Resources/styleSheet.css | 4 ++++ 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/Shared/Article Rendering/ArticleRenderer.swift b/Shared/Article Rendering/ArticleRenderer.swift index ef7766ce6..327bbec76 100644 --- a/Shared/Article Rendering/ArticleRenderer.swift +++ b/Shared/Article Rendering/ArticleRenderer.swift @@ -157,7 +157,7 @@ private extension ArticleRenderer { let mediumDate = dateString(datePublished, .medium, .short) let shortDate = dateString(datePublished, .short, .short) - if dateShouldBeLink() || self.title == "", let permalink = article.url { + if let permalink = article.url { d["date_long"] = longDate.htmlByAddingLink(permalink) d["date_medium"] = mediumDate.htmlByAddingLink(permalink) d["date_short"] = shortDate.htmlByAddingLink(permalink) @@ -173,16 +173,6 @@ private extension ArticleRenderer { return d } - func dateShouldBeLink() -> Bool { - guard let permalink = article?.url else { - return false - } - guard let preferredLink = article?.preferredLink else { // Title uses preferredLink - return false - } - return permalink != preferredLink // Make date a link if it’s a different link from the title’s link - } - func byline() -> String { guard let authors = article?.authors ?? article?.webFeed?.authors, !authors.isEmpty else { return "" diff --git a/iOS/Resources/styleSheet.css b/iOS/Resources/styleSheet.css index 34eaa84cf..9f38b5b78 100644 --- a/iOS/Resources/styleSheet.css +++ b/iOS/Resources/styleSheet.css @@ -116,6 +116,10 @@ body > .systemMessage { font-weight: bold; } +.articleDateline a:link, .articleDateline a:visited { + color: var(--article-title-color); +} + .articleBody { line-height: 1.6em; }