diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 96edb1e..9366139 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -68,8 +68,8 @@ jobs: rm typo3.tar.gz - name: Install ssh agent and rsync run: | - apt-get update - apt-get install -y openssh-client rsync + apt update + apt install -y openssh-client rsync - name: Upload release uses: deployphp/action@v1 with: @@ -93,8 +93,8 @@ jobs: rm typo3.tar.gz - name: Install ssh agent and rsync run: | - apt-get update - apt-get install -y openssh-client rsync + apt update + apt install -y openssh-client rsync - name: Switch to release uses: deployphp/action@v1 with: @@ -102,28 +102,28 @@ jobs: dep: --file=./build/deploy.php release:switch stage private-key: ${{secrets.STAGE_KEY}} - deploy-production: - needs: build - runs-on: ubuntu-latest - steps: - - name: Setup PHP - uses: shivammathur/setup-php@7c0b4c8c8ebed23eca9ec2802474895d105b11bc - with: - php-version: ${{ env.PHP_VERSION }} - - uses: actions/download-artifact@v3 - with: - name: typo3 - - name: Extract artifact - run: | - tar xf typo3.tar.gz - rm typo3.tar.gz - - name: Install ssh agent and rsync - run: | - apt-get update - apt-get install -y openssh-client rsync - - name: Deploy - uses: deployphp/action@v1 - with: - deployer-binary: "./bin/dep" - dep: --file=./build/deploy.php release:create production - private-key: ${{secrets.PROD_KEY}} + # deploy-production: + # needs: build + # runs-on: ubuntu-latest + # steps: + # - name: Setup PHP + # uses: shivammathur/setup-php@7c0b4c8c8ebed23eca9ec2802474895d105b11bc + # with: + # php-version: ${{ env.PHP_VERSION }} + # - uses: actions/download-artifact@v3 + # with: + # name: typo3 + # - name: Extract artifact + # run: | + # tar xf typo3.tar.gz + # rm typo3.tar.gz + # - name: Install ssh agent and rsync + # run: | + # apt update + # apt install -y openssh-client rsync + # - name: Deploy + # uses: deployphp/action@v1 + # with: + # deployer-binary: "./bin/dep" + # dep: --file=./build/deploy.php release:create production + # private-key: ${{secrets.PROD_KEY}} diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml index 434daa6..e433f47 100644 --- a/.gitea/workflows/release.yaml +++ b/.gitea/workflows/release.yaml @@ -26,8 +26,8 @@ jobs: composer validate --no-check-publish && composer install --prefer-dist --no-progress --ignore-platform-reqs - name: Install ssh agent, rsync run: | - apt-get update - apt-get install -y openssh-client rsync + apt update + apt install -y openssh-client rsync - name: Switch to release uses: deployphp/action@v1 with: diff --git a/build/deploy.php b/build/deploy.php index ed3cdfa..05c9efb 100644 --- a/build/deploy.php +++ b/build/deploy.php @@ -94,7 +94,6 @@ task('release:create', [ 'deploy:vendors', 'deploy:shared', 'deploy:writable', - 'typo3:cache:flush', 'typo3:extension:setup', 'deploy:unlock', 'deploy:success' @@ -118,7 +117,6 @@ task('deploy', [ 'deploy:vendors', 'deploy:shared', 'deploy:writable', - 'typo3:cache:flush', 'typo3:extension:setup', 'deploy:symlink', 'php:reload', diff --git a/packages/base/ContentBlocks/ContentElements/card_container/templates/frontend.html b/packages/base/ContentBlocks/ContentElements/card_container/templates/frontend.html index fc21f5d..db56da1 100644 --- a/packages/base/ContentBlocks/ContentElements/card_container/templates/frontend.html +++ b/packages/base/ContentBlocks/ContentElements/card_container/templates/frontend.html @@ -25,7 +25,7 @@
- + -
+
-

{card.header}

+

{card.header}

@@ -72,7 +72,7 @@
-

{card.header}

+

{card.header}

{card.bodytext}
diff --git a/packages/base/ContentBlocks/ContentElements/imagegallery/config.yaml b/packages/base/ContentBlocks/ContentElements/imagegallery/config.yaml index 5efef46..f479dd5 100644 --- a/packages/base/ContentBlocks/ContentElements/imagegallery/config.yaml +++ b/packages/base/ContentBlocks/ContentElements/imagegallery/config.yaml @@ -11,7 +11,8 @@ fields: allowed: [jpg, jpeg, png, gif, webp] multiple: true useExistingField: true - - identifier: columns + - identifier: imagecols + useExistingField: true type: Select renderType: selectSingle default: 1 diff --git a/packages/base/ContentBlocks/ContentElements/imagegallery/templates/backend-preview.html b/packages/base/ContentBlocks/ContentElements/imagegallery/templates/backend-preview.html index 7e956b6..838f0b3 100644 --- a/packages/base/ContentBlocks/ContentElements/imagegallery/templates/backend-preview.html +++ b/packages/base/ContentBlocks/ContentElements/imagegallery/templates/backend-preview.html @@ -24,7 +24,7 @@

- + 2 Columns 3 Columns 5 Columns diff --git a/packages/base/ContentBlocks/ContentElements/imagegallery/templates/frontend.html b/packages/base/ContentBlocks/ContentElements/imagegallery/templates/frontend.html index 90e43e3..f74618d 100644 --- a/packages/base/ContentBlocks/ContentElements/imagegallery/templates/frontend.html +++ b/packages/base/ContentBlocks/ContentElements/imagegallery/templates/frontend.html @@ -7,7 +7,7 @@ - + md:grid-cols-2 md:grid-cols-3 md:grid-cols-5