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

2022-08-11 14:57:03 +03:00
parent 4c44ce35cc 9533a4cba4
commit 368fb13a06
15 changed files with 655 additions and 9 deletions
--- a/templates/_default/base.html
+++ b/templates/_default/base.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html lang="en" charset="utf-8">
+<<<<<<< HEAD
  {% include "partials/head.html" %}

  <body>
@@ -9,4 +10,16 @@
    </div>

  </body>
+=======
+
+    {% include "partials/head.html" %}
+    
+    <body>
+        {% include "partials/header.html" %}
+        <div id="content" class="mx-8 md:mx-12 lg:mx-16 xl:mx-20 pt-24">
+            {% block content %}{% endblock %}    
+        </div>
+        {% include "partials/footer.html" %}
+    </body>
+>>>>>>> template/master
 </html>