Merge branch 'main' into dependabot/npm_and_yarn/inter-ui-4.1.0

aplosdev · Jan 1, 2025 · a214888 · a214888
2 parents 7d21fa5 + e8dce73
commit a214888
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -127,6 +127,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - Bump `inter-ui` from 4.0.2 to 4.1.0 (https://github.com/aplosdev/aplos/pull/127)
 
+- Bump `prettier` from 3.3.3 to 3.4.2 (https://github.com/aplosdev/aplos/pull/128)
+
 #### Documentation
 
 - Add plugins list (Using the upcoming Sencilla plugin)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/styles/_typography.scss b/src/styles/_typography.scss
@@ -15,8 +15,8 @@
   --font-neo-grotesque: Inter, Roboto, "Helvetica Neue", "Arial Nova",
     "Nimbus Sans", Arial, sans-serif;
   --font-monospace-slab-serif: "Nimbus Mono PS", "Courier New", monospace;
-  --font-monospace-code: ui-monospace, "Cascadia Code", "Source Code Pro", Menlo,
-    Consolas, "DejaVu Sans Mono", monospace;
+  --font-monospace-code: ui-monospace, "Cascadia Code", "Source Code Pro",
+    Menlo, Consolas, "DejaVu Sans Mono", monospace;
   --font-industrial: Bahnschrift, "DIN Alternate", "Franklin Gothic Medium",
     "Nimbus Sans Narrow", sans-serif-condensed, sans-serif;
   --font-rounded-sans: ui-rounded, "Hiragino Maru Gothic ProN", Quicksand,

diff --git a/src/styles/plain/fonts.scss b/src/styles/plain/fonts.scss
@@ -12,8 +12,8 @@
 html,
 body {
   --system-font: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI",
-    Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif,
-    sans-serif;
+    Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue",
+    sans-serif, sans-serif;
   --main-mono: monospace;
 
   @include fontSetting;