FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove Javascript class twiddling for darkmode 

As of 10.14.4, WKWebView supports the `@media(prefers-color-scheme:dark)`
CSS query to handle darkmode transitions.
This commit is contained in:
Matt Meissner 2019-04-01 09:44:43 -05:00
parent b0dd9cc347
commit eaefa4540c
2 changed files with 43 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
NetNewsWire/MainWindow/Detail/DetailWebView.swift
View File

@ -40,11 +40,6 @@ final class DetailWebView: WKWebView {
super.willOpenMenu(menu, with: event) super.willOpenMenu(menu, with: event)
} }
override func viewDidChangeEffectiveAppearance() {
let bodyClass = effectiveAppearance.isDarkMode ? "dark" : "light"
evaluateJavaScript("document.getElementById('bodyId').className = '\(bodyClass)'")
}
override func viewWillStartLiveResize() { override func viewWillStartLiveResize() {
super.viewWillStartLiveResize() super.viewWillStartLiveResize()
evaluateJavaScript("document.body.style.overflow = 'hidden';", completionHandler: nil) evaluateJavaScript("document.body.style.overflow = 'hidden';", completionHandler: nil)

95
NetNewsWire/MainWindow/Detail/styleSheet.css
View File

@ -28,73 +28,62 @@ a:hover {
transform: translateX(-55%) translateY(-50%); transform: translateX(-55%) translateY(-50%);
} }
/* Light mode */ :root {
--body-color: #444;
body.light { --body-background-color: -apple-system-text-background;
color: #444; --link-color: hsla(215, 99%, 43%, 1);
background-color: -apple-system-text-background; --header-table-border-color: rgba(0, 0, 0, 0.1);
--header-color: rgba(0, 0, 0, 0.3);
--header-link-color: rgba(0, 0, 0, 0.3);
--body-code-color: #666;
--system-message-color: #cbcbcb;
--feedlink-color: rgba(0, 0, 0, 0.6);
} }
body.light a, body.light a:link, body.light a:visited { @media(prefers-color-scheme: dark) {
color: hsla(215, 99%, 43%, 1); :root {
--body-color: #d2d2d2;
--body-background-color: #2d2d2d;
--link-color: #4490e2;
--header-table-border-color: rgba(255, 255, 255, 0.1);
--header-color: #d2d2d2;
--header-link-color: #4490e2;
--body-code-color: #b2b2b2;
--system-message-color: #5f5f5f
} }
body.light .headerTable {
border-bottom: 1px solid rgba(0, 0, 0, 0.1);
}
body.light .header {
color: rgba(0, 0, 0, 0.3);
}
body.light .header a:link, body.light .header a:visited {
color: rgba(0, 0, 0, 0.3);
}
body.light .articleDateline, body.light .articleDateLine.a:link, body.light .articleDateline a:visited {
color: rgba(0, 0, 0, 0.3);
} }
body.light code, body.light pre { body {
color: #666; color: var(--body-color);
background-color: var(--body-background-color);
} }
.light > .systemMessage { body a, body a:link, body a:visited {
color: #cbcbcb; color: var(--link-color);
}
body .headerTable {
border-bottom: 1px solid var(--header-table-border-color);
}
body .header {
color: var(--header-color);
}
body .header a:link, body .header a:visited {
color: var(--header-link-color);
}
body .articleDateline, body .articleDateLine.a:link, body .articleDateline a:visited {
color: var(--header-color);
} }
/* Dark mode */ body code, body pre {
color: var(--body-code-color);
body.dark {
color: #d2d2d2;
background-color: #2d2d2d;
}
body.dark a, body.dark a:link, body.dark a:visited {
color: #4490e2;
}
body.dark .headerTable {
border-bottom: 1px solid rgba(255, 255, 255, 0.1);
} }
body.dark .header a:link, body.dark .header a:visited { body > .systemMessage {
color: #4490e2; color: var(--system-message-color);
}
body.dark .header {
color: #d2d2d2;
}
body.dark .articleDateline {
color: #d2d2d2;
}
body.dark .articleDateline, body.dark .articleDateLine.a:link, body.dark .articleDateline a:visited {
color: #d2d2d2;
}
body.dark code, body.dark pre {
color: #b2b2b2;
}
.dark > .systemMessage {
color: #5f5f5f;
} }
.feedlink a:link, .feedlink a:visited { .feedlink a:link, .feedlink a:visited {
color: rgba(0, 0, 0, 0.6); color: var(--feed-link-color);
} }
.avatar img { .avatar img {
border-radius: 4px; border-radius: 4px;