IBX-7302: No left sidebar when no anchor menu items (#1037)

ibexa · Jan 3, 2024 · 440078b · 440078b
1 parent 5e15083
commit 440078b
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 6 deletions.
diff --git a/src/bundle/Resources/public/scss/_anchor-navigation.scss b/src/bundle/Resources/public/scss/_anchor-navigation.scss
@@ -62,6 +62,7 @@
 
     &__close {
         font-weight: 600;
+        margin-right: calculateRem(20px);
     }
 
     &__section-groups {

diff --git a/src/bundle/Resources/public/scss/_main-container.scss b/src/bundle/Resources/public/scss/_main-container.scss
@@ -44,12 +44,13 @@
                 min-width: calculateRem(240px);
                 border-top-left-radius: $ibexa-border-radius;
                 border-bottom-left-radius: $ibexa-border-radius;
+                margin-right: -$ibexa-border-radius;
+                padding-right: $ibexa-border-radius;
                 background-color: $ibexa-color-light-100;
             }
 
             &__content-column {
-                border-top-right-radius: $ibexa-border-radius;
-                border-bottom-right-radius: $ibexa-border-radius;
+                border-radius: $ibexa-border-radius;
                 background-color: $ibexa-color-light-100;
             }
         }
@@ -65,6 +66,24 @@
                 }
             }
 
+            &--without-anchor-menu-items {
+                .ibexa-main-container {
+                    &__side-column {
+                        min-width: 0;
+                    }
+                }
+
+                &.ibexa-main-container {
+                    &--without-anchor-close-btn {
+                        .ibexa-main-container {
+                            &__side-column {
+                                width: 0;
+                            }
+                        }
+                    }
+                }
+            }
+
             &--no-border {
                 padding: 0;
 

diff --git a/src/bundle/Resources/views/themes/admin/content_type/content_type_group/base.html.twig b/src/bundle/Resources/views/themes/admin/content_type/content_type_group/base.html.twig
@@ -2,7 +2,11 @@
 
 {% trans_default_domain 'ibexa_content_type' %}
 
-{% block main_container_class %}ibexa-main-container--edit-container ibexa-main-container--without-anchor-menu-items{% endblock %}
+{% block main_container_class %}
+    ibexa-main-container--edit-container
+    ibexa-main-container--without-anchor-menu-items
+    ibexa-main-container--without-anchor-close-btn
+{% endblock %}
 
 {% block header %}
     {% block header_admin %}{% endblock %}

diff --git a/src/bundle/Resources/views/themes/admin/language/base.html.twig b/src/bundle/Resources/views/themes/admin/language/base.html.twig
@@ -2,7 +2,11 @@
 
 {% trans_default_domain 'ibexa_language' %}
 
-{% block main_container_class %}ibexa-main-container--edit-container ibexa-main-container--without-anchor-menu-items{% endblock %}
+{% block main_container_class %}
+    ibexa-main-container--edit-container
+    ibexa-main-container--without-anchor-menu-items
+    ibexa-main-container--without-anchor-close-btn
+{% endblock %}
 
 {% block header %}
     {% block header_admin %}{% endblock %}

diff --git a/src/bundle/Resources/views/themes/admin/ui/edit_base.html.twig b/src/bundle/Resources/views/themes/admin/ui/edit_base.html.twig
@@ -3,8 +3,11 @@
 {% block main_container_class %}
     ibexa-main-container--edit-container
 
-    {%- set has_anchor_menu_items = anchor_params.items|default([])|length > 1 -%}
-    {{ has_anchor_menu_items ? ' ibexa-main-container--with-anchor-menu-items' : ' ibexa-main-container--without-anchor-menu-items' }}
+    {%- set has_anchor_menu_items = anchor_params.items|default([])|length > 1 or ignored_content_fields|default([]) is not empty -%}
+    {%- set has_anchor_close_btn = anchor_params.close_href|default(null) is not empty -%}
+
+    {{- has_anchor_menu_items ? ' ibexa-main-container--with-anchor-menu-items ' : ' ibexa-main-container--without-anchor-menu-items ' -}}
+    {{- not has_anchor_close_btn ? ' ibexa-main-container--without-anchor-close-btn ' -}}
 {% endblock %}
 
 {% block header_row %}{% endblock %}