tlaternet/tlaternet-webserver
1
0
Fork 0
Code Issues 5 Pull requests Releases Wiki Activity

Update to NixOS 23.05 #25

Manually merged
tlater merged 4 commits from tlater/update into master 2023-06-13 21:35:38 +01:00
Conversation 0 Commits 4 Files changed 6 +20 -22
1 changed files with 20 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit c573a6f818 - Show all commits

36
templates/src/lib/scss/_fonts.scss
View file

@ -1,29 +1,27 @@
@use "~/node_modules/@fontsource/nunito/scss/mixins" as Nunito; @use "~/node_modules/@fontsource/nunito/scss/mixins" as Nunito;
@use "~/node_modules/@fontsource/arimo/scss/mixins" as Arimo; @use "~/node_modules/@fontsource/arimo/scss/mixins" as Arimo;
$weights: 300, 400, 500, 600, 700; @include Nunito.faces(
$weights: (
@each $weight in $weights { 300,
@include Nunito.fontFace( 400,
$weight: $weight, 500,
600,
700,
),
$display: auto, $display: auto,
$style: normal, $styles: (
$fontDir: "npm:@fontsource/nunito/files" normal,
italic,
),
$directory: "npm:@fontsource/nunito/files"
); );
@include Nunito.fontFace( @include Arimo.faces(
$weight: $weight, $weights: 400,
$display: auto, $display: auto,
$style: italic, $styles: normal,
$fontDir: "npm:@fontsource/nunito/files" $directory: "npm:@fontsource/arimo/files"
);
}
@include Arimo.fontFace(
$weight: 400,
$display: auto,
$style: normal,
$fontDir: "npm:@fontsource/arimo/files"
); );
// Hack *does* come with its own CSS, but it's broken and hasn't seen // Hack *does* come with its own CSS, but it's broken and hasn't seen