Przeglądaj źródła

fix the logic for isContainerFluid

Yuki Takei 3 lat temu
rodzic
commit
7143eb889a
1 zmienionych plików z 9 dodań i 1 usunięć
  1. 9 1
      packages/app/src/server/views/layout/layout.html

+ 9 - 1
packages/app/src/server/views/layout/layout.html

@@ -61,9 +61,17 @@
 {% block html_body %}
 {% set additionalBodyClasses = []; %}
 {% block html_additional_body_classes %}{% endblock %}
-{% if getConfig('crowi', 'customize:isContainerFluid') || page.isContainerFluid %}
+
+{% if page.isContainerFluid !== undefined %}
+  {% set isContainerFluid = page.isContainerFluid; %}
+{% else %}
+  {% set isContainerFluid = getConfig('crowi', 'customize:isContainerFluid'); %}
+{% endif %}
+
+{% if isContainerFluid  %}
   {% set additionalBodyClasses = additionalBodyClasses|push('growi-layout-fluid') %}
 {% endif %}
+
 <body
   class="{% block html_base_css %}{% endblock %} growi {{ additionalBodyClasses|join(' ') }}"
   data-plugin-enabled="{{ getConfig('crowi', 'plugin:isEnabledPlugins') }}"