fixes to top border when no switcher

ibexa · Oct 25, 2023 · 21622a9 · 21622a9
1 parent 1ba6723
commit 21622a9
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/src/bundle/Resources/public/js/scripts/admin.anchor.navigation.js b/src/bundle/Resources/public/js/scripts/admin.anchor.navigation.js
@@ -134,8 +134,8 @@
                 const prevMainContentTab = doc.querySelector(`[data-id="${prevHashId}"]`);
                 const currMainContentTab = doc.querySelector(`[data-id="${currHashId}"]`);
 
-                prevMainContentTab.classList.toggle('ibexa-anchor-navigation__section-group--active', false);
-                currMainContentTab.classList.toggle('ibexa-anchor-navigation__section-group--active', true);
+                prevMainContentTab?.classList.toggle('ibexa-anchor-navigation__section-group--active', false);
+                currMainContentTab?.classList.toggle('ibexa-anchor-navigation__section-group--active', true);
 
                 initFitSection();
             });

diff --git a/src/bundle/Resources/public/scss/_anchor-navigation.scss b/src/bundle/Resources/public/scss/_anchor-navigation.scss
@@ -82,6 +82,12 @@
         &--active {
             display: block;
         }
+
+        &--no-border {
+            border: 0;
+            margin-top: 0;
+            padding-top: 0;
+        }
     }
 
     &__sections-item-btn {

diff --git a/src/bundle/Resources/views/themes/admin/ui/anchor_navigation_menu.html.twig b/src/bundle/Resources/views/themes/admin/ui/anchor_navigation_menu.html.twig
@@ -18,7 +18,7 @@
     <div class="ibexa-anchor-navigation-menu__body">
         {% block navigation_menu_body %}
             {% if items|default([])|length > 1 %}
-                <ul class="ibexa-anchor-navigation-menu__sections ibexa-anchor-navigation-menu__sections--active">
+                <ul class="ibexa-anchor-navigation-menu__sections ibexa-anchor-navigation-menu__sections--active ibexa-anchor-navigation-menu__sections--no-border">
                     {% for item in items %}
                         {% set item_label = item is iterable ? item.label : item %}
                         {% set sanitized_item = item is iterable and item.target_id is defined ? item.target_id : item_label|slug %}

diff --git a/src/bundle/Resources/views/themes/admin/ui/menu/anchor_menu.html.twig b/src/bundle/Resources/views/themes/admin/ui/menu/anchor_menu.html.twig
@@ -168,7 +168,9 @@
             {% for secondMenuItem in item.children %}
                 {% if secondMenuItem.children|length > 1 %}
                     {% set listAttributes = {
-                        'class': 'tab-pane ibexa-anchor-navigation-menu__sections' ~ (loop.first ? ' ibexa-anchor-navigation-menu__sections--active active' : ''),
+                        'class': 'tab-pane ibexa-anchor-navigation-menu__sections'
+                            ~ (loop.first ? ' ibexa-anchor-navigation-menu__sections--active active' : '')
+                            ~ (item.count() == 1 ? ' ibexa-anchor-navigation-menu__sections--no-border' : ''),
                         'id': secondMenuItem.getAttribute('data-target-id'),
                         'role': 'tabpanel'
                     } %}
@@ -178,7 +180,9 @@
                     {% set tagElement = 'div' %}
                     {% set extraElements %}{% endset %}
 
-                    {{ block('anchor_menu_list') -}}
+                    {% with { item: secondMenuItem } %}
+                        {{ block('anchor_menu_list') -}}
+                    {% endwith %}
                 {% endif %}
             {% endfor %}
         </div>