merge upstream

static/css/index.css

@@ -1,3 +1,18 @@
+@media (min-width: 50em) {
+  @font-face {
+    font-family: 'PT Sans';
+    src: local("PT Sans"), local("PTSans-Regular"), url("../fonts/PTSans-Regular.woff") format("woff");
+    font-weight: normal;
+    font-style: normal;
+  }
+  @font-face {
+    font-family: 'PT Sans';
+    src: local("PT Sans Bold"), local("PTSans-Bold"), url("../fonts/PTSans-Bold.woff") format("woff");
+    font-weight: bold;
+    font-style: normal;
+  }
+}
+
 @media (prefers-color-scheme: light) {
   html {
     background: #ffffff;
@@ -27,6 +42,10 @@ body {
   -moz-osx-font-smoothing: grayscale;
 }
 
+h1, h2, h3, h4, h5, h6 {
+  font-weight: 600;
+}
+
 b, strong, th {
   font-weight: 600;
 }
@@ -117,6 +136,9 @@ body > header {
   flex-wrap: wrap;
   justify-content: space-between;
   align-items: center;
+  background: rgba(255, 255, 255, 0.02);
+  box-shadow: 0 0 .6em rgba(28, 29, 34, 0.05);
+  border-bottom: 1px solid rgba(142, 142, 145, 0.16);
 }
 
 body > header > a {
@@ -141,18 +163,12 @@ nav a {
   margin: .4em .8em;
 }
 
-body > header {
-  background: rgba(255, 255, 255, 0.02);
-  box-shadow: 0 0 .6em rgba(28, 29, 34, 0.05);
-  border-bottom: 1px solid rgba(142, 142, 145, 0.16);
-}
-
-body > header, article {
+body > header, body > article, body > footer {
   padding: 1.5em;
 }
 
 @media (min-width: 32em) {
-  body > header, article {
+  body > header, body > article, body > footer {
     padding: 1.5em calc(38% - 12em);
   }
 }

static/css/sidebar.css

@@ -1,9 +1,10 @@
 body {
   font-size: 1.08em;
   margin-left: 16em;
+  overscroll-behavior: none;
 }
 
-body > article {
+body > article, body > footer {
   margin: 0 4em;
   padding: 2em 0;
   max-width: 55em;
@@ -44,7 +45,7 @@ body > header > a {
   font-family: "PT Serif", Georgia;
   font-size: 2.2em;
   display: block;
-  margin: 0 0 1.5rem;
+  margin: 0 0 .8em;
 }
 
 article header h1 {

static/fonts/PT-Sans.css

@@ -1,13 +0,0 @@
-@font-face {
-  font-family: 'PT Sans';
-  src: local('PT Sans'), local('PTSans-Regular'), url('PTSans-Regular.woff') format('woff');
-  font-weight: normal;
-  font-style: normal;
-}
-
-@font-face {
-  font-family: 'PT Sans';
-  src: local('PT Sans Bold'), local('PTSans-Bold'), url('PTSans-Bold.woff') format('woff');
-  font-weight: bold;
-  font-style: normal;
-}