Skip to content

OEL-4230: Remove spaceless from templates and fix for tests whitespace. #710

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: development
Choose a base branch
from
Open

OEL-4230: Remove spaceless from templates and fix for tests whitespace. #710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/components/bcl-accordion/accordion.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
{% apply spaceless %}

{#
Parameters:
- title (string) (default: '')
Expand Down Expand Up @@ -141,4 +139,3 @@
</div>
{% endif %}

{% endapply %}
3 changes: 0 additions & 3 deletions src/components/bcl-alert/alert.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
{% apply spaceless %}

{# Parameters:
- message (string) (default: '')
- heading (string) (default: '')
Expand Down Expand Up @@ -80,4 +78,3 @@
{%- endif -%}
</div>

{% endapply %}
3 changes: 0 additions & 3 deletions src/components/bcl-badge/badge.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
{% apply spaceless %}

{# Parameters:
- label (string) (default: '')
- background: (string) (default: 'primary')
Expand Down Expand Up @@ -76,4 +74,3 @@
</span>
{%- endif -%}

{% endapply %}
3 changes: 0 additions & 3 deletions src/components/bcl-blockquote/blockquote.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
{% apply spaceless %}

{# Parameters:
- title (string) (default: '')
- title_tag (string) (default: 'h2')
Expand Down Expand Up @@ -70,4 +68,3 @@
{% endif %}
</figure>

{% endapply %}
3 changes: 0 additions & 3 deletions src/components/bcl-breadcrumb/breadcrumb.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
{% apply spaceless %}

{# Parameters:
- links (link[]) (default: [])
- icon_path (string) (default: '')
Expand Down Expand Up @@ -59,4 +57,3 @@
</nav>
{% endif %}

{% endapply %}
3 changes: 0 additions & 3 deletions src/components/bcl-button-group/button-group.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
{% apply spaceless %}

{# Parameters:
- vertical (boolean) (default: false)
- size (string) (default: 'md')
Expand Down Expand Up @@ -64,4 +62,3 @@
</div>
{% endif %}

{% endapply %}
3 changes: 0 additions & 3 deletions src/components/bcl-button/button.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
{% apply spaceless %}

{#
Parameters:
- label (string) (default: '')
Expand Down Expand Up @@ -111,4 +109,3 @@
{%- endif -%}
</button>

{% endapply %}
12 changes: 6 additions & 6 deletions src/components/bcl-card-layout/__snapshots__/card-layout.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@ exports[`OE - Card grid renders correctly with cards having equal height 1`] = `
class="col"
>
<article
class="mb-3 h-100 card"
class="mb-3 card h-100"
>
<div
class="card-header"
Expand Down Expand Up @@ -632,7 +632,7 @@ exports[`OE - Card grid renders correctly with cards having equal height 1`] = `
class="col"
>
<article
class="mb-3 h-100 card"
class="mb-3 card h-100"
>
<div
class="card-header"
Expand Down Expand Up @@ -678,7 +678,7 @@ exports[`OE - Card grid renders correctly with cards having equal height 1`] = `
class="col"
>
<article
class="mb-3 h-100 card"
class="mb-3 card h-100"
>
<div
class="card-header"
Expand Down Expand Up @@ -730,7 +730,7 @@ exports[`OE - Card grid renders correctly with cards having equal height 1`] = `
class="col"
>
<article
class="mb-3 h-100 card"
class="mb-3 card h-100"
>
<div
class="card-header"
Expand Down Expand Up @@ -777,7 +777,7 @@ exports[`OE - Card grid renders correctly with cards having equal height 1`] = `
class="col"
>
<article
class="mb-3 h-100 card"
class="mb-3 card h-100"
>
<div
class="card-header"
Expand Down Expand Up @@ -819,7 +819,7 @@ exports[`OE - Card grid renders correctly with cards having equal height 1`] = `
class="col"
>
<article
class="mb-3 h-100 card"
class="mb-3 card h-100"
>
<div
class="card-header"
Expand Down
3 changes: 0 additions & 3 deletions src/components/bcl-card-layout/card-layout.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
{% apply spaceless %}

{# Parameters:
- type (string) (default: 'group')
options: ['group', 'grid', 'masonry']
Expand Down Expand Up @@ -84,4 +82,3 @@
{% endif %}
</div>

{% endapply %}
3 changes: 0 additions & 3 deletions src/components/bcl-card/card.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
{% apply spaceless %}

{# Parameters:
- title: (string) (default: '')
- title_tag: (string) (default: 'h1')
Expand Down Expand Up @@ -272,4 +270,3 @@
{% endif %}
</article>

{% endapply %}
3 changes: 0 additions & 3 deletions src/components/bcl-carousel/carousel.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
{% apply spaceless %}

{# Parameters:
- title (string) (default: '')
- title_tag (string) (default: 'h2')
Expand Down Expand Up @@ -177,4 +175,3 @@
{% endif %}
</div>

{% endapply %}
3 changes: 0 additions & 3 deletions src/components/bcl-dropdown/dropdown.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
{% apply spaceless %}

{# Parameters:
- id (string) (default: dropdown-random(10000))
- trigger (link or button)
Expand Down Expand Up @@ -132,4 +130,3 @@
</div>
{% endif %}

{% endapply %}
3 changes: 0 additions & 3 deletions src/components/bcl-form-input/form-input.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
{% apply spaceless %}

{#
Parameters:
- id (string) (default: '')
Expand Down Expand Up @@ -180,4 +178,3 @@
</div>
{% endif %}

{% endapply %}
3 changes: 0 additions & 3 deletions src/components/bcl-form/form.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
{% apply spaceless %}

{# Parameters:
- title: (string) (default: '')
- title_tag: (string) (default: 'h2')
Expand Down Expand Up @@ -147,4 +145,3 @@
{% endif %}
</form>

{% endapply %}
3 changes: 0 additions & 3 deletions src/components/bcl-heading/heading.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
{% apply spaceless %}

{# Parameters:
- title (string) (default: '')
- title_tag (string) (default: 'h2')
Expand Down Expand Up @@ -37,4 +35,3 @@
</{{ _title_tag }}>
{% endif -%}

{% endapply %}
3 changes: 0 additions & 3 deletions src/components/bcl-icon/icon.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
{% apply spaceless %}

{# Parameters:
- name (string) (default: '')
- path (string) (default: '')
Expand Down Expand Up @@ -33,4 +31,3 @@
<use xlink:href="{{ _path ~ "#" ~ _name }}"/>
</svg>

{% endapply %}
3 changes: 0 additions & 3 deletions src/components/bcl-link/link.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
{% apply spaceless %}

{# Parameters:
- label (string) (default: '')
- path (string) (default: '#')
Expand Down Expand Up @@ -86,4 +84,3 @@
{%- endif -%}
</a>

{% endapply %}
3 changes: 0 additions & 3 deletions src/components/bcl-list-group/list-group.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
{% apply spaceless %}

{# Parameters:
- flush (boolean) (default: false)
- horizontal (string) (default: '')
Expand Down Expand Up @@ -117,4 +115,3 @@
</div>
{% endif %}

{% endapply %}
3 changes: 0 additions & 3 deletions src/components/bcl-modal/modal.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
{% apply spaceless %}

{# Parameters:
- size (string) default('')
options: sm, lg, xl, fullscreen
Expand Down Expand Up @@ -92,4 +90,3 @@
</div>
</div>

{% endapply %}
3 changes: 0 additions & 3 deletions src/components/bcl-navbar/navbar.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
{% apply spaceless %}

{# Parameters:
- collapse_id (string) (default: '')
- background (string) (default: '')
Expand Down Expand Up @@ -106,4 +104,3 @@
</div>
</nav>

{% endapply %}
7 changes: 1 addition & 6 deletions src/components/bcl-navigation/navigation.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
{% import _self as navigation %}
{% apply spaceless %}

{# Parameters:
- id (string) (default: '')
- pills (boolean) (default: false)
Expand All @@ -27,8 +25,7 @@

{# Define main macro #}
{% macro render(items, pills, tabs, tabs_content, vertical, full_width, alignment, id, nav, navbar, attributes) %}
{% apply spaceless %}
{% import _self as navigation %}
{% import _self as navigation %}
Copy link
Collaborator

@AaronGilMartinez AaronGilMartinez Nov 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think identation is wrong.


{% set _id = id|default('') %}
{% set _pills = pills ?? false %}
Expand Down Expand Up @@ -181,9 +178,7 @@
{%- endblock -%}
</div>
{% endif %}
{% endapply %}
{% endmacro %}

{{ navigation.render(items, pills, tabs, tabs_content, vertical, full_width, alignment, id, nav, navbar, attributes) }}

{% endapply %}
3 changes: 0 additions & 3 deletions src/components/bcl-offcanvas/offcanvas.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
{% apply spaceless %}

{# Parameters:
- title: (string) (default: '')
- title_tag: (string) (default: 'h2')
Expand Down Expand Up @@ -119,4 +117,3 @@
{%- endif -%}
</div>

{% endapply %}
3 changes: 0 additions & 3 deletions src/components/bcl-pagination-v2/pagination-item.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
{% apply spaceless %}

{# Parameters:
- path (string) (default: '')
- label (string) (default: '')
Expand Down Expand Up @@ -87,4 +85,3 @@
</div>
{% endif %}

{% endapply %}
3 changes: 0 additions & 3 deletions src/components/bcl-pagination-v2/pagination.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
{% apply spaceless %}

{# Parameters:
- size (string) (default: '')
- options ['sm', 'lg']
Expand Down Expand Up @@ -210,4 +208,3 @@
</ul>
</nav>

{% endapply %}
3 changes: 0 additions & 3 deletions src/components/bcl-pagination/pagination-item.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
{% apply spaceless %}

{# Parameters:
- path (string) (default: '')
- label (string) (default: '')
Expand Down Expand Up @@ -70,4 +68,3 @@
<div {{ attributes }}>{{- _label -}}</div>
{% endif %}

{% endapply %}
3 changes: 0 additions & 3 deletions src/components/bcl-pagination/pagination.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
{% apply spaceless %}

{# Parameters:
- size (string) (default: '')
- options ['sm', 'lg']
Expand Down Expand Up @@ -158,4 +156,3 @@
</ul>
</nav>

{% endapply %}
3 changes: 0 additions & 3 deletions src/components/bcl-placeholder/placeholder.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
{% apply spaceless %}

{# Parameters:
- width (int) (default: 0) - between 0-100
- variant (string) (default: '')
Expand Down Expand Up @@ -42,4 +40,3 @@
</p>
{% endif %}

{% endapply %}
3 changes: 0 additions & 3 deletions src/components/bcl-progress/progress.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
{% apply spaceless %}

{# Parameters:
- progress (int) (default: 0)
- min (int) (default: 0)
Expand Down Expand Up @@ -70,4 +68,3 @@
<small class="form-text text-muted progress-bar-message">{{ _message }}</small>
{% endif %}

{% endapply %}
3 changes: 0 additions & 3 deletions src/components/bcl-select/select.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
{% apply spaceless %}

{#
Parameters:
- id (string) (default: '')
Expand Down Expand Up @@ -181,4 +179,3 @@
</div>
{% endif %}

{% endapply %}
3 changes: 0 additions & 3 deletions src/components/bcl-spinner/spinner.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
{% apply spaceless %}

{# Parameters:
- type (string) (default: 'border')
- options ['border', 'grow']
Expand Down Expand Up @@ -37,4 +35,3 @@
{% endif %}
</div>

{% endapply %}
3 changes: 0 additions & 3 deletions src/components/bcl-table/table.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
{% apply spaceless %}

{# Parameters:
- striped (boolean) (default: false)
- hoverable (boolean) (default: false)
Expand Down Expand Up @@ -192,4 +190,3 @@
</div>
{% endif %}

{% endapply %}
Loading
Loading