merge upstream

This commit is contained in:
Niklas Buschmann 2021-03-13 15:06:59 +01:00
parent 63f216c575
commit 9b3ec3d024

View File

@ -12,9 +12,9 @@
} }
html { html {
background: #d3d4db;
font-size: 16px; font-size: 16px;
font-size: calc(0.8rem + 0.3vw); font-size: calc(0.8rem + 0.3vw);
background: #66697c;
padding: 0 calc(38% - 21em); padding: 0 calc(38% - 21em);
} }
@ -26,6 +26,7 @@ body {
line-height: 1.6; line-height: 1.6;
margin: 0; margin: 0;
min-height: 100vh; min-height: 100vh;
box-shadow: 0 0 0.3em #c5c7cf;
-webkit-text-size-adjust: 100%; -webkit-text-size-adjust: 100%;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
@ -130,7 +131,7 @@ body > header, body > footer {
flex-wrap: wrap; flex-wrap: wrap;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
background: #2a2c33; background: #2d2e36;
color: #ffffff; color: #ffffff;
} }