diff --git a/apps/web-twig-demo/templates/default.html.twig b/apps/web-twig-demo/templates/default.html.twig
index caf8a495d0..60e5cfc0f4 100644
--- a/apps/web-twig-demo/templates/default.html.twig
+++ b/apps/web-twig-demo/templates/default.html.twig
@@ -6,16 +6,20 @@
{% include 'partials/tabs.html.twig' %}
-
+
- {% for component in components %}
-
-
- {{ component }}
-
-
- {% endfor %}
+
-
+ {% for component in components %}
+
+
+ {{ component }}
+
+
+ {% endfor %}
+
+
+
+
{% endblock %}
diff --git a/apps/web-twig-demo/templates/helpers.html.twig b/apps/web-twig-demo/templates/helpers.html.twig
index c4c3c10022..334caa319a 100644
--- a/apps/web-twig-demo/templates/helpers.html.twig
+++ b/apps/web-twig-demo/templates/helpers.html.twig
@@ -6,16 +6,20 @@
{% include 'partials/tabs.html.twig' %}
-
+
- {% for helper in helpers %}
-
-
- {{ helper | replace({'-': ' '}) | title }}
-
-
- {% endfor %}
+
-
+ {% for helper in helpers %}
+
+
+ {{ helper | replace({'-': ' '}) | title }}
+
+
+ {% endfor %}
+
+
+
+
{% endblock %}
diff --git a/apps/web-twig-demo/templates/layout/default.html.twig b/apps/web-twig-demo/templates/layout/default.html.twig
index 90630d90a4..fd777f9f2c 100644
--- a/apps/web-twig-demo/templates/layout/default.html.twig
+++ b/apps/web-twig-demo/templates/layout/default.html.twig
@@ -30,11 +30,9 @@
{%- endset -%}
-
{{ renderedContent }}
-
{% include 'partials/footer.html.twig' only %}
diff --git a/apps/web-twig-demo/templates/partials/tabs.html.twig b/apps/web-twig-demo/templates/partials/tabs.html.twig
index d7342ce96e..218508c093 100644
--- a/apps/web-twig-demo/templates/partials/tabs.html.twig
+++ b/apps/web-twig-demo/templates/partials/tabs.html.twig
@@ -5,7 +5,7 @@
{% set isHelpersSelected = routeName == 'helpers_index' %}
{% set isValidationsSelected = routeName == 'validations_index' %}
-
+
-
- Real-World examples
-
-
-
-
+
+
+
+
+ Real-World examples
+
+
+
+
+
+
{{ encore_entry_script_tags('formValidations') }}
diff --git a/packages/web-twig/docs/components/DocsSection/DocsSection.twig b/packages/web-twig/docs/components/DocsSection/DocsSection.twig
index 11ce124398..5eeb7b1308 100644
--- a/packages/web-twig/docs/components/DocsSection/DocsSection.twig
+++ b/packages/web-twig/docs/components/DocsSection/DocsSection.twig
@@ -1,5 +1,6 @@
{# API #}
{%- set props = props | default([]) -%}
+{%- set _container = props.container | default('all') -%}
{%- set _hasStack = props.hasStack ?? true -%}
{%- set _stackAlignment = props.stackAlignment | default('start') -%}
{%- set _tag = props.tag | default(null) -%}
@@ -17,17 +18,23 @@
{% block content %}{% endblock %}
{% endset -%}
-
+{%- set _heading -%}
{{ _title }}
{% if _tag %}
{{ _tag }}
{% endif %}
+{%- endset -%}
+
+{%- set _content -%}
+ {% if _container == 'heading-only' %}
+
+ {{- _heading -}}
+
+ {% else %}
+ {{- _heading -}}
+ {% endif %}
{% if _hasStack %}
{%- embed '@spirit/DocsStack/DocsStack.twig' with { props: {
stackAlignment: _stackAlignment,
@@ -39,4 +46,18 @@
{% else %}
{{ _renderedContent }}
{% endif %}
+{%- endset -%}
+
+
+ {% if _container == 'all' %}
+
+ {{- _content -}}
+
+ {% else %}
+ {{- _content -}}
+ {% endif %}
diff --git a/packages/web-twig/docs/components/DocsSection/__tests__/__fixtures__/docsSectionDefault.twig b/packages/web-twig/docs/components/DocsSection/__tests__/__fixtures__/docsSectionDefault.twig
index 83c1f21ad0..37ee810945 100644
--- a/packages/web-twig/docs/components/DocsSection/__tests__/__fixtures__/docsSectionDefault.twig
+++ b/packages/web-twig/docs/components/DocsSection/__tests__/__fixtures__/docsSectionDefault.twig
@@ -8,9 +8,18 @@
my content
+
+
+ my content
+
+
-
- My Title
-
+
+
+ My Title
+
-
-
- My Title
-
+
+
+ My Title
+
+
+
+ my content
+
+
+
+
+
+
+
+
+ My Title
+
+
-
+
my content
diff --git a/packages/web-twig/src/Resources/components/Button/stories/ButtonColorsSizes.twig b/packages/web-twig/src/Resources/components/Button/stories/ButtonColorsSizes.twig
index 37cf8855aa..87fe0537de 100644
--- a/packages/web-twig/src/Resources/components/Button/stories/ButtonColorsSizes.twig
+++ b/packages/web-twig/src/Resources/components/Button/stories/ButtonColorsSizes.twig
@@ -3,7 +3,7 @@
{% set title = 'Size ' ~ size %}
-
+
{% for color in colors %}