Skip to content

Commit

Permalink
feat: Migrate Fonts imports to the fonts.scss file
Browse files Browse the repository at this point in the history
Might not be stable
  • Loading branch information
GabsEdits committed May 1, 2024
1 parent edb052c commit 41150cc
Show file tree
Hide file tree
Showing 6 changed files with 142 additions and 143 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@

- Add two new types of links (`external` and `internal`) with different icons at the end of the link

- Migrate Fonts imports to the `fonts.scss` file (rather then the main TypeScript file)

## 1.3.3 (2024-04-27)

### Feature(s)
Expand Down
7 changes: 3 additions & 4 deletions index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import "./Layout.vue";
import "./styles/index.scss";
import "inter-ui/inter.css";
import "inter-ui/inter-variable.css";
import "non.geist/mono"
import '@csstools/normalize.css';
import "non.geist/mono";
import "@csstools/normalize.css";
import "sass";
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "aplos",
"version": "1.3.4-3",
"version": "1.3.4-4",
"type": "module",
"description": "A sleek, contemporary, and purposefully designed VitePress theme",
"main": "index.ts",
"keywords": [
Expand All @@ -27,4 +28,4 @@
"url": "https://github.com/aplosdev/aplos/issues"
},
"homepage": "https://aplos.gxbs.me"
}
}
203 changes: 89 additions & 114 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 44 additions & 0 deletions styles/fonts.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
@use "~inter-ui/default" with ($inter-font-display: swap,
$inter-font-path: '~inter-ui/web'
);

@use "~inter-ui/variable" with ($inter-font-display: swap,
$inter-font-path: '~inter-ui/variable'
);

@include default.all;
@include variable.all;


html {
font-family: "Inter", sans-serif;

@supports (font-variation-settings: normal) {
font-family: "InterVariable", sans-serif;
}
}


:root {
font-family: Inter, sans-serif;
font-feature-settings: "liga" 1, "calt" 1, "cv05" 1;
scroll-behavior: smooth;
/* fix for Chrome */

@supports (font-variation-settings: normal) {
font-family: InterVariable, sans-serif;
}
}

body {
font-family: Inter, sans-serif;
color: var(--color-text);
font-size: normal;
font-weight: 400;
font-synthesis: style;
text-rendering: optimizeLegibility;

@supports (font-variation-settings: normal) {
font-family: InterVariable, sans-serif;
}
}
24 changes: 1 addition & 23 deletions styles/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,37 +10,15 @@
@import "medias.scss";
@import "cards.scss";
@import "color.scss";

:root {
font-family: Inter, sans-serif;
font-feature-settings: "liga" 1, "calt" 1, "cv05" 1;
scroll-behavior: smooth;
/* fix for Chrome */
}

@supports (font-variation-settings: normal) {
:root {
font-family: InterVariable, sans-serif;
}

body {
font-family: InterVariable, sans-serif;
}
}
@import "fonts.scss";

*, ::before, ::after {
box-sizing: border-box;
}

body {
font-family: Inter, sans-serif;
scroll-behavior: smooth;
background-color: var(--color-background);
color: var(--color-text);
font-size: normal;
font-weight: 400;
font-synthesis: style;
text-rendering: optimizeLegibility;
}

main {
Expand Down

0 comments on commit 41150cc

Please sign in to comment.