Compare commits

..

No commits in common. "2b51545c6defdeeeb2032a140871aeb46f94be0c" and "745d922159d97d7c5cf2171cac6fe21f00fff90e" have entirely different histories.

5 changed files with 11 additions and 4 deletions

View file

@ -24,7 +24,14 @@ jobs:
with: with:
php-version: ${{ env.PHP_VERSION }} 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 - name: Run composer install if composer.json exists
if: steps.check_files.outputs.files_exists == 'true'
run: | run: |
rm composer.lock rm composer.lock
composer validate --no-check-publish composer validate --no-check-publish

View file

@ -54,13 +54,13 @@ page {
# After that, the AssetCollector will handle publishing to _assets folder. # After that, the AssetCollector will handle publishing to _assets folder.
includeAssets { includeAssets {
hajimeSansTtf { hajimeSansTtf {
path = EXT:base/Resources/Public/Fonts/Hajime-Sans.woff2 path = EXT:base/Resources/Public/Fonts/Hajime-Sans.ttf
type = font type = font
resourceType = font resourceType = font
preload = 1 preload = 1
as = font as = font
attributes { attributes {
type = font/woff2 type = font/ttf
crossorigin = anonymous crossorigin = anonymous
} }
} }

View file

@ -44,7 +44,6 @@
<f:image <f:image
image="{data.image.0}" image="{data.image.0}"
treatIdAsReference="1" treatIdAsReference="1"
fetchpriority="high"
cropVariant="default" cropVariant="default"
width="430c" width="430c"
alt="Hero Image" alt="Hero Image"

View file

@ -1,7 +1,8 @@
// Update font file names and ensure no spaces for better compatibility. // Update font file names and ensure no spaces for better compatibility.
@font-face { @font-face {
font-family: 'Hajime Sans'; font-family: 'Hajime Sans';
src: url('../Fonts/Hajime-Sans.woff2') format('woff2'); src: url('../Fonts/Hajime-Sans.ttf') format('truetype'),
url('../Fonts/Hajime-Sans.otf') format('opentype');
font-weight: 400; font-weight: 400;
font-style: normal; font-style: normal;
font-display: swap; font-display: swap;