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/shortcodes/space.html
+++ b/templates/shortcodes/space.html
@@ -1 +1,12 @@
-<div class="h-20 lg:h-52"></div>
+<<<<<<< HEAD
+<div class="h-20 lg:h-52"></div>
+=======
+
+{% set height = 52 %}
+{% if size %}
+    {% if size == "small" %}
+        {% set height = 28 %}
+    {% endif %}
+{% endif %}
+<div class="h-20 lg:h-{{height}}"></div>
+>>>>>>> template/master