Merge remote-tracking branch 'template/master' into development_template

templates/partials/footer.html

@@ -3,6 +3,7 @@
   Read the documentation to get started: https://tailwindui.com/documentation
 -->
 
+<<<<<<< HEAD
 {%- set section = get_section(path="footer/_index.md") %}
 {%- set logoPath = section.extra.logoPath %}
 
@@ -30,4 +31,22 @@
         </footer>
         </body>
         </html>
-        
+        
+=======
+{%- set section = get_section(path="_index.md") %}
+
+{% set subsections_str = section.subsections | join(sep=" ") %}
+
+<footer class="bottom-0 mx-20">
+    {% if "footer/_index.md" in subsections_str %}
+        {%- set section = get_section(path="footer/_index.md") %}
+        {{ section.content | safe }}
+    {% else %}
+        {% set footer_class = config.extra.footer_class | default(value='') %}
+        <div class="{{ footer_class ~ ' -mx-20 pt-20'}}">
+            <img src="{{get_url(path='images/footer_logo.png')}}" alt="">
+            ALL RIGHTS RESERVED 2022
+        </div>
+    {% endif %}
+</footer>
+>>>>>>> template/master