From 87973ec8a51d55ecfd4131b56d16656fbd698f96 Mon Sep 17 00:00:00 2001
From: Yuchen Pei <hi@ypei.me>
Date: Thu, 17 Feb 2022 19:40:21 +1100
Subject: updated css and fixed problem with trailing empty lines

---
 css/default.css               | 52 +++++++++++++++++++++----------------------
 css/page.css                  |  2 +-
 html-templates/postamble.html | 20 ++++++++---------
 html-templates/preamble.html  | 10 ++++-----
 publish.el                    |  4 +++-
 5 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/css/default.css b/css/default.css
index 5f51f6f..fd06f35 100644
--- a/css/default.css
+++ b/css/default.css
@@ -2,56 +2,60 @@
    This file is released into the public domain.
 */
 
-nav {
-    display: inline;
-    float: right;
+:root {
+    --main-width: 35rem;
 }
 
-span.logo {
-    float: left;
+@media (max-width: 500px) {
+    :root {
+	--main-width: 100%;
+    }
 }
 
-header {
-    width: 40rem;
+nav {
+    width: var(--main-width);
     margin: auto;
     overflow: auto;
     background-color: #f3f3f3;
 }
 
-div#fsf-banner {
-    width: 40rem;
-    margin: auto;
+nav span#menu {
+    float: right;
 }
 
-div#fsf-banner center {
-    margin-top: 2rem;
+nav span#logo {
+    float: left;
+}
+
+nav a {
     padding: 1rem;
-    background-color: #ff000014;
+    display: inline-block;
+    background-color: #f3f3f3;
 }
 
 div#content {
-    width: 39rem;
+    width: calc(var(--main-width) - 1rem);
     margin: auto;
     margin-bottom: 2rem;
     line-height: 1.6;
 }
 
 footer {
-    width: 40rem;
+    width: var(--main-width);
     margin: auto;
     padding-top: .5rem;
     border-top-color: grey;
     border-top-style: solid;
+    display: flex;
+    justify-content: center;
 }
 
 a {
     text-decoration: none;
 }
 
-header a {
-    padding: 1rem;
-    display: inline-block;
-    background-color: #f3f3f3;
+a:hover{
+    background-color: #ddd;
 }
 
 blockquote {
@@ -59,10 +63,6 @@ blockquote {
     padding-left: 1rem;
 }
 
-a:hover{
-    background-color: #ddd;
-}
-
 li.postlistitem{
     margin-bottom: .5rem;
 }
@@ -72,9 +72,9 @@ ul.postlist{
     padding: 0;
 }
 
-footer center {
-    margin: auto;
-    line-height: 1.6;
+footer img {
+    height: 2.2rem;
+    margin: .1rem;
 }
 
 img {
diff --git a/css/page.css b/css/page.css
index 84be7b9..0cbb8d5 100644
--- a/css/page.css
+++ b/css/page.css
@@ -7,5 +7,5 @@ h1.title {
 }
 
 div#content {
-    margin-top: 2em;
+    margin-top: 2rem;
 }
diff --git a/html-templates/postamble.html b/html-templates/postamble.html
index ae7fba1..044cf22 100644
--- a/html-templates/postamble.html
+++ b/html-templates/postamble.html
@@ -1,13 +1,11 @@
 <footer>
-  <center>
-    <a href="https://www.gnu.org/"><img src="/assets/gnu-linux-banner.png" style="height: 2.5rem" title="Powered by GNU/Linux"/></a>
-    <a href="https://www.gnu.org/savannah-checkouts/gnu/emacs/emacs.html"><img src="/assets/Emacs-logo.svg" style="height: 2.5rem" title="Edited with GNU Emacs"/></a>
-    <a href="https://orgmode.org/manual/Publishing.html"><img src="/assets/Org-mode-unicorn.svg" style="height: 2.5rem" title="Made with Org Mode"/></a>
-    <a href="https://www.gnu.org/software/librejs/free-your-javascript.html"><img src="/assets/LibreJS_icon.png" title="LibreJS-compliant" style="height: 2.5rem"/></a>
-    <a href="/blog-feed.xml"><img src="/assets/feed-icon.svg" style="height: 2.5rem" title="Blog Feed"/></a>
-    <a href="/microblog-feed.xml"><img src="/assets/feed-icon.svg" style="height: 2.5rem" title="Microblog Feed"/></a>
-    <a href="https://creativecommons.org/licenses/by-sa/4.0/"><img src="/assets/CC-BY-SA.svg" style="height:2.5rem" title="Licensed under CC BY-SA 4.0"/></a>
-    <a href="https://www.gnu.org/licenses/fdl-1.3.html"><img src="/assets/gfdl-logo-med.png" style="height:2.5rem" title="Licensed under GFDLv1.3+"/></a>
-    <a href="https://commons.wikimedia.org/wiki/File:Copying_is_not_theft.ogv"><img src="/assets/Anti_pirate_icon.png" title="Anti-piracy notice: please do not attack ships when browsing this website! (h/t: lxo)" style="height: 2.5rem"/></a>
-</center>
+    <a href="https://www.gnu.org/"><img src="/assets/gnu-linux-banner.png" title="Powered by GNU/Linux"/></a>
+    <a href="https://www.gnu.org/savannah-checkouts/gnu/emacs/emacs.html"><img src="/assets/Emacs-logo.svg" title="Edited with GNU Emacs"/></a>
+    <a href="https://orgmode.org/manual/Publishing.html"><img src="/assets/Org-mode-unicorn.svg" title="Made with Org Mode"/></a>
+    <a href="https://www.gnu.org/software/librejs/free-your-javascript.html"><img src="/assets/LibreJS_icon.png" title="LibreJS-compliant"/></a>
+    <a href="/blog-feed.xml"><img src="/assets/feed-icon.svg" title="Blog Feed"/></a>
+    <a href="/microblog-feed.xml"><img src="/assets/feed-icon.svg" title="Microblog Feed"/></a>
+    <a href="https://creativecommons.org/licenses/by-sa/4.0/"><img src="/assets/CC-BY-SA.svg" title="Licensed under CC BY-SA 4.0"/></a>
+    <a href="https://www.gnu.org/licenses/fdl-1.3.html"><img src="/assets/gfdl-logo-med.png" title="Licensed under GFDLv1.3+"/></a>
+    <a href="https://commons.wikimedia.org/wiki/File:Copying_is_not_theft.ogv"><img src="/assets/Anti_pirate_icon.png" title="Anti-piracy notice: please do not attack ships when browsing this website! (h/t: lxo)"/></a>
 </footer>
diff --git a/html-templates/preamble.html b/html-templates/preamble.html
index cb0e7ac..a2d7c50 100644
--- a/html-templates/preamble.html
+++ b/html-templates/preamble.html
@@ -1,8 +1,8 @@
-<header>
-  <span class="logo">
+<nav>
+  <span id="logo">
     <a href="/index.html">About</a>
   </span>
-  <nav>
+  <span id="menu">
     <a href="/blog.html">Blog</a><a href="/microblog.html">Microblog</a><a href="https://g.ypei.me">Projects (git)</a>
-  </nav>
-</header>
+  </span>
+</nav>
diff --git a/publish.el b/publish.el
index 9581a6e..4b7274c 100644
--- a/publish.el
+++ b/publish.el
@@ -60,7 +60,9 @@ The content starts with the first empty line."
     (when (and (file-readable-p file) (not (directory-name-p file)))
       (with-temp-buffer
 	(insert-file-contents file)
-	(delete-trailing-whitespace) ;; important, otherwise org may truncate the sitemap, probably due to some problem in converting all things to a list
+	;; important, otherwise org may truncate the sitemap, probably
+	;; due to some problem in converting all things to a list
+	(delete-trailing-whitespace) 
 	(goto-char (point-min))
 	(let ((beg (+ 1 (re-search-forward "^$"))))
 	  (buffer-substring beg (point-max)))))))
-- 
cgit v1.2.3