merge upstream

This commit is contained in:
Niklas Buschmann 2020-11-25 23:45:00 +01:00
parent 210afb0332
commit a111a24188

View File

@ -37,6 +37,7 @@ body {
font-weight: 400; font-weight: 400;
line-height: 1.6; line-height: 1.6;
margin: 0; margin: 0;
min-height: 100vh;
-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;
@ -169,10 +170,6 @@ body > header, body > article, body > footer {
background: #393b45; background: #393b45;
padding: 0 calc(38% - 18em); padding: 0 calc(38% - 18em);
} }
body {
background: #ffffff;
min-height: 100vh;
}
body > header, body > article, body > footer { body > header, body > article, body > footer {
padding: 1.7em 12.5%; padding: 1.7em 12.5%;
} }