From 8809548f97b5c58b3ed6683395a12ceec0bc92e2 Mon Sep 17 00:00:00 2001
From: Peter Molnar <hello@petermolnar.eu>
Date: Thu, 30 Nov 2017 17:00:08 +0000
Subject: [PATCH] cleaning up feed problems; adding styling for tables
 screen/print

---
 templates/Category.html          |  5 ++-
 templates/Category_feed.html     | 25 ------------
 templates/block_header_open.html |  5 +--
 templates/style-dark.css         | 67 +++++++++++++++++++++++++-------
 4 files changed, 56 insertions(+), 46 deletions(-)
 delete mode 100644 templates/Category_feed.html

diff --git a/templates/Category.html b/templates/Category.html
index c75ddea..b01763c 100644
--- a/templates/Category.html
+++ b/templates/Category.html
@@ -1,6 +1,7 @@
 {% include 'block_header_open.html' %}
 	<title>{{ taxonomy.title }}</title>
-	<link rel="alternate" type="application/rss+xml" title="{{ taxonomy.title }} feed" href="{{ taxonomy.feed }}" />
+	<link rel="alternate" type="application/atom+xml" title="{{ taxonomy.title }} feed" href="{{ taxonomy.feed }}" />
+	<link rel="self" href="{{ site.url }}{{ taxonomy.feed }}/" />
 
 {% include 'block_header_close.html' %}
 
@@ -8,7 +9,7 @@
 	<aside class="follow">
 		<p>
 			<svg class="icon"><use xlink:href="#icon-rss" /></svg>
-			<a title="follow {{ taxonomy.title }}" href="{{ site.url }}{{ taxonomy.feed }}">RSS/Atom feed</a>
+			<a title="follow {{ taxonomy.title }}" href="{{ site.url }}{{ taxonomy.feed }}">Atom feed</a>
 		</p>
 	</aside>
 
diff --git a/templates/Category_feed.html b/templates/Category_feed.html
deleted file mode 100644
index 5c5a92a..0000000
--- a/templates/Category_feed.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-	<rss version="2.0"
-		xmlns:content="http://purl.org/rss/1.0/modules/content/"
-		xmlns:dc="http://purl.org/dc/elements/1.1/"
-	>
-<channel>
-	<title>{{ taxonomy.title }}</title>
-	<link>{{ site.url }}{{ taxonomy.feed }}</link>
-	<lastBuildDate>{{ taxonomy.lastmod }}</lastBuildDate>
-	<description>{{ site.title }}: {{ taxonomy.name }}</description>
-{% for post in posts %}
-	<item>
-		<title>{{ post.title }}</title>
-		<link>{{ site.url }}/{{ post.slug }}/</link>
-		<content:encoded><![CDATA[{{ post.html }}]]></content:encoded>
-		<pubDate>{{ post.pubrfc }}</pubDate>
-		<guid>{{ site.url }}/{{ post.slug }}</guid>
-		<dc:language>{{ post.lang }}</dc:language>
-{%- if post.tags %}{% for tname in post.tags %}
-			<category>{{ tname }}></category>
-{% endfor %}{% endif -%}
-	</item>
-{% endfor %}
-</channel>
-</rss>
diff --git a/templates/block_header_open.html b/templates/block_header_open.html
index c20e7a0..f90deed 100644
--- a/templates/block_header_open.html
+++ b/templates/block_header_open.html
@@ -6,7 +6,4 @@
 	<link rel="icon" href="{{ site.url }}/favicon.ico" />
 	<link rel="http://webmention.org/" href="{{ site.url }}/webmention" />
 	<link rel="webmention" href="{{ site.url }}/webmention" />
-	<link rel="micropub" href="{{ site.url }}/micropub" />
-	<link rel="authorization_endpoint" href="https://indieauth.com/auth" />
-	<link rel="token_endpoint" href="https://tokens.indieauth.com/token" />
-	<link rel="hub" href="https://petermolnar.superfeedr.com/">
+	<link rel="hub" href="{{ site.websub.hub }}">
diff --git a/templates/style-dark.css b/templates/style-dark.css
index 7c1e0f4..d41b52a 100644
--- a/templates/style-dark.css
+++ b/templates/style-dark.css
@@ -94,17 +94,27 @@ blockquote {
 table {
     border-collapse: collapse;
     border-spacing: 0;
+    width: 100%;
 }
 
 td, th {
     padding: 0.3rem;
-    border: 1px solid #333;
+    border: 1px solid #111;
+    text-align:left;
 }
 
 th {
     font-weight: bold;
 }
 
+th,
+tr:nth-child(odd) { 
+    background-color: #333;
+}
+tr:nth-child(even) { 
+    background-color: #444;
+}
+
 hr {
     display: block;
     height: 1px;
@@ -225,11 +235,19 @@ code.sourceCode span.va { color: turquoise; }
 
 /* licence, time, author */
 .h-entry footer p {
-    opacity: 0.7;
-    padding: 0 0.6rem 0 0;
+    color: #999;
+    padding: 0.3rem 0;
     display: inline-block;
 }
 
+.h-entry footer a {
+    color: #ccc;
+}
+
+.h-entry footer a:hover {
+    color: #eee;
+}
+
 .e-content a {
     color:#5193D4;
 }
@@ -315,11 +333,19 @@ code.sourceCode span.va { color: turquoise; }
 }
 
 .content-footer * {
-    opacity: 0.9;
+    color: #999;
     display: inline-block;
     vertical-align: top;
 }
 
+.content-footer a {
+    color: #999;
+}
+
+.content-footer a:hover {
+    color: #eee;
+}
+
 .content-footer img {
     width: 1rem;
     margin: 0 0.3rem 0rem 0;
@@ -633,19 +659,18 @@ figcaption {
 
 @media print {
     * {
-       background-color: #fff !important;
+        background-color: #fff !important;
         color: #222;
     }
 
     html, body {
-        font-size: 10pt !important;
+        font-size: 11pt !important;
         text-shadow: unset !important;
+        font-family: Verdana, sans-serif !important;
     }
 
     @page {
-        margin: 0.5in;
-        orphans: 4;
-        widows: 3;
+        margin: 0.6in 0.5in;
     }
 
     .limit,
@@ -661,20 +686,21 @@ figcaption {
     p, li, blockquote, figure, .footnotes {
         page-break-inside: avoid !important;
     }
-
-    figure {
-        max-height: 45vh;
-    }
-
+ 
     a {
         border: none;
         color: #000;
     }
+    td, th {
+        border: 1pt solid #666;
+    }
 
     .content-note, .content-header, .content-footer,
     video, audio,
     .footnotes ol li a[href^="#"],
-    .footnotes ol li a[href^="#"]:after {
+    .footnotes ol li a[href^="#"]:after,
+    .exif svg,
+    .donation {
         display:none;
         visibility: hidden;
     }
@@ -718,4 +744,15 @@ figcaption {
     code.sourceCode span.ss { color: black; }
     code.sourceCode span.st { color: magenta; }
     code.sourceCode span.va { color: darkturquoise; }
+    
+    figcaption {
+        font-size: 0.9em;
+    }
+  
+    .adaptimg {
+        max-height: 35vh;
+        max-width: 90vw;
+        outline: none;
+        border: 1px solid #000;
+    }
 }