Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 5 commits into from
Jan 3, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ec44e49
IBX-7302: No left sidebar when no anchor menu items
tischsoic Dec 8, 2023
a03ef0a
show sidebar when close btn is present
tischsoic Dec 11, 2023
55b73b6
fixes
tischsoic Dec 20, 2023
81527a9
fix condition
tischsoic Jan 3, 2024
26e046d
change ignored condition
tischsoic Jan 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/bundle/Resources/public/scss/_anchor-navigation.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@

&__close {
font-weight: 600;
margin-right: calculateRem(20px);
}

&__section-groups {
Expand Down
23 changes: 21 additions & 2 deletions src/bundle/Resources/public/scss/_main-container.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Gengar-i marked this conversation as resolved.
Show resolved Hide resolved
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;
}
}
Expand All @@ -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;

Expand Down
6 changes: 5 additions & 1 deletion src/bundle/Resources/views/themes/admin/content_type/content_type_group/base.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
6 changes: 5 additions & 1 deletion src/bundle/Resources/views/themes/admin/language/base.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
7 changes: 5 additions & 2 deletions src/bundle/Resources/views/themes/admin/ui/edit_base.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
Loading