⚠️ Fixes merge conflicts

This commit is contained in:
Alicia Sykes
2021-07-02 19:25:41 +01:00
40 changed files with 2785 additions and 123 deletions

View File

@@ -42,7 +42,6 @@ html {
font-weight: normal;
}
}
/* Optional fonts for specific themes */
/* These fonts are loaded from ./public and therefore not bundled within the apps source */
@font-face { // Used by Dracula. Credit to Matt McInerney
@@ -73,3 +72,9 @@ html {
font-family: 'VT323';
src: url('/fonts/VT323-Regular.ttf');
}
@font-face { // Used by cyberpunk theme. Credit to Astigmatic
font-family: 'Audiowide';
src: url('/fonts/Audiowide-Regular.ttf');
}