From ec44e4920a8da4fc10ac8a7e8674f5a372de38aa Mon Sep 17 00:00:00 2001 From: tischsoic Date: Fri, 8 Dec 2023 09:45:04 +0100 Subject: [PATCH 1/5] IBX-7302: No left sidebar when no anchor menu items --- .../Resources/public/scss/_main-container.scss | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/bundle/Resources/public/scss/_main-container.scss b/src/bundle/Resources/public/scss/_main-container.scss index 8082a75308..d33cc90f29 100644 --- 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,15 @@ } } + &--without-anchor-menu-items { + .ibexa-main-container { + &__side-column { + min-width: 0; + width: 0; + } + } + } + &--no-border { padding: 0; From a03ef0ab3f19515ecd68588b09d26e69839848b6 Mon Sep 17 00:00:00 2001 From: tischsoic Date: Mon, 11 Dec 2023 09:42:28 +0100 Subject: [PATCH 2/5] show sidebar when close btn is present --- .../Resources/public/scss/_anchor-navigation.scss | 1 + src/bundle/Resources/public/scss/_main-container.scss | 11 ++++++++++- .../views/themes/admin/ui/edit_base.html.twig | 5 ++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/bundle/Resources/public/scss/_anchor-navigation.scss b/src/bundle/Resources/public/scss/_anchor-navigation.scss index 43f7f68d29..bc955f97c1 100644 --- 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 index d33cc90f29..4abba208f3 100644 --- a/src/bundle/Resources/public/scss/_main-container.scss +++ b/src/bundle/Resources/public/scss/_main-container.scss @@ -70,7 +70,16 @@ .ibexa-main-container { &__side-column { min-width: 0; - width: 0; + } + } + + &.ibexa-main-container { + &--without-anchor-close-btn { + .ibexa-main-container { + &__side-column { + width: 0; + } + } } } } 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 index 95a32b8ccb..0293ce1d9b 100644 --- a/src/bundle/Resources/views/themes/admin/ui/edit_base.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/edit_base.html.twig @@ -4,7 +4,10 @@ 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_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 %} From 55b73b6db11984eda96c8c32d8eb3f55fca27dd9 Mon Sep 17 00:00:00 2001 From: tischsoic Date: Wed, 20 Dec 2023 08:36:55 +0100 Subject: [PATCH 3/5] fixes --- .../admin/content_type/content_type_group/base.html.twig | 6 +++++- .../Resources/views/themes/admin/language/base.html.twig | 6 +++++- .../Resources/views/themes/admin/ui/edit_base.html.twig | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) 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 index 6d81a40315..e2f83313b9 100644 --- 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 index 78c23b556f..1943a5102f 100644 --- 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 index 0293ce1d9b..bfa8bea25c 100644 --- 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,7 +3,7 @@ {% block main_container_class %} ibexa-main-container--edit-container - {%- set has_anchor_menu_items = anchor_params.items|default([])|length > 1 -%} + {%- set has_anchor_menu_items = anchor_params.items|default([])|length > 1 or ignored_content_fields|default([])|length > 1 -%} {%- 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 ' -}} From 81527a9460ec9f961abe7e7a96c2eb2150447386 Mon Sep 17 00:00:00 2001 From: tischsoic Date: Wed, 3 Jan 2024 11:17:59 +0100 Subject: [PATCH 4/5] fix condition --- src/bundle/Resources/views/themes/admin/ui/edit_base.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index bfa8bea25c..522ffdfe5f 100644 --- 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,7 +3,7 @@ {% block main_container_class %} ibexa-main-container--edit-container - {%- set has_anchor_menu_items = anchor_params.items|default([])|length > 1 or ignored_content_fields|default([])|length > 1 -%} + {%- set has_anchor_menu_items = anchor_params.items|default([])|length > 1 or ignored_content_fields|default([])|length != 0 -%} {%- 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 ' -}} From 26e046dfdc377e45b4abc52a79d55f03929ab2ef Mon Sep 17 00:00:00 2001 From: tischsoic Date: Wed, 3 Jan 2024 11:23:56 +0100 Subject: [PATCH 5/5] change ignored condition --- src/bundle/Resources/views/themes/admin/ui/edit_base.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 522ffdfe5f..c944b506d6 100644 --- 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,7 +3,7 @@ {% block main_container_class %} ibexa-main-container--edit-container - {%- set has_anchor_menu_items = anchor_params.items|default([])|length > 1 or ignored_content_fields|default([])|length != 0 -%} + {%- 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 ' -}}