chore: merge and fix conflicts

2024-03-07 17:53:13 -06:00
parent 2593b371d5 fa1d7374bc
commit 2992e784b0
19 changed files with 620 additions and 71 deletions
--- a/src/views/styles/fonts.module.scss
+++ b/src/views/styles/fonts.module.scss
@@ -8,16 +8,6 @@
    }
 }

-@each $weight in '100' '300' '400' '500' '700' '900' {
-    @font-face {
-        font-family: 'Roboto';
-        src: url('@public/fonts/roboto-#{$weight}.woff2') format('woff2');
-        font-display: auto;
-        font-style: normal;
-        font-weight: #{$weight};
-    }
-}
-
@font-face {
    font-family: 'Roboto Flex';
    src: url('@public/fonts/roboto-flex.woff2') format('woff2');