From 3fdb4a94ae70a9cc18442b44353e1adcd0105d75 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Wed, 15 Sep 2021 04:16:35 -0500 Subject: [PATCH] Move Sepia theme to correct location and clean up the header links --- NetNewsWire.xcodeproj/project.pbxproj | 2 +- .../Resources/Sepia.nnwtheme/Info.plist | 0 .../Resources/Sepia.nnwtheme/stylesheet.css | 37 +++++++++++++++---- .../Resources/Sepia.nnwtheme/template.html | 0 4 files changed, 31 insertions(+), 8 deletions(-) rename {iOS => Shared}/Resources/Sepia.nnwtheme/Info.plist (100%) rename {iOS => Shared}/Resources/Sepia.nnwtheme/stylesheet.css (93%) rename {iOS => Shared}/Resources/Sepia.nnwtheme/template.html (100%) diff --git a/NetNewsWire.xcodeproj/project.pbxproj b/NetNewsWire.xcodeproj/project.pbxproj index e46637fb5..65e5cd3f0 100644 --- a/NetNewsWire.xcodeproj/project.pbxproj +++ b/NetNewsWire.xcodeproj/project.pbxproj @@ -2613,6 +2613,7 @@ 844B5B681FEA20DF00C7C76A /* SidebarKeyboardShortcuts.plist */, 845479871FEB77C000AD8B59 /* TimelineKeyboardShortcuts.plist */, 5127B237222B4849006D641D /* DetailKeyboardShortcuts.plist */, + 5112434F26EE6291002601D2 /* Sepia.nnwtheme */, ); path = Resources; sourceTree = ""; @@ -3705,7 +3706,6 @@ 84C9FC9C2262A1A900D921D6 /* Info.plist */, 84BB0F812333426400DED65E /* NetNewsWire.entitlements */, 51F805ED24284C1C0022C792 /* NetNewsWire-dev.entitlements */, - 5112434F26EE6291002601D2 /* Sepia.nnwtheme */, ); path = Resources; sourceTree = ""; diff --git a/iOS/Resources/Sepia.nnwtheme/Info.plist b/Shared/Resources/Sepia.nnwtheme/Info.plist similarity index 100% rename from iOS/Resources/Sepia.nnwtheme/Info.plist rename to Shared/Resources/Sepia.nnwtheme/Info.plist diff --git a/iOS/Resources/Sepia.nnwtheme/stylesheet.css b/Shared/Resources/Sepia.nnwtheme/stylesheet.css similarity index 93% rename from iOS/Resources/Sepia.nnwtheme/stylesheet.css rename to Shared/Resources/Sepia.nnwtheme/stylesheet.css index 125ba0963..229d2b3ed 100644 --- a/iOS/Resources/Sepia.nnwtheme/stylesheet.css +++ b/Shared/Resources/Sepia.nnwtheme/stylesheet.css @@ -10,10 +10,6 @@ body { color: #704214; } -a { - text-decoration: none; -} - a:hover { text-decoration: underline; } @@ -51,7 +47,6 @@ a:hover { } body a, body a:visited { - text-decoration: underline; color: var(--secondary-accent-color); } @@ -77,10 +72,15 @@ body > .systemMessage { color: var(--system-message-color); } -.feedlink a:link, .feedlink a:visited { +.headerContainer a:link, .headerContainer a:visited { + text-decoration: none; color: var(--feedlink-color); } +.headerContainer a:hover { + text-decoration: underline; +} + .avatar img { border-radius: 4px; } @@ -98,28 +98,43 @@ body > .systemMessage { } .articleTitle a:link, .articleTitle a:visited { + text-decoration: none; color: var(--article-title-color); margin-top: 26px; } +.articleTitle a:hover { + text-decoration: underline; +} + .articleDateline { margin-bottom: 5px; font-weight: bold; } .articleDateline a:link, .articleDateline a:visited { + text-decoration: none; color: var(--article-date-color); } +.articleDateline a:hover { + text-decoration: underline; +} + .articleDatelineTitle { margin-bottom: 5px; font-weight: bold; } .articleDatelineTitle a:link, .articleDatelineTitle a:visited { + text-decoration: none; color: var(--article-title-color); } +.articleDatelineTitle a:hover { + text-decoration: underline; +} + .externalLink { margin-bottom: 5px; font-style: italic; @@ -129,6 +144,14 @@ body > .systemMessage { text-overflow: ellipsis; } +.externalLink a:link, .externalLink a:visited { + text-decoration: none; +} + +.externalLink a:hover { + text-decoration: underline; +} + .articleBody { margin-top: 20px; line-height: 1.6em; @@ -402,4 +425,4 @@ a.footnote:hover, border: 1px solid var(--primary-accent-color); } -} +} \ No newline at end of file diff --git a/iOS/Resources/Sepia.nnwtheme/template.html b/Shared/Resources/Sepia.nnwtheme/template.html similarity index 100% rename from iOS/Resources/Sepia.nnwtheme/template.html rename to Shared/Resources/Sepia.nnwtheme/template.html