diff --git a/README.md b/README.md index 5ae52f7d8..ee59093f4 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # ![Icon](Technotes/Images/icon.png) NetNewsWire -![CI](https://github.com/Ranchero-Software/NetNewsWire/workflows/CI/badge.svg?branch=master) +[![CI](https://github.com/Ranchero-Software/NetNewsWire/workflows/CI/badge.svg?branch=master)](https://github.com/Ranchero-Software/NetNewsWire/actions?query=workflow%3ACI+branch%3Amaster) It’s a free and open source feed reader for macOS and iOS. diff --git a/Shared/Article Rendering/main.js b/Shared/Article Rendering/main.js index 9b9535bae..6c79007fd 100644 --- a/Shared/Article Rendering/main.js +++ b/Shared/Article Rendering/main.js @@ -1,6 +1,9 @@ // Here we are making iframes responsive. Particularly useful for inline Youtube videos. function wrapFrames() { document.querySelectorAll("iframe").forEach(element => { + if (element.height > 0 || parseInt(element.style.height) > 0) + return; + var wrapper = document.createElement("div"); wrapper.classList.add("iframeWrap"); element.parentNode.insertBefore(wrapper, element); diff --git a/Shared/Article Rendering/shared.css b/Shared/Article Rendering/shared.css index 3dd1c9997..e487b3112 100644 --- a/Shared/Article Rendering/shared.css +++ b/Shared/Article Rendering/shared.css @@ -171,23 +171,22 @@ code, pre { padding: 0; } -img, figure, iframe, div { +img, figure, video, div { max-width: 100%; height: auto !important; margin: 0 auto; } +iframe { + max-width: 100%; + margin: 0 auto; +} + figure { margin-bottom: 1em; margin-top: 1em; } -video { - width: 100% !important; - height: auto !important; - margin: 0 auto; -} - figcaption { font-size: 14px; line-height: 1.3em; diff --git a/Technotes/privacypolicy.markdown b/Technotes/privacypolicy.markdown index 8119b7e9a..a8575b02d 100644 --- a/Technotes/privacypolicy.markdown +++ b/Technotes/privacypolicy.markdown @@ -50,9 +50,9 @@ Neither ranchero.com nor inessential.com use any cookies or JavaScript, and they ### Related sites -The [NetNewsWire GitHub repository](https://github.com/brentsimmons/NetNewsWire) does use cookies and JavaScript, because that’s how GitHub works. The repository, including the issue tracker and anything you post there, is public. See [GitHub’s privacy policy](link_tbd) for more information. +The [NetNewsWire GitHub repository](https://github.com/brentsimmons/NetNewsWire) does use cookies and JavaScript, because that’s how GitHub works. The repository, including the issue tracker and anything you post there, is public. See [GitHub’s privacy policy](https://help.github.com/en/github/site-policy/github-privacy-statement) for more information. -The NetNewsWire Slack group also uses cookies and JavaScript, because that’s how Slack works. The group is public: anyone may join. See [Slack’s privacy policy](link_tbd) for more info. +The NetNewsWire Slack group also uses cookies and JavaScript, because that’s how Slack works. The group is public: anyone may join. See [Slack’s privacy policy](https://slack.com/privacy-policy) for more info. Posting to the GitHub repository and joining the Slack group are optional, opt-in activities. diff --git a/iOS/Article/WebViewProvider.swift b/iOS/Article/WebViewProvider.swift index 0a00d667f..8e8b54e7b 100644 --- a/iOS/Article/WebViewProvider.swift +++ b/iOS/Article/WebViewProvider.swift @@ -116,8 +116,8 @@ class WebViewProviderDequeueOperation: MainThreadOperation { webView.ready { preloadedWebView in preloadedWebView.removeFromSuperview() self.completion(preloadedWebView) - self.operationDelegate?.operationDidComplete(self) } + self.operationDelegate?.operationDidComplete(self) return } @@ -127,8 +127,8 @@ class WebViewProviderDequeueOperation: MainThreadOperation { webView.preload() webView.ready { preloadedWebView in self.completion(preloadedWebView) - self.operationDelegate?.operationDidComplete(self) } + self.operationDelegate?.operationDidComplete(self) } }