diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index c78b5a7..43f2cb5 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -24,14 +24,7 @@ jobs: with: php-version: ${{ env.PHP_VERSION }} - - name: Check if composer.json exists - id: check_files - uses: andstor/file-existence-action@87d74d4732ddb824259d80c8a508c0124bf1c673 - with: - files: 'composer.json' - - name: Run composer install if composer.json exists - if: steps.check_files.outputs.files_exists == 'true' run: | rm composer.lock composer validate --no-check-publish diff --git a/packages/base/Configuration/Sets/SitePackage/TypoScript/page.typoscript b/packages/base/Configuration/Sets/SitePackage/TypoScript/page.typoscript index a664a3d..0602d29 100644 --- a/packages/base/Configuration/Sets/SitePackage/TypoScript/page.typoscript +++ b/packages/base/Configuration/Sets/SitePackage/TypoScript/page.typoscript @@ -54,13 +54,13 @@ page { # After that, the AssetCollector will handle publishing to _assets folder. includeAssets { hajimeSansTtf { - path = EXT:base/Resources/Public/Fonts/Hajime-Sans.ttf + path = EXT:base/Resources/Public/Fonts/Hajime-Sans.woff2 type = font resourceType = font preload = 1 as = font attributes { - type = font/ttf + type = font/woff2 crossorigin = anonymous } } diff --git a/packages/base/Resources/Public/Fonts/Hajime-Sans.woff2 b/packages/base/Resources/Public/Fonts/Hajime-Sans.woff2 new file mode 100644 index 0000000..ced6e73 Binary files /dev/null and b/packages/base/Resources/Public/Fonts/Hajime-Sans.woff2 differ diff --git a/packages/base/Resources/Public/Scss/abstracts/_fonts.scss b/packages/base/Resources/Public/Scss/abstracts/_fonts.scss index 00ddfbd..a4b79d8 100644 --- a/packages/base/Resources/Public/Scss/abstracts/_fonts.scss +++ b/packages/base/Resources/Public/Scss/abstracts/_fonts.scss @@ -1,8 +1,7 @@ // Update font file names and ensure no spaces for better compatibility. @font-face { font-family: 'Hajime Sans'; - src: url('../Fonts/Hajime-Sans.ttf') format('truetype'), - url('../Fonts/Hajime-Sans.otf') format('opentype'); + src: url('../Fonts/Hajime-Sans.woff2') format('woff2'); font-weight: 400; font-style: normal; font-display: swap;