fix: favicon url

.ddev/config.yaml

@@ -16,7 +16,10 @@ web_environment:
 corepack_enable: false
 nodejs_version: "18"
 
+additional_services:
+  - mailpit
 hooks:
   post-start:
-    - exec: "npm install"
+    - exec-host: |
-    - exec: "npm run dev:css"
+        ddev npm install
+        ddev npm run dev:css -- --watch &

.ddev/docker-compose.override.yaml

@@ -1,9 +0,0 @@
-version: '3.6'
-services:
-  web:
-    # Install needed dependencies and run webpack in watch mode
-    command: /bin/sh -c "npm install && npm run build:css -- --watch"
-    volumes:
-      - ../packages/base:/var/www/html/packages/base
-    environment:
-      - NODE_ENV=development

.gitea/workflows/deploy.yaml

@@ -68,8 +68,8 @@ jobs:
           rm typo3.tar.gz
       - name: Install ssh agent and rsync
         run: |
-          apt update
+          apt-get update
-          apt install -y openssh-client rsync
+          apt-get 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 update
+          apt-get update
-          apt install -y openssh-client rsync
+          apt-get 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:
+  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 update
+          apt-get update
-  #         apt install -y openssh-client rsync
+          apt-get 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}}

.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 update
+          apt-get update
-          apt install -y openssh-client rsync
+          apt-get install -y openssh-client rsync
       - name: Switch to release
         uses: deployphp/action@v1
         with:

.roo/rules/rules.md

@@ -0,0 +1,163 @@
+# TYPO3 Project Rules for LLM Assistance
+
+## Project Overview
+This project is a TYPO3 installation with a custom site-package extension located in [`packages/base`](packages/base), providing layout, templates, and modular ContentBlocks for pages. The LLM should dynamically determine the TYPO3 version and related dependencies by examining project files.
+
+## Technology Stack
+- PHP (version defined in [`composer.json`](composer.json))
+- TYPO3 (version defined in [`composer.json`](composer.json))
+- Composer ([`composer.json`](composer.json))
+- Deployer ([`build/deploy.php`](build/deploy.php), [`build/servers.yaml`](build/servers.yaml))
+- Webpack ([`webpack.config.js`](webpack.config.js))
+- PostCSS ([`postcss.config.js`](postcss.config.js)) with Tailwind CSS (version defined in [`package.json`](package.json)) and Autoprefixer
+- SCSS (`packages/base/Resources/Public/Scss/`)
+- JavaScript bundling (`packages/base/Resources/Public/JavaScript/`)
+- PHPStan, Rector (`phpstan.neon`, `rector.php`)
+- YAML and TypoScript for configuration
+
+## Project Structure
+- [`config/`](config/): Global TYPO3 config and environment overrides  
+- [`data/`](data/): Database dumps and test fixtures  
+- [`packages/base/`](packages/base/): Site-package extension with design assets, Fluid templates, TypoScript, ContentBlocks  
+- [`public/`](public/): Document root  
+- Build files: [`webpack.config.js`](webpack.config.js), [`postcss.config.js`](postcss.config.js)  
+- Dependency manifests: [`package.json`](package.json), [`composer.json`](composer.json)
+
+## Development Guidelines
+- Use DDEV for local environment management: `ddev start`, `ddev restart`, `ddev stop`, etc.
+- Check versions in [`composer.json`](composer.json) and [`package.json`](package.json) before referencing dependencies; the LLM should examine these files to determine actual versions
+- Manage PHP dependencies via Composer within DDEV: `ddev exec composer install`, `ddev exec composer update`
+- Manage JS/CSS via npm within DDEV: `ddev exec npm install`, `ddev exec npm run dev` / `ddev exec npm run build`
+- Follow TYPO3 extension conventions in [`packages/base`](packages/base): `ext_localconf.php`, `ext_tables.php`, `ext_emconf.php`
+- Organize TypoScript under [`packages/base/Configuration/Sets/SitePackage/TypoScript/`](packages/base/Configuration/Sets/SitePackage/TypoScript/)
+- Enforce static analysis and automated refactoring with PHPStan and Rector
+
+## Default Workflow
+When handling any task, LLMs should follow this structured approach:
+
+1. **Information Gathering**
+   - Read the necessary code from the project using available tools
+   - Examine [`composer.json`](composer.json) and [`package.json`](package.json) to understand current dependencies and versions
+   - Use MCP servers to read documentation about libraries that are used and should be used
+   - Review relevant project files to understand the current implementation
+   - Gather context about the specific area of the codebase that will be affected
+
+2. **Planning**
+   - Analyze the gathered information to understand the task requirements
+   - Plan how the task should be implemented within the existing project structure
+   - Consider potential impacts on other parts of the codebase
+   - Identify which files need to be created, modified, or reviewed
+   - Determine the best approach that follows project conventions and best practices
+
+3. **Implementation**
+   - Execute the planned task using appropriate tools
+   - Follow the project's coding standards and conventions
+   - Test the implementation where possible
+   - Ensure all changes work within the existing project structure
+
+4. **Documentation Updates**
+   - Update project documentation (README files) if the task affects user-facing functionality
+   - Update these rules ([`.roo/rules/rules.md`](.roo/rules/rules.md)) if the task introduces new patterns, conventions, or important information that future LLMs should know
+   - Ensure any new features or changes are properly documented for future reference
+
+This workflow ensures thorough understanding, proper planning, clean implementation, and maintained documentation for all project changes.
+
+## ContentBlocks Usage
+- Defined under [`packages/base/ContentBlocks/ContentElements/`](packages/base/ContentBlocks/ContentElements/)
+- Element folder contains:
+  - `config.yaml` (block definition)
+  - `templates/frontend.html` (frontend rendering)
+  - `templates/backend-preview.html` (backend preview)
+  - `language/labels.xlf` (translations)
+- To add a new block:
+  1. Create a folder under `ContentElements/`
+  2. Define `config.yaml` and labels
+  3. Add Fluid templates in `templates/`
+  4. Clear caches and verify in TYPO3 backend (`ddev exec vendor/bin/typo3cms cache:flush`)
+- Content element restrictions:
+  - ContentBlocks are automatically registered via their YAML config files
+  - Availability is controlled through PageTSconfig using `TCEFORM.tt_content.CType.keepItems`
+  - The `keepItems` list in [`packages/base/Configuration/Sets/SitePackage/page.tsconfig`](packages/base/Configuration/Sets/SitePackage/page.tsconfig) determines which content elements editors can use
+  - To enable a new ContentBlock, add its CType to the `keepItems` list
+- Clear caches after changes
+
+## Styling Guidelines
+- All design work lives in the [`packages/base`](packages/base) extension
+- SCSS structure in `Resources/Public/Scss/`:
+  - `abstracts/` (variables, mixins, functions)
+  - `base/` (resets, global styles)
+  - `components/` (UI modules: buttons, cards, nav, etc.)
+  - `layouts/` (page-specific styles)
+- Include Tailwind directives in `main.scss`:
+  ```scss
+  @tailwind base;
+  @tailwind components;
+  @tailwind utilities;
+  ```
+- Customize Tailwind in [`tailwind.config.js`](tailwind.config.js)
+
+## Build Process
+1. Compile SCSS → PostCSS (Tailwind + Autoprefixer) → CSS in `Resources/Public/Css/` (within DDEV: `ddev exec npm run build:css`)
+2. Bundle JS via Webpack → `Resources/Public/JavaScript/` (within DDEV: `ddev exec npm run build:js`)
+3. Run dev mode: `ddev exec npm run dev`
+4. Run production build: `ddev exec npm run build`
+5. Deploy via Deployer: `ddev exec vendor/bin/dep deploy`
+
+## File Editing Guidelines
+- TypoScript: `packages/base/Configuration/Sets/SitePackage/TypoScript/`
+- YAML: `packages/base/Configuration/**/*.yaml`
+- Fluid templates: `packages/base/Resources/Private/**/*.html`
+- SCSS: `packages/base/Resources/Public/Scss/**/*.scss`
+- JavaScript: `packages/base/Resources/Public/JavaScript/**/*.js`
+- Never read or commit the environment file: [`.env`](.env)
+
+## MCP Server Usage
+- Use `brave_web_search` for general web searches via `use_mcp_tool`
+- Use `resolve-library-id` + `get-library-docs` for official API docs:
+  - `/typo3/docs` for TYPO3 reference
+  - `/tailwindcss` for Tailwind CSS docs
+- For NixOS/Home Manager queries: use `nixos_search`, `home_manager_search`
+
+## Version Management
+- Always inspect [`composer.json`](composer.json) for PHP dependencies and TYPO3 version
+- Always inspect [`package.json`](package.json) for frontend dependencies
+- Use MCP servers (e.g., `resolve-library-id`, `get-library-docs`) to fetch documentation matching the exact versions found
+- Never assume specific dependency versions in code examples; dynamically reference versions as discovered
+
+## Common Tasks
+1. **Initial Setup**
+   ```bash
+   ddev start
+   ddev composer install
+   ddev npm install
+   ```
+2. **Development Build**
+   ```bash
+   ddev npm run dev
+   ```
+3. **Production Build**
+   ```bash
+   ddev npm run build
+   ```
+4. **Clear TYPO3 Cache**
+   ```bash
+   ddev typo3cms cache:flush
+   ```
+5. **Add a ContentBlock**
+   - Create folder, config, templates, translations
+   - Add the new ContentBlock's CType to the `keepItems` list in [`packages/base/Configuration/Sets/SitePackage/page.tsconfig`](packages/base/Configuration/Sets/SitePackage/page.tsconfig)
+   - Clear caches and verify in backend
+6. **DDEV Environment Management**
+   - Restart environment: `ddev restart`
+   - Stop environment: `ddev stop`
+7. **Deploy**
+   ```bash
+   ddev exec vendor/bin/dep deploy production
+   ```
+
+## Troubleshooting
+- **Blank CSS/JS**: confirm build pipeline ran; check [`webpack.config.js`](webpack.config.js)
+- **YAML Syntax Errors**: validate `config.yaml` with a linter
+- **Fluid Rendering Issues**: clear caches; verify template paths
+- **TypoScript Not Loading**: ensure correct path under `Configuration/Sets`
+- **Cache Problems**: always flush caches after changes

ToDo.md

@@ -2,3 +2,5 @@
 [x] unordered list design
 [x] check if marker design of ul and ol use em instead of rem for sizing
 [x] navbar should be sticky on mobile
+[ ] disable social media icons
+[ ] footer links zu datenschutz und impressum

build/deploy.php

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

package.json

@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "scripts": {
     "build:css": "NODE_ENV=production webpack --config webpack.config.js --mode production",
-    "dev:css": "webpack --config webpack.config.js --mode development"
+    "dev:css": "webpack --config webpack.config.js --mode development --watch"
   },
   "devDependencies": {
     "autoprefixer": "^10.4.21",

packages/base/Configuration/Sets/SitePackage/TypoScript/page.typoscript

@@ -9,7 +9,7 @@
 page = PAGE
 page {
   typeNum = 0
-  shortcutIcon = EXT:base/Resources/Public/Favicons/favicon-96x96.png
+  shortcutIcon = EXT:base/Resources/Public/Favicons/web-app-manifest-512x512.png
 
   bodyTagCObject = COA
   bodyTagCObject {

packages/base/Configuration/Sets/SitePackage/page.tsconfig

@@ -9,7 +9,7 @@ RTE {
 TCEFORM {
   tt_content {
     CType {
-      keepItems = cloonar_text,cloonar_textimage,cloonar_hero,cloonar_cards,form_formframework
+      keepItems = cloonar_text,cloonar_textimage,cloonar_hero,cloonar_cards,cloonar_imagegallery,form_formframework
     }
   }
 }

packages/base/ContentBlocks/ContentElements/card_container/templates/frontend.html

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

packages/base/ContentBlocks/ContentElements/imagegallery/config.yaml

@@ -0,0 +1,26 @@
+name: cloonar/imagegallery
+typeName: cloonar_imagegallery
+group: default
+prefixFields: false
+fields:
+  - identifier: header
+    useExistingField: true
+  - identifier: image
+    type: File
+    properties:
+      allowed: [jpg, jpeg, png, gif, webp]
+      multiple: true
+    useExistingField: true
+  - identifier: columns
+    type: Select
+    renderType: selectSingle
+    default: 1
+    items:
+      - label: LLL:EXT:base/ContentBlocks/ContentElements/imagegallery/language/labels.xlf:columns.1
+        value: 1
+      - label: LLL:EXT:base/ContentBlocks/ContentElements/imagegallery/language/labels.xlf:columns.2
+        value: 2
+      - label: LLL:EXT:base/ContentBlocks/ContentElements/imagegallery/language/labels.xlf:columns.3
+        value: 3
+      - label: LLL:EXT:base/ContentBlocks/ContentElements/imagegallery/language/labels.xlf:columns.5
+        value: 5

packages/base/ContentBlocks/ContentElements/imagegallery/language/labels.xlf

@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+  <file datatype="plaintext" original="labels.xlf" source-language="en" product-name="cloonar/imagegallery">
+    <header/>
+    <body>
+      <trans-unit id="title">
+        <source>Image Gallery</source>
+      </trans-unit>
+      <trans-unit id="description">
+        <source>A gallery of images with configurable columns</source>
+      </trans-unit>
+      <trans-unit id="columns.1">
+        <source>1 Column</source>
+      </trans-unit>
+      <trans-unit id="columns.2">
+        <source>2 Columns</source>
+      </trans-unit>
+      <trans-unit id="columns.3">
+        <source>3 Columns</source>
+      </trans-unit>
+      <trans-unit id="columns.5">
+        <source>5 Columns</source>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>

packages/base/ContentBlocks/ContentElements/imagegallery/templates/backend-preview.html

@@ -0,0 +1,36 @@
+<html
+    xmlns:be="http://typo3.org/ns/TYPO3/CMS/Backend/ViewHelpers"
+    data-namespace-typo3-fluid="true"
+>
+<f:layout name="Preview"/>
+
+<f:section name="Header">
+    <be:link.editRecord uid="{data.uid}" table="{data.mainType}">
+        <f:if condition="{data.header}">
+            <f:then><strong>{data.header}</strong></f:then>
+        </f:if>
+    </be:link.editRecord>
+</f:section>
+
+<f:section name="Content">
+    <f:if condition="{data.image}">
+        <div class="row">
+            <f:for each="{data.image}" as="image" iteration="iterator">
+                <f:if condition="{iterator.index} < 3">
+                    <div class="col-4">
+                        <f:image image="{image}" width="100" height="auto" treatIdAsReference="1" alt="Preview image" />
+                    </div>
+                </f:if>
+            </f:for>
+        </div>
+        <p>
+            <f:switch expression="{data.columns}">
+                <f:case value="2">2 Columns</f:case>
+                <f:case value="3">3 Columns</f:case>
+                <f:case value="5">5 Columns</f:case>
+                <f:defaultCase>1 Column</f:defaultCase>
+            </f:switch>
+        </p>
+    </f:if>
+</f:section>
+</html>

packages/base/ContentBlocks/ContentElements/imagegallery/templates/frontend.html

@@ -0,0 +1,63 @@
+<f:layout name="Default" />
+<f:section name="Header"></f:section>
+<f:section name="Main">
+  <f:if condition="{data.header}">
+    <h2 class="text-center mb-8">{data.header}</h2>
+  </f:if>
+
+  <f:if condition="{data.image}">
+    <f:variable name="columnClass">
+      <f:switch expression="{data.columns}">
+        <f:case value="2">md:grid-cols-2</f:case>
+        <f:case value="3">md:grid-cols-3</f:case>
+        <f:case value="5">md:grid-cols-5</f:case>
+        <f:defaultCase>md:grid-cols-1</f:defaultCase>
+      </f:switch>
+    </f:variable>
+
+    <div class="grid grid-cols-1 {columnClass} gap-6 md:gap-8">
+      <f:for each="{data.image}" as="image">
+        <div class="relative">
+          <f:if condition="{image.link}">
+            <f:then>
+              <f:link.typolink parameter="{image.link}" class="block w-full h-full">
+                <picture class="block w-full h-full">
+                  <source
+                    type="image/webp"
+                    srcset="{f:uri.image(image:image, width:'320', cropVariant:'default', fileExtension:'webp')} 320w,
+                            {f:uri.image(image:image, width:'768', cropVariant:'default', fileExtension:'webp')} 768w"
+                    sizes="(max-width: 767px) 90vw, 33vw" />
+                  <img
+                    src="{f:uri.image(image:image, width:'768', cropVariant:'default')}"
+                    srcset="{f:uri.image(image:image, width:'320', cropVariant:'default')} 320w,
+                            {f:uri.image(image:image, width:'768', cropVariant:'default')} 768w"
+                    sizes="(max-width: 767px) 90vw, 33vw"
+                    alt="{image.alternative}"
+                    class="w-full h-full object-cover"
+                  />
+                </picture>
+              </f:link.typolink>
+            </f:then>
+            <f:else>
+              <picture class="block w-full h-full">
+                <source
+                  type="image/webp"
+                  srcset="{f:uri.image(image:image, width:'320', cropVariant:'default', fileExtension:'webp')} 320w,
+                        {f:uri.image(image:image, width:'768', cropVariant:'default', fileExtension:'webp')} 768w"
+                  sizes="(max-width: 767px) 90vw, 33vw" />
+                <img
+                  src="{f:uri.image(image:image, width:'768', cropVariant:'default')}"
+                  srcset="{f:uri.image(image:image, width:'320', cropVariant:'default')} 320w,
+                          {f:uri.image(image:image, width:'768', cropVariant:'default')} 768w"
+                  sizes="(max-width: 767px) 90vw, 33vw"
+                  alt="{image.alternative}"
+                  class="w-full h-full object-cover"
+                />
+              </picture>
+            </f:else>
+          </f:if>
+        </div>
+      </f:for>
+    </div>
+  </f:if>
+</f:section>

packages/base/ContentBlocks/ContentElements/textimage/config.yaml

@@ -21,9 +21,11 @@ fields:
   - identifier: imagesize
     type: Select
     renderType: selectSingle
-    default: 2
+    default: 3
     items:
       - label: 25%
         value: 1
+      - label: 33%
+        value: 2
       - label: 50%
-        value: 2
+        value: 3

packages/base/ContentBlocks/ContentElements/textimage/templates/frontend.html

@@ -5,10 +5,16 @@
   <f:variable name="textSizeClass" value="md:w-1/2" />
   <f:variable name="gapClass" value="gap-8 md:gap-16" />
 
-  <f:if condition="{data.imagesize} == 1"> <!-- Size 25% -> map to 40% for layout -->
+  <f:if condition="{data.imagesize} == 1"> <!-- Size 25% -->
-    <f:variable name="imageSizeClass" value="md:w-2/5" />
+    <f:variable name="imageSizeClass" value="md:w-1/4" />
-    <f:variable name="textSizeClass" value="md:w-3/5" />
+    <f:variable name="textSizeClass" value="md:w-3/4" />
-    <f:variable name="gapClass" value="gap-8 md:gap-16 lg:gap-32" />
+    <f:variable name="gapClass" value="gap-6 md:gap-12" />
+  </f:if>
+
+  <f:if condition="{data.imagesize} == 2"> <!-- Size 33% -->
+    <f:variable name="imageSizeClass" value="md:w-1/3" />
+    <f:variable name="textSizeClass" value="md:w-2/3" />
+    <f:variable name="gapClass" value="gap-8 md:gap-16" />
   </f:if>
 
   <div class="flex flex-col {gapClass} fade-in-on-scroll {f:if(condition: '{data.imageorient} == 26', then: 'md:flex-row-reverse', else: 'md:flex-row')}">
@@ -24,7 +30,11 @@
                 {f:uri.image(image:data.image.0, width:'768c', cropVariant:'default', fileExtension:'webp')} 768w,
                 {f:uri.image(image:data.image.0, width:'1024c', cropVariant:'default', fileExtension:'webp')} 1024w"
               sizes="(max-width: 767px) 90vw,
-                     {f:if(condition: '{data.imagesize} == 1', then: '(min-width: 768px) 40vw', else: '(min-width: 768px) 50vw')}" />
+                     {f:if(condition: '{data.imagesize} == 1',
+                           then: '(min-width: 768px) 25vw',
+                           else: f:if(condition: '{data.imagesize} == 2',
+                                    then: '(min-width: 768px) 33vw',
+                                    else: '(min-width: 768px) 50vw'))}" />
             <!-- Fallback source -->
             <source
               srcset="
@@ -32,7 +42,11 @@
                 {f:uri.image(image:data.image.0, width:'400c', cropVariant:'default')} 768w,
                 {f:uri.image(image:data.image.0, width:'538c', cropVariant:'default')} 1024w"
               sizes="(max-width: 767px) 90vw,
-                     {f:if(condition: '{data.imagesize} == 1', then: '(min-width: 768px) 40vw', else: '(min-width: 768px) 50vw')}" />
+                     {f:if(condition: '{data.imagesize} == 1',
+                           then: '(min-width: 768px) 25vw',
+                           else: f:if(condition: '{data.imagesize} == 2',
+                                    then: '(min-width: 768px) 33vw',
+                                    else: '(min-width: 768px) 50vw'))}" />
             <f:image
               image="{data.image.0}"
               treatIdAsReference="1"