merge upstream

3 files changed, 40 insertions, 25 deletions

diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 3e7445a..2e63567 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -18,7 +18,7 @@
 {{- end }}
 
 <header class="{{ if .Site.Params.brightheader }}bright{{ else }}dark{{ end }}">
-  <h2><a href="{{ .Site.BaseURL }}">{{ .Site.Title }}</a></h2>
+  <a href="{{ .Site.BaseURL }}">{{ .Site.Title }}</a>
   <nav>
     {{ range .Site.Menus.main }}
       <a href="{{ .URL }}">{{ .Name }}</a>
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index d36688c..ab8ad7b 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -7,7 +7,7 @@
       <a href="{{ ($.Site.GetPage (printf "/%s/%s" "categories" $tag)).Permalink }}">{{ $tag | upper }}</a>
     {{- end -}}
     <h1>{{ .Title }}</h1>
-    <p>{{ if ($.Param "author") }}{{ $.Param "author" }}{{ end }}{{ if .Date }}<time datetime="{{ .Date.Format "2006-01-02T15:04:05Z07:00" }}">{{ if ($.Param "author") }} | {{ end }}{{ .Date.Format "January 02, 2006" }}</time>{{ end }}</p>
+    {{ if .Date }}<time datetime="{{ .Date.Format "2006-01-02T15:04:05Z07:00" }}">{{ .Date.Format "January 02, 2006" }}</time>{{ end }}
   </header>
   {{ .Content }}
 </article>
diff --git a/static/css/theme.css b/static/css/theme.css
index fb7ba77..7b9a866 100644
--- a/static/css/theme.css
+++ b/static/css/theme.css
@@ -13,8 +13,7 @@
 }
 
 body {
-  font-family: -apple-system, BlinkMacSystemFont, "Helvetica Neue", "Segoe UI", "Roboto", sans-serif;
-  font-size: 16px;
+  font-family: "PT Sans", -apple-system, BlinkMacSystemFont, "Helvetica Neue", "Segoe UI", "Roboto", sans-serif;
   font-size: calc(0.8rem + 0.25vw);
   font-weight: 400;
   line-height: 1.6;
@@ -24,12 +23,18 @@ body {
   -moz-osx-font-smoothing: grayscale;
 }
 
+@media (min-width: 50em) {
+  body {
+    font-size: 1.125rem
+  }
+}
+
 h1, h2, h3, h4, h5, h6 {
   font-weight: 400;
 }
 
 h1 {
-  font-size: 1.75em
+  font-size: 1.8em
 }
 
 b, strong, th {
@@ -60,10 +65,14 @@ hr {
 
 blockquote {
   background: #8c8c8e0a;
-  border-left: 4px solid #68f;
+  border-left: 3px solid #8c8c8eb3;
   padding: 1px 1.5em;
 }
 
+blockquote p {
+  opacity: .7
+}
+
 blockquote, figure {
   margin: 1em 0;
 }
@@ -79,20 +88,22 @@ img {
 }
 
 table {
-  box-shadow: 0 0 0 1px #8c8c8e1f inset;
-  border-spacing: 1px;
   width: 100%;
-}
-
-tr:hover, tr:nth-child(odd) td {
-  background: #8c8c8e10;
+  border-collapse: collapse;
 }
 
 th, td {
-  box-shadow: 0 0 0 1px #8c8c8e1f;
   padding: .5em 1em;
 }
 
+tr {
+  border: 1px solid #8c8c8e33;
+}
+
+tr:hover, tr:nth-child(odd) td {
+  background: #8c8c8e0a;
+}
+
 pre {
   background: #8c8c8e22;
   border-radius: 2px;
@@ -105,7 +116,7 @@ pre {
 :not(pre) > code {
   font-size: .9em;
   background: #8c8c8e26;
-  opacity: .75;
+  opacity: .7;
   border-radius: 2px;
   margin: 0 .1em;
   padding: .2em .4em;
@@ -118,34 +129,38 @@ body > header {
   align-items: center;
 }
 
-header h1, header h2 {
+header h1 {
   margin: 0;
 }
 
-article header {
-  margin-bottom: 1.5em;
+body > header > a {
+  font-size: 1.3em
 }
 
-article header h1 {
-  padding: .2em 0;
-  margin-bottom: .5em;
-  border-bottom: 1px solid #8c8c8e36;
+article header {
+  margin-bottom: 1.5em;
 }
 
 nav {
-  margin: .5em -.8em;
+  margin: .4em -.8em;
 }
 
 nav a {
-  margin: 0 .8em;
+  margin: .4em .8em;
 }
 
 body > header, article {
   padding: 1.5em;
 }
 
-@media (min-width: 40em) {
+@media (min-width: 32em) {
+  body > header, article {
+    padding: 1.5em calc(38% - 12em);
+  }
+}
+
+@media (min-width: 100em) {
   body > header, article {
-    padding: 1.5em calc(35% - 12rem);
+    padding: 1.5em calc(46% - 20em);
   }
 }