merge upstream

static/css/index.css

@@ -14,24 +14,16 @@
 }
 
 @media (prefers-color-scheme: light) {
-  html {
-    background: #393b45;
-  }
   body {
     background: #ffffff;
     color: #1c1d22;
   }
-  body > header {
-    background: #1c1d22;
-    color: #ffffff;
-  }
 }
 
 @media (prefers-color-scheme: dark) {
   body {
     background: #1c1d22;
     color: #ffffff;
-    box-shadow: 0 0 0 1px rgba(255, 255, 255, 0.05);
   }
 }
 
@@ -45,7 +37,6 @@ body {
   font-weight: 400;
   line-height: 1.6;
   margin: 0;
-  min-height: 100vh;
   -webkit-text-size-adjust: 100%;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
@@ -137,6 +128,8 @@ body > header {
   flex-wrap: wrap;
   justify-content: space-between;
   align-items: center;
+  background: #1c1d22;
+  color: #ffffff;
   border-bottom: 1px solid rgba(255, 255, 255, 0.05);
 }
 
@@ -165,9 +158,20 @@ body > header, body > article, body > footer {
   padding: 1.5em;
 }
 
-@media (min-width: 36em) {
+@media (min-width: 32em) {
+  body > header, body > article, body > footer {
+    padding: 1.7em calc(38% - 12em);
+  }
+}
+
+@media (prefers-color-scheme: light) and (min-width: 36em) {
+  html {
+    background: #393b45;
+    padding: 0 calc(38% - 18em);
+  }
   body {
-    margin: 0 calc(38% - 18em);
+    background: #ffffff;
+    min-height: 100vh;
   }
   body > header, body > article, body > footer {
     padding: 1.7em 12.5%;