Skip to content
This repository has been archived by the owner on Jul 1, 2022. It is now read-only.

[YGO-194] Fix menu attributes issue. #2124

Merged
merged 2 commits into from
Aug 31, 2020
Merged

[YGO-194] Fix menu attributes issue. #2124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c635906
[YGO-194] Fix menu attributes issue.
manachynskyi Aug 28, 2020
9787cb7
[YGO-194] Add mobile user menu attributes to render.
manachynskyi Aug 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 1 addition & 12 deletions themes/openy_themes/openy_carnation/templates/menu/menu--account--secondary-menu.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,22 +37,11 @@
{%
set classes = [
item.in_active_trail ? 'is-active',
item.below ? 'dropdown',
'h-100 d-flex align-items-center'
]
%}
<li{{ item.attributes.addClass(classes) }}>
{% if item.below %}
<a data-toggle="dropdown" href="{{ item.url }}" class="nav-link px-4">
{{ item.title }}
<i class="fa fa-angle-up" aria-hidden="true"></i>
<i class="fa fa-angle-down" aria-hidden="true"></i>
</a>
{% else %}
<a href="{{ item.url }}" class="nav-link px-4">
{{ item.title }}
</a>
{% endif %}
{{ link(item.title, item.url, item.attributes.addClass(['nav-link', 'px-4'])) }}
</li>
{% endfor %}
</ul>
Expand Down
14 changes: 7 additions & 7 deletions themes/openy_themes/openy_carnation/templates/menu/menu--main--primary-menu.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,15 @@
{% set ia = ia.addClass('nav-item nav-level-2') %}
<li{{ item.attributes.addClass('menu-item-' ~ item.title|clean_class) }}>
{% if item.below %}
<a data-toggle="dropdown" href="{{ item.url }}" class="nav-link text-uppercase" aria-expanded="false">
{% set item_title %}
{{ item.title }}
<i class="fa fa-angle-up" aria-hidden="true"></i>
<i class="fa fa-angle-down" aria-hidden="true"></i>
</a>
{% endset %}
{{ link(item_title, item.url, {'aria-expanded': 'false', 'data-toggle': 'dropdown', 'class' : ['nav-link', 'text-uppercase']}) }}
{{ menus.menu_links_level_2(item.below, attributes, menu_level + 1) }}
{% else %}
<a href="{{ item.url }}" class="nav-link text-uppercase">
{{ item.title }}
</a>
{{ link(item.title, item.url, {'class' : ['nav-link', 'text-uppercase']}) }}
{% endif %}
</li>
{% endfor %}
Expand All @@ -70,10 +69,11 @@
{% set ia = item.attributes.addClass(['nav-level-3 col-md-3 col-lg-2 menu-item-' ~ item.title|clean_class]) %}
<li{{ ia }}>
{% if item.below %}
<a href="{{ item.url }}" class="d-flex">
{% set item_title %}
<i class="fa fa-angle-right pr-2" aria-hidden="true"></i>
{{ item.title }}
</a>
{% endset %}
{{ link(item_title, item.url, {'class' : 'd-flex'}) }}
{{ menus.menu_links_level_3(item.below, item, attributes, menu_level) }}
{% else %}
{{ link(item.title, item.url) }}
Expand Down
17 changes: 7 additions & 10 deletions themes/openy_themes/openy_carnation/templates/menu/mobile/menu--main--mobile-menu.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,15 @@
{% set ia = ia.addClass('nav-item nav-level-2') %}
<li{{ item.attributes.addClass('menu-item-' ~ item.title|clean_class) }}>
{% if item.below %}
<a data-toggle="dropdown" href="{{ item.url }}" class="nav-link dropdown-toggle text-uppercase">
{% set item_title %}
{{ item.title }}
<i class="fa fa-caret-up" aria-hidden="true"></i>
<i class="fa fa-caret-down" aria-hidden="true"></i>
</a>
<i class="fa fa-angle-up" aria-hidden="true"></i>
<i class="fa fa-angle-down" aria-hidden="true"></i>
{% endset %}
{{ link(item_title, item.url, {'aria-expanded': 'false', 'data-toggle': 'dropdown', 'class' : ['nav-link', 'text-uppercase', 'dropdown-toggle']}) }}
{{ menus.menu_links_level_2(item.below, attributes, menu_level + 1) }}
{% else %}
<a href="{{ item.url }}" class="nav-link text-uppercase">
{{ item.title }}
</a>
{{ link(item.title, item.url, {'class' : ['nav-link', 'text-uppercase']}) }}
{% endif %}
</li>
{% endfor %}
Expand All @@ -61,9 +60,7 @@
{% for item in items %}
{% set ia = item.attributes.addClass(['nav-item nav-level-3 menu-item-' ~ item.title|clean_class]) %}
<li{{ ia }}>
<a href="{{ item.url }}" class="nav-link">
{{ item.title }}
</a>
{{ link(item.title, item.url, {'class' : 'nav-link'}) }}
</li>
{% endfor %}
</ul>
Expand Down