Merge branch 'develop'

This commit is contained in:
Simon Vieille 2024-05-26 14:51:18 +02:00
commit a15cf1559b
7 changed files with 8 additions and 4 deletions

View file

@ -17,7 +17,7 @@ class ColumnBlock extends BootstrapBlock
->setLabel('Column')
->setIsContainer(true)
->setOrder(3)
->setClass('col-12 col-lg-2 pr-md-1')
->setClass('col-12 col-lg-3 pr-md-1')
->setTemplate('@Core/builder_block/bootstrap/column.html.twig')
->setIcon('<i class="fas fa-columns"></i>')
->addSetting(name: 'size', label: 'Extra small', type: 'number', attributes: ['min' => 0, 'max' => 12])
@ -25,6 +25,7 @@ class ColumnBlock extends BootstrapBlock
->addSetting(name: 'sizeMd', label: 'Medium', type: 'number', attributes: ['min' => 0, 'max' => 12])
->addSetting(name: 'sizeLg', label: 'Large', type: 'number', attributes: ['min' => 0, 'max' => 12])
->addSetting(name: 'sizeXl', label: 'Extra large', type: 'number', attributes: ['min' => 0, 'max' => 12])
->addSetting(name: 'customClass', label: 'Custom class', type: 'text')
;
}
}

View file

@ -20,6 +20,7 @@ class ContainerBlock extends BootstrapBlock
->setTemplate('@Core/builder_block/bootstrap/container.html.twig')
->setIcon('<i class="fas fa-th"></i>')
->addSetting(name: 'isFluid', label: 'Fluid', type: 'checkbox')
->addSetting(name: 'customClass', label: 'Custom class', type: 'text')
;
}
}

View file

@ -20,6 +20,7 @@ class RowBlock extends BootstrapBlock
->setIcon('<i class="fas fa-align-justify"></i>')
->setTemplate('@Core/builder_block/bootstrap/row.html.twig')
->addWidget('bsColumn')
->addSetting(name: 'customClass', label: 'Custom class', type: 'text')
;
}
}

View file

@ -232,3 +232,4 @@
"Level": "Niveau"
"Insert line breaks": "Ajouter les retours chariot"
'Allow HTML': "Autoriser l'HTML"
"Custom class": "Classe personnalisée"

View file

@ -6,7 +6,7 @@
'col-xl-': settings.sizeXl|default(null),
} %}
<div class="col {% for i, v in sizes%}{% if v|length %}{{ i }}{{ v }} {% endif %}{% endfor -%}" id="{{ id }}">
<div class="col {% for i, v in sizes%}{% if v|length %}{{ i }}{{ v }} {% endif %}{% endfor -%} {{ settings.customClass|default(null) }}" id="{{ id }}">
{% for item in children %}
{{ item|block_to_html(context) }}
{% endfor %}

View file

@ -1,4 +1,4 @@
<div class="container{% if settings.isFluid|default(false) %}-fluid{% endif %}" id="{{ id }}">
<div class="container{% if settings.isFluid|default(false) %}-fluid{% endif %} {{ settings.customClass|default(null) }}" id="{{ id }}">
{% for item in children %}
{{ item|block_to_html(context) }}
{% endfor %}

View file

@ -1,4 +1,4 @@
<div class="row" id="{{ id }}">
<div class="row {{ settings.customClass|default(null) }}" id="{{ id }}">
{% for item in children %}
{{ item|block_to_html(context) }}
{% endfor %}