From 65b508ffaacc25f138cffdf54b6b7434a1b16a93 Mon Sep 17 00:00:00 2001
From: Nate Weaver <wevah@derailer.org>
Date: Fri, 28 Feb 2020 08:15:06 -0600
Subject: [PATCH 1/3] Port inline style stripping changes from master

---
 Shared/Article Rendering/ArticleRenderer.swift | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Shared/Article Rendering/ArticleRenderer.swift b/Shared/Article Rendering/ArticleRenderer.swift
index 56f5fd97f..1d0db9cb0 100644
--- a/Shared/Article Rendering/ArticleRenderer.swift	
+++ b/Shared/Article Rendering/ArticleRenderer.swift	
@@ -324,6 +324,12 @@ private extension ArticleRenderer {
 		s += """
 
 		<script type="text/javascript">
+		function stripStylesFromElement(element, propertiesToStrip) {
+			for (name of propertiesToStrip) {
+				element.style.removeProperty(name);
+			}
+		}
+
 		var init = {
 			wrapFrames: function () {
 				document.querySelectorAll("iframe").forEach(element => {
@@ -335,7 +341,7 @@ private extension ArticleRenderer {
 			},
 			stripStyles: function() {
 				document.getElementsByTagName("body")[0].querySelectorAll("style, link[rel=stylesheet]").forEach(element => element.remove());
-				document.getElementsByTagName("body")[0].querySelectorAll("[style]").forEach(element => element.removeAttribute("style"));
+				document.getElementsByTagName("body")[0].querySelectorAll("[style]").forEach(element => stripStylesFromElement(element, ["color", "background", "font"]));
 			},
 			linkHover: function() {
 				var anchors = document.getElementsByTagName("a");

From e183a5406c5b8216553fbf2b2ffd77e39309c6bd Mon Sep 17 00:00:00 2001
From: Nate Weaver <wevah@derailer.org>
Date: Fri, 28 Feb 2020 08:17:28 -0600
Subject: [PATCH 2/3] Only wrap iframes that don't specify their own height

---
 Shared/Article Rendering/ArticleRenderer.swift | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Shared/Article Rendering/ArticleRenderer.swift b/Shared/Article Rendering/ArticleRenderer.swift
index 1d0db9cb0..3bf7569ab 100644
--- a/Shared/Article Rendering/ArticleRenderer.swift	
+++ b/Shared/Article Rendering/ArticleRenderer.swift	
@@ -333,6 +333,9 @@ private extension ArticleRenderer {
 		var init = {
 			wrapFrames: function () {
 				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);

From 82f8951c9647b245a956cc1f7a20a1742f60de31 Mon Sep 17 00:00:00 2001
From: Nate Weaver <wevah@derailer.org>
Date: Fri, 28 Feb 2020 08:17:16 -0600
Subject: [PATCH 3/3] Don't force iframe height to auto

Prevents truncating of YouTube embeds without needing a wrapper div.
---
 Mac/MainWindow/Detail/styleSheet.css | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Mac/MainWindow/Detail/styleSheet.css b/Mac/MainWindow/Detail/styleSheet.css
index 458a9d871..fbcd1a6de 100644
--- a/Mac/MainWindow/Detail/styleSheet.css
+++ b/Mac/MainWindow/Detail/styleSheet.css
@@ -122,12 +122,17 @@ code, pre {
 pre  {
 	white-space: pre-wrap;
 }
-img, figure, video, iframe, div {
+img, figure, video, div {
 	max-width: 100%;
 	height: auto !important;
 	margin: 0 auto;
 }
 
+iframe {
+	max-width: 100%;
+	margin: 0 auto;
+}
+
 figcaption {
 	font-size: 14px;
 	line-height: 1.3em;