From a213443fdf51d7cc62f9bfa3298ced16dbfabdbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksandra=20Bo=C5=BCek?= <aleksandra.m.bozek@gmail.com>
Date: Wed, 19 Feb 2025 08:13:27 +0100
Subject: [PATCH] IBX-8306: Fixed placement of bookmark and trash icon in menu
 navbar (#1437)

---
 src/bundle/Resources/views/themes/admin/ui/menu/main.html.twig  | 1 +
 .../Resources/views/themes/admin/ui/menu/main_base.html.twig    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/bundle/Resources/views/themes/admin/ui/menu/main.html.twig b/src/bundle/Resources/views/themes/admin/ui/menu/main.html.twig
index 0da76f5256..b82985d96b 100644
--- a/src/bundle/Resources/views/themes/admin/ui/menu/main.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/menu/main.html.twig
@@ -3,6 +3,7 @@
 {% block root %}
     {% set extraClass = 'ibexa-main-menu__navbar--collapsed' %}
     {% set current_item = item %}
+    {% set first_bottom_item = current_item.children|find(item => item.extras.bottom_item is defined and item.extras.bottom_item) %}
 
     <div class="ibexa-main-menu__navbar ibexa-main-menu__navbar--first-level {{ extraClass }}">
         <ul class="ibexa-adaptive-items ibexa-main-menu__items-list nav">
diff --git a/src/bundle/Resources/views/themes/admin/ui/menu/main_base.html.twig b/src/bundle/Resources/views/themes/admin/ui/menu/main_base.html.twig
index 98e58c426f..59600c7364 100644
--- a/src/bundle/Resources/views/themes/admin/ui/menu/main_base.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/menu/main_base.html.twig
@@ -78,7 +78,7 @@
 
         {% import 'knp_menu.html.twig' as knp_menu %}
 
-        {%- if item.extras.separate is defined and item.extras.separate -%}
+        {%- if ((item.extras.separate is defined and item.extras.separate) or (first_bottom_item is defined and first_bottom_item.name == item.name)) -%}
             <li class="ibexa-main-menu__item ibexa-adaptive-items__item ibexa-adaptive-items__item--selector ibexa-main-menu__item--more ibexa-context-menu__item--hidden">
                 <button class="ibexa-main-menu__item-action">
                     <div class="ibexa-main-menu__item-icon-column">