Compare commits

..

No commits in common. "v13.4.14-1" and "1cd8e30a1635d498ae9387c880bb532d0e872d40" have entirely different histories.

7 changed files with 39 additions and 40 deletions

View file

@ -68,8 +68,8 @@ jobs:
rm typo3.tar.gz rm typo3.tar.gz
- name: Install ssh agent and rsync - name: Install ssh agent and rsync
run: | run: |
apt-get update apt update
apt-get install -y openssh-client rsync apt install -y openssh-client rsync
- name: Upload release - name: Upload release
uses: deployphp/action@v1 uses: deployphp/action@v1
with: with:
@ -93,8 +93,8 @@ jobs:
rm typo3.tar.gz rm typo3.tar.gz
- name: Install ssh agent and rsync - name: Install ssh agent and rsync
run: | run: |
apt-get update apt update
apt-get install -y openssh-client rsync apt install -y openssh-client rsync
- name: Switch to release - name: Switch to release
uses: deployphp/action@v1 uses: deployphp/action@v1
with: with:
@ -102,28 +102,28 @@ jobs:
dep: --file=./build/deploy.php release:switch stage dep: --file=./build/deploy.php release:switch stage
private-key: ${{secrets.STAGE_KEY}} private-key: ${{secrets.STAGE_KEY}}
deploy-production: # deploy-production:
needs: build # needs: build
runs-on: ubuntu-latest # runs-on: ubuntu-latest
steps: # steps:
- name: Setup PHP # - name: Setup PHP
uses: shivammathur/setup-php@7c0b4c8c8ebed23eca9ec2802474895d105b11bc # uses: shivammathur/setup-php@7c0b4c8c8ebed23eca9ec2802474895d105b11bc
with: # with:
php-version: ${{ env.PHP_VERSION }} # php-version: ${{ env.PHP_VERSION }}
- uses: actions/download-artifact@v3 # - uses: actions/download-artifact@v3
with: # with:
name: typo3 # name: typo3
- name: Extract artifact # - name: Extract artifact
run: | # run: |
tar xf typo3.tar.gz # tar xf typo3.tar.gz
rm typo3.tar.gz # rm typo3.tar.gz
- name: Install ssh agent and rsync # - name: Install ssh agent and rsync
run: | # run: |
apt-get update # apt update
apt-get install -y openssh-client rsync # apt install -y openssh-client rsync
- name: Deploy # - name: Deploy
uses: deployphp/action@v1 # uses: deployphp/action@v1
with: # with:
deployer-binary: "./bin/dep" # deployer-binary: "./bin/dep"
dep: --file=./build/deploy.php release:create production # dep: --file=./build/deploy.php release:create production
private-key: ${{secrets.PROD_KEY}} # private-key: ${{secrets.PROD_KEY}}

View file

@ -26,8 +26,8 @@ jobs:
composer validate --no-check-publish && composer install --prefer-dist --no-progress --ignore-platform-reqs composer validate --no-check-publish && composer install --prefer-dist --no-progress --ignore-platform-reqs
- name: Install ssh agent, rsync - name: Install ssh agent, rsync
run: | run: |
apt-get update apt update
apt-get install -y openssh-client rsync apt install -y openssh-client rsync
- name: Switch to release - name: Switch to release
uses: deployphp/action@v1 uses: deployphp/action@v1
with: with:

View file

@ -94,7 +94,6 @@ task('release:create', [
'deploy:vendors', 'deploy:vendors',
'deploy:shared', 'deploy:shared',
'deploy:writable', 'deploy:writable',
'typo3:cache:flush',
'typo3:extension:setup', 'typo3:extension:setup',
'deploy:unlock', 'deploy:unlock',
'deploy:success' 'deploy:success'
@ -118,7 +117,6 @@ task('deploy', [
'deploy:vendors', 'deploy:vendors',
'deploy:shared', 'deploy:shared',
'deploy:writable', 'deploy:writable',
'typo3:cache:flush',
'typo3:extension:setup', 'typo3:extension:setup',
'deploy:symlink', 'deploy:symlink',
'php:reload', 'php:reload',

View file

@ -25,7 +25,7 @@
<div class="card-front absolute w-full h-full backface-hidden overflow-hidden shadow-lg"> <div class="card-front absolute w-full h-full backface-hidden overflow-hidden shadow-lg">
<f:if condition="{card.images}"> <f:if condition="{card.images}">
<f:then> <f:then>
<picture class="w-full h-full object-cover transition-all duration-500"> <picture class="w-full h-full object-cover grayscale group-hover:grayscale-0 transition-all duration-500">
<!-- WEBP source --> <!-- WEBP source -->
<source <source
type="image/webp" type="image/webp"
@ -59,9 +59,9 @@
</div> </div>
</f:else> </f:else>
</f:if> </f:if>
<div class="absolute inset-0 bg-white bg-opacity-80 flex flex-col items-center justify-center"> <div class="absolute inset-0 bg-black bg-opacity-40 flex flex-col items-center justify-center">
<div class="w-full"> <div class="w-full">
<h3 class="text-black text-xl font-bold text-center px-4">{card.header}</h3> <h3 class="text-white text-xl font-bold text-center px-4">{card.header}</h3>
</div> </div>
<div class="w-full text-center"> <div class="w-full text-center">
<div class="w-6 h-6 bg-primary text-white rounded-full inline-flex items-center justify-center"> <div class="w-6 h-6 bg-primary text-white rounded-full inline-flex items-center justify-center">
@ -72,7 +72,7 @@
</div> </div>
<div class="card-back absolute w-full h-full backface-hidden rotate-y-180 bg-light-grey border border-dark-grey p-6"> <div class="card-back absolute w-full h-full backface-hidden rotate-y-180 bg-light-grey border border-dark-grey p-6">
<h4 class="text-center">{card.header}</h4> <h4>{card.header}</h4>
<div class="text-sm"> <div class="text-sm">
<f:format.html>{card.bodytext}</f:format.html> <f:format.html>{card.bodytext}</f:format.html>
</div> </div>

View file

@ -11,7 +11,8 @@ fields:
allowed: [jpg, jpeg, png, gif, webp] allowed: [jpg, jpeg, png, gif, webp]
multiple: true multiple: true
useExistingField: true useExistingField: true
- identifier: columns - identifier: imagecols
useExistingField: true
type: Select type: Select
renderType: selectSingle renderType: selectSingle
default: 1 default: 1

View file

@ -24,7 +24,7 @@
</f:for> </f:for>
</div> </div>
<p> <p>
<f:switch expression="{data.columns}"> <f:switch expression="{data.imagecols}">
<f:case value="2">2 Columns</f:case> <f:case value="2">2 Columns</f:case>
<f:case value="3">3 Columns</f:case> <f:case value="3">3 Columns</f:case>
<f:case value="5">5 Columns</f:case> <f:case value="5">5 Columns</f:case>

View file

@ -7,7 +7,7 @@
<f:if condition="{data.image}"> <f:if condition="{data.image}">
<f:variable name="columnClass"> <f:variable name="columnClass">
<f:switch expression="{data.columns}"> <f:switch expression="{data.imagecols}">
<f:case value="2">md:grid-cols-2</f:case> <f:case value="2">md:grid-cols-2</f:case>
<f:case value="3">md:grid-cols-3</f:case> <f:case value="3">md:grid-cols-3</f:case>
<f:case value="5">md:grid-cols-5</f:case> <f:case value="5">md:grid-cols-5</f:case>