From 37ae46ea4c4aa63656017e64a96d5e1c70686c06 Mon Sep 17 00:00:00 2001
From: Nate Weaver <wevah@derailer.org>
Date: Thu, 23 Apr 2020 23:18:46 -0500
Subject: [PATCH] Merge more styles and fix styling of tables with explicit
 thead/tbody/tfoot

Also use :matches() to simplify some rules.

# Conflicts:
#	Mac/MainWindow/Detail/styleSheet.css
#	iOS/Resources/styleSheet.css
---
 Mac/MainWindow/Detail/styleSheet.css |  4 ----
 Shared/Article Rendering/shared.css  | 11 ++++++++---
 iOS/Resources/styleSheet.css         |  4 ----
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/Mac/MainWindow/Detail/styleSheet.css b/Mac/MainWindow/Detail/styleSheet.css
index 6afb59b67..340a481d9 100644
--- a/Mac/MainWindow/Detail/styleSheet.css
+++ b/Mac/MainWindow/Detail/styleSheet.css
@@ -32,13 +32,9 @@ body .header a:link, body .header a:visited {
 }
 
 pre {
-	line-height: 20px;
 	border: 1px solid var(--accent-color);
 	padding: 10px;
 }
-code, pre {
-	font-size: 14px;
-}
 
 .nnw-overflow table {
 	border: 1px solid var(--accent-color);
diff --git a/Shared/Article Rendering/shared.css b/Shared/Article Rendering/shared.css
index f44c0a4c4..49f367714 100644
--- a/Shared/Article Rendering/shared.css	
+++ b/Shared/Article Rendering/shared.css	
@@ -121,9 +121,12 @@ pre {
 	word-break: normal;
 }
 
+pre {
+	line-height: 1.4286em;
+}
 code, pre {
 	font-family: "SF Mono", Menlo, "Courier New", Courier, monospace;
-	font-size: .8235rem;
+	font-size: .8235em;
 	-webkit-hyphens: none;
 }
 
@@ -153,10 +156,12 @@ code, pre {
 	border-left: none;
 	padding: 5px;
 }
-.nnw-overflow tr td:last-child, .nnw-overflow tr th:last-child {
+
+.nnw-overflow tr :matches(td, th):last-child {
 	border-right: none;
 }
-.nnw-overflow tr:last-child td, .nnw-overflow tr:last-child th {
+
+.nnw-overflow :matches(thead, tbody, tfoot):last-child > tr:last-child :matches(td, th) {
 	border-bottom: none;
 }
 .nnw-overflow td pre {
diff --git a/iOS/Resources/styleSheet.css b/iOS/Resources/styleSheet.css
index ff1d160f6..98e09e971 100644
--- a/iOS/Resources/styleSheet.css
+++ b/iOS/Resources/styleSheet.css
@@ -43,13 +43,9 @@ body .header a:link, body .header a:visited {
 }
 
 pre {
-	line-height: 1.4286em;
 	border: 1px solid var(--secondary-accent-color);
 	padding: 5px;
 }
-code, pre {
-	font-size: .8235rem;
-}
 
 .nnw-overflow table {
 	border: 1px solid var(--secondary-accent-color);