Merge remote-tracking branch 'origin/main'

conedevelopment · Nov 18, 2023 · c5f54c1 · c5f54c1
2 parents 01064db + 78b3122
commit c5f54c1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.editorconfig b/.editorconfig
@@ -9,3 +9,6 @@ indent_size = 2
 indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
+eclint_block_comment_start = /*
+eclint_block_comment = *
+eclint_block_comment_end = */
diff --git a/scss/config/_typography.scss b/scss/config/_typography.scss
@@ -5,7 +5,7 @@
 $typography: () !default;
 $typography: map.merge(
   (
-    'font-family-base': #{eravek, 'Gill Sans Nova', Ubuntu, Calibri, 'DejaVu Sans', source-sans-pro, sans-serif},
+    'font-family-base': #{Seravek, 'Gill Sans Nova', Ubuntu, Calibri, 'DejaVu Sans', source-sans-pro, sans-serif},
     'font-family-cursive': #{ui-monospace, 'Cascadia Code', 'Source Code Pro', Menlo, Consolas, 'DejaVu Sans Mono', monospace},
     'font-family-heading': #{Avenir, 'Avenir Next LT Pro', Montserrat, Corbel, 'URW Gothic', source-sans-pro, sans-serif},
     'font-size-base': 1rem,