Skip to content

Commit a214888

Browse files
authoredJan 1, 2025
Merge branch 'main' into dependabot/npm_and_yarn/inter-ui-4.1.0
2 parents 7d21fa5 + e8dce73 commit a214888

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed
 

‎CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
127127

128128
- Bump `inter-ui` from 4.0.2 to 4.1.0 (https://github.com/aplosdev/aplos/pull/127)
129129

130+
- Bump `prettier` from 3.3.3 to 3.4.2 (https://github.com/aplosdev/aplos/pull/128)
131+
130132
#### Documentation
131133

132134
- Add plugins list (Using the upcoming Sencilla plugin)

‎pnpm-lock.yaml

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/styles/_typography.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
--font-neo-grotesque: Inter, Roboto, "Helvetica Neue", "Arial Nova",
1616
"Nimbus Sans", Arial, sans-serif;
1717
--font-monospace-slab-serif: "Nimbus Mono PS", "Courier New", monospace;
18-
--font-monospace-code: ui-monospace, "Cascadia Code", "Source Code Pro", Menlo,
19-
Consolas, "DejaVu Sans Mono", monospace;
18+
--font-monospace-code: ui-monospace, "Cascadia Code", "Source Code Pro",
19+
Menlo, Consolas, "DejaVu Sans Mono", monospace;
2020
--font-industrial: Bahnschrift, "DIN Alternate", "Franklin Gothic Medium",
2121
"Nimbus Sans Narrow", sans-serif-condensed, sans-serif;
2222
--font-rounded-sans: ui-rounded, "Hiragino Maru Gothic ProN", Quicksand,

‎src/styles/plain/fonts.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
html,
1313
body {
1414
--system-font: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI",
15-
Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif,
16-
sans-serif;
15+
Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue",
16+
sans-serif, sans-serif;
1717
--main-mono: monospace;
1818

1919
@include fontSetting;

0 commit comments

Comments
 (0)