diff --git a/content/creator-zones/_index.md b/content/creator-zones/index.md similarity index 93% rename from content/creator-zones/_index.md rename to content/creator-zones/index.md index 24812ac..9633430 100644 --- a/content/creator-zones/_index.md +++ b/content/creator-zones/index.md @@ -10,6 +10,8 @@ extra: +{{ space() }} + {% row(style="center lean-right") %} ### GROWTH BEGINS @@ -24,7 +26,7 @@ Creator Zones are set up to allow aspiring entrepreneurs, business people and di ||| -![Image](./images/creator.png) +![Image](images/creator.png) {% end %} @@ -32,7 +34,7 @@ Creator Zones are set up to allow aspiring entrepreneurs, business people and di {% row(style="center lean-left" bgColor="#c4ffeb") %} -![Image](./images/nature.png) +![Image](images/nature.png) ||| @@ -52,7 +54,7 @@ to become the standard of every Creator Zone. {% row(style="center lean-left" bgColor="#e9fcff") %} -![Image](./images/ow_lp1.png) +![Image](images/ow_lp1.png) ||| @@ -75,7 +77,7 @@ We have created an environment where collaboration and team work lead to the dev
-![Image](./images/regenerative.png) +![Image](images/regenerative.png)
@@ -105,7 +107,7 @@ All Creator Zone experiences and technologies are built on top of the world’s ||| -![Image](./images/p2p.png) +![Image](images/p2p.png) {% end %} diff --git a/content/creator-zones/ow_lp.png b/content/creator-zones/ow_lp.png deleted file mode 100644 index 074f505..0000000 Binary files a/content/creator-zones/ow_lp.png and /dev/null differ diff --git a/content/experiences/OW_Kutana.jpg b/content/experiences/OW_Kutana.jpg deleted file mode 100644 index a02062d..0000000 Binary files a/content/experiences/OW_Kutana.jpg and /dev/null differ diff --git a/content/experiences/OW_Logo.png b/content/experiences/OW_Logo.png deleted file mode 100644 index d8fb9ad..0000000 Binary files a/content/experiences/OW_Logo.png and /dev/null differ diff --git a/content/experiences/OurVerse-logo.png b/content/experiences/OurVerse-logo.png deleted file mode 100644 index c680637..0000000 Binary files a/content/experiences/OurVerse-logo.png and /dev/null differ diff --git a/content/creator-zones/OW_Defi.jpg b/content/experiences/img/OW_Defi.jpg similarity index 100% rename from content/creator-zones/OW_Defi.jpg rename to content/experiences/img/OW_Defi.jpg diff --git a/content/creator-zones/OW_Kutana.jpg b/content/experiences/img/OW_Kutana.jpg similarity index 100% rename from content/creator-zones/OW_Kutana.jpg rename to content/experiences/img/OW_Kutana.jpg diff --git a/content/creator-zones/OW_Logo.png b/content/experiences/img/OW_Logo.png similarity index 100% rename from content/creator-zones/OW_Logo.png rename to content/experiences/img/OW_Logo.png diff --git a/content/experiences/OW_sikana.jpeg b/content/experiences/img/OW_sikana.jpeg similarity index 100% rename from content/experiences/OW_sikana.jpeg rename to content/experiences/img/OW_sikana.jpeg diff --git a/content/creator-zones/OurVerse-logo.png b/content/experiences/img/OurVerse-logo.png similarity index 100% rename from content/creator-zones/OurVerse-logo.png rename to content/experiences/img/OurVerse-logo.png diff --git a/content/platform/images/ow_lp1.png b/content/experiences/img/ow_lp1.png similarity index 100% rename from content/platform/images/ow_lp1.png rename to content/experiences/img/ow_lp1.png diff --git a/content/creator-zones/ow_lp_logo.png b/content/experiences/img/ow_lp_logo.png similarity index 100% rename from content/creator-zones/ow_lp_logo.png rename to content/experiences/img/ow_lp_logo.png diff --git a/content/experiences/index.md b/content/experiences/index.md index c918bad..2fa962a 100644 Binary files a/content/experiences/index.md and b/content/experiences/index.md differ diff --git a/content/experiences/ow_lp.png b/content/experiences/ow_lp.png deleted file mode 100644 index 074f505..0000000 Binary files a/content/experiences/ow_lp.png and /dev/null differ diff --git a/content/experiences/ow_lp_logo.png b/content/experiences/ow_lp_logo.png deleted file mode 100644 index 0225730..0000000 Binary files a/content/experiences/ow_lp_logo.png and /dev/null differ diff --git a/content/home/index.md b/content/home/index.md index 44c264e..d5609f0 100644 --- a/content/home/index.md +++ b/content/home/index.md @@ -10,6 +10,8 @@ extra: +{{ space() }} + {% row(style="center" margin="narrow") %} ### EXPERIENCE @@ -67,7 +69,7 @@ A better world is one where we all have access to endless information and opport
-OurWorld allows you and your community to prosper together! +OurWorld allows you and your community to prosper together!
Learn whatever your heart desires. Access any opportunity to earn. {% end %} diff --git a/content/platform/OW_Defi.jpg b/content/platform/OW_Defi.jpg deleted file mode 100644 index dae075e..0000000 Binary files a/content/platform/OW_Defi.jpg and /dev/null differ diff --git a/content/platform/OW_Kutana.jpg b/content/platform/OW_Kutana.jpg deleted file mode 100644 index a02062d..0000000 Binary files a/content/platform/OW_Kutana.jpg and /dev/null differ diff --git a/content/platform/OW_Logo.png b/content/platform/OW_Logo.png deleted file mode 100644 index d8fb9ad..0000000 Binary files a/content/platform/OW_Logo.png and /dev/null differ diff --git a/content/platform/OurVerse-logo.png b/content/platform/OurVerse-logo.png deleted file mode 100644 index c680637..0000000 Binary files a/content/platform/OurVerse-logo.png and /dev/null differ diff --git a/content/platform/images/OW_Defi.jpg b/content/platform/images/OW_Defi.jpg deleted file mode 100644 index dae075e..0000000 Binary files a/content/platform/images/OW_Defi.jpg and /dev/null differ diff --git a/content/experiences/OW_Defi.jpg b/content/platform/img/OW_Defi.jpg similarity index 100% rename from content/experiences/OW_Defi.jpg rename to content/platform/img/OW_Defi.jpg diff --git a/content/platform/images/creator.png b/content/platform/img/creator.png similarity index 100% rename from content/platform/images/creator.png rename to content/platform/img/creator.png diff --git a/content/platform/images/ff.png b/content/platform/img/ff.png similarity index 100% rename from content/platform/images/ff.png rename to content/platform/img/ff.png diff --git a/content/platform/images/nature.png b/content/platform/img/nature.png similarity index 100% rename from content/platform/images/nature.png rename to content/platform/img/nature.png diff --git a/static/images/coworking.png b/content/platform/img/ow_lp1.png similarity index 100% rename from static/images/coworking.png rename to content/platform/img/ow_lp1.png diff --git a/content/platform/images/ow_lp11.png b/content/platform/img/ow_lp11.png similarity index 100% rename from content/platform/images/ow_lp11.png rename to content/platform/img/ow_lp11.png diff --git a/content/platform/images/ow_lp12.png b/content/platform/img/ow_lp12.png similarity index 100% rename from content/platform/images/ow_lp12.png rename to content/platform/img/ow_lp12.png diff --git a/content/platform/images/ow_lp14.png b/content/platform/img/ow_lp14.png similarity index 100% rename from content/platform/images/ow_lp14.png rename to content/platform/img/ow_lp14.png diff --git a/content/platform/images/ow_lp40.jpg b/content/platform/img/ow_lp40.jpg similarity index 100% rename from content/platform/images/ow_lp40.jpg rename to content/platform/img/ow_lp40.jpg diff --git a/content/platform/images/ow_lp8.jpg b/content/platform/img/ow_lp8.jpg similarity index 100% rename from content/platform/images/ow_lp8.jpg rename to content/platform/img/ow_lp8.jpg diff --git a/content/platform/images/ow_lp9.png b/content/platform/img/ow_lp9.png similarity index 100% rename from content/platform/images/ow_lp9.png rename to content/platform/img/ow_lp9.png diff --git a/content/platform/images/p2p.png b/content/platform/img/p2p.png similarity index 100% rename from content/platform/images/p2p.png rename to content/platform/img/p2p.png diff --git a/content/platform/images/regenerative.png b/content/platform/img/regenerative.png similarity index 100% rename from content/platform/images/regenerative.png rename to content/platform/img/regenerative.png diff --git a/content/platform/_index.md b/content/platform/index.md similarity index 93% rename from content/platform/_index.md rename to content/platform/index.md index 5a3a89c..123d37f 100644 --- a/content/platform/_index.md +++ b/content/platform/index.md @@ -10,7 +10,7 @@ extra: -![Image](/images/OW_Asset3.jpg) +![Image](img/OW_Asset3.jpg) {% row(style="center narrow") %} @@ -38,7 +38,7 @@ Creator Zones are dedicated to building super-sustainable coworking and co-livin ||| -![Image](./images/p2p.png) +![Image](img/p2p.png) {% end %} @@ -46,7 +46,7 @@ Creator Zones are dedicated to building super-sustainable coworking and co-livin {% row(style="center lean-left") %} -![Image](./images/ow_lp1.png) +![Image](img/ow_lp1.png) ||| @@ -78,7 +78,7 @@ OurWorld consists of a decentralized internet network as the foundation. This ba ||| -![Image](./images/OW_Defi.jpg#large) +![Image](img/OW_Defi.jpg#large) {% end %} @@ -86,7 +86,7 @@ OurWorld consists of a decentralized internet network as the foundation. This ba {% row(style="center lean-left") %} -![Image](./images/ff.png) +![Image](img/ff.png) ||| diff --git a/content/platform/ow_lp.png b/content/platform/ow_lp.png deleted file mode 100644 index 074f505..0000000 Binary files a/content/platform/ow_lp.png and /dev/null differ diff --git a/content/platform/ow_lp_logo.png b/content/platform/ow_lp_logo.png deleted file mode 100644 index 0225730..0000000 Binary files a/content/platform/ow_lp_logo.png and /dev/null differ diff --git a/static/images/OW_Defi.jpg b/static/images/OW_Defi.jpg deleted file mode 100644 index dae075e..0000000 Binary files a/static/images/OW_Defi.jpg and /dev/null differ diff --git a/static/images/OW_Kutana.jpg b/static/images/OW_Kutana.jpg deleted file mode 100644 index a02062d..0000000 Binary files a/static/images/OW_Kutana.jpg and /dev/null differ diff --git a/static/images/OurVerse-logo.png b/static/images/OurVerse-logo.png deleted file mode 100644 index c680637..0000000 Binary files a/static/images/OurVerse-logo.png and /dev/null differ diff --git a/static/images/creator.png b/static/images/creator.png deleted file mode 100644 index 71b6083..0000000 Binary files a/static/images/creator.png and /dev/null differ diff --git a/static/images/nature.png b/static/images/nature.png deleted file mode 100644 index 83be28d..0000000 Binary files a/static/images/nature.png and /dev/null differ diff --git a/static/images/ow_lp.png b/static/images/ow_lp.png deleted file mode 100644 index 074f505..0000000 Binary files a/static/images/ow_lp.png and /dev/null differ diff --git a/static/images/ow_lp1.jpg b/static/images/ow_lp1.jpg deleted file mode 100644 index 5f2879a..0000000 Binary files a/static/images/ow_lp1.jpg and /dev/null differ diff --git a/static/images/ow_lp10.jpg b/static/images/ow_lp10.jpg deleted file mode 100644 index 5e99757..0000000 Binary files a/static/images/ow_lp10.jpg and /dev/null differ diff --git a/static/images/ow_lp11.png b/static/images/ow_lp11.png deleted file mode 100644 index 10790e2..0000000 Binary files a/static/images/ow_lp11.png and /dev/null differ diff --git a/static/images/ow_lp12.png b/static/images/ow_lp12.png deleted file mode 100644 index 451d240..0000000 Binary files a/static/images/ow_lp12.png and /dev/null differ diff --git a/static/images/ow_lp13.png b/static/images/ow_lp13.png deleted file mode 100644 index 6dad809..0000000 Binary files a/static/images/ow_lp13.png and /dev/null differ diff --git a/static/images/ow_lp14.png b/static/images/ow_lp14.png deleted file mode 100644 index 1e817c0..0000000 Binary files a/static/images/ow_lp14.png and /dev/null differ diff --git a/static/images/ow_lp15.jpg b/static/images/ow_lp15.jpg deleted file mode 100644 index 13166ce..0000000 Binary files a/static/images/ow_lp15.jpg and /dev/null differ diff --git a/static/images/ow_lp16.jpg b/static/images/ow_lp16.jpg deleted file mode 100644 index 890df4a..0000000 Binary files a/static/images/ow_lp16.jpg and /dev/null differ diff --git a/static/images/ow_lp17.jpg b/static/images/ow_lp17.jpg deleted file mode 100644 index 8ea4b15..0000000 Binary files a/static/images/ow_lp17.jpg and /dev/null differ diff --git a/static/images/ow_lp18.jpg b/static/images/ow_lp18.jpg deleted file mode 100644 index a115d5c..0000000 Binary files a/static/images/ow_lp18.jpg and /dev/null differ diff --git a/static/images/ow_lp19.jpg b/static/images/ow_lp19.jpg deleted file mode 100644 index 119c0f3..0000000 Binary files a/static/images/ow_lp19.jpg and /dev/null differ diff --git a/static/images/ow_lp2.jpg b/static/images/ow_lp2.jpg deleted file mode 100644 index a210759..0000000 Binary files a/static/images/ow_lp2.jpg and /dev/null differ diff --git a/static/images/ow_lp20.jpg b/static/images/ow_lp20.jpg deleted file mode 100644 index f1524a5..0000000 Binary files a/static/images/ow_lp20.jpg and /dev/null differ diff --git a/static/images/ow_lp21.jpg b/static/images/ow_lp21.jpg deleted file mode 100644 index 9c13c80..0000000 Binary files a/static/images/ow_lp21.jpg and /dev/null differ diff --git a/static/images/ow_lp22.jpg b/static/images/ow_lp22.jpg deleted file mode 100644 index 8686f1e..0000000 Binary files a/static/images/ow_lp22.jpg and /dev/null differ diff --git a/static/images/ow_lp23.jpg b/static/images/ow_lp23.jpg deleted file mode 100644 index e61ecb0..0000000 Binary files a/static/images/ow_lp23.jpg and /dev/null differ diff --git a/static/images/ow_lp24.jpg b/static/images/ow_lp24.jpg deleted file mode 100644 index 4ca222f..0000000 Binary files a/static/images/ow_lp24.jpg and /dev/null differ diff --git a/static/images/ow_lp25.png b/static/images/ow_lp25.png deleted file mode 100644 index 0ad5a83..0000000 Binary files a/static/images/ow_lp25.png and /dev/null differ diff --git a/static/images/ow_lp26.jpg b/static/images/ow_lp26.jpg deleted file mode 100644 index cebd2e9..0000000 Binary files a/static/images/ow_lp26.jpg and /dev/null differ diff --git a/static/images/ow_lp27.jpg b/static/images/ow_lp27.jpg deleted file mode 100644 index 8ea529e..0000000 Binary files a/static/images/ow_lp27.jpg and /dev/null differ diff --git a/static/images/ow_lp28.jpg b/static/images/ow_lp28.jpg deleted file mode 100644 index 2bfb0f1..0000000 Binary files a/static/images/ow_lp28.jpg and /dev/null differ diff --git a/static/images/ow_lp29.jpg b/static/images/ow_lp29.jpg deleted file mode 100644 index f440f03..0000000 Binary files a/static/images/ow_lp29.jpg and /dev/null differ diff --git a/static/images/ow_lp3.jpg b/static/images/ow_lp3.jpg deleted file mode 100644 index 723f04e..0000000 Binary files a/static/images/ow_lp3.jpg and /dev/null differ diff --git a/static/images/ow_lp30.jpg b/static/images/ow_lp30.jpg deleted file mode 100644 index 5c903d1..0000000 Binary files a/static/images/ow_lp30.jpg and /dev/null differ diff --git a/static/images/ow_lp31.jpg b/static/images/ow_lp31.jpg deleted file mode 100644 index 4fb4735..0000000 Binary files a/static/images/ow_lp31.jpg and /dev/null differ diff --git a/static/images/ow_lp32.jpg b/static/images/ow_lp32.jpg deleted file mode 100644 index b2c10a9..0000000 Binary files a/static/images/ow_lp32.jpg and /dev/null differ diff --git a/static/images/ow_lp33.jpg b/static/images/ow_lp33.jpg deleted file mode 100644 index a1d64fb..0000000 Binary files a/static/images/ow_lp33.jpg and /dev/null differ diff --git a/static/images/ow_lp34.jpg b/static/images/ow_lp34.jpg deleted file mode 100644 index 97e4ffa..0000000 Binary files a/static/images/ow_lp34.jpg and /dev/null differ diff --git a/static/images/ow_lp35.jpg b/static/images/ow_lp35.jpg deleted file mode 100644 index 4ea3530..0000000 Binary files a/static/images/ow_lp35.jpg and /dev/null differ diff --git a/static/images/ow_lp4.jpg b/static/images/ow_lp4.jpg deleted file mode 100644 index 5dbb559..0000000 Binary files a/static/images/ow_lp4.jpg and /dev/null differ diff --git a/static/images/ow_lp40.jpg b/static/images/ow_lp40.jpg deleted file mode 100644 index 3f1c034..0000000 Binary files a/static/images/ow_lp40.jpg and /dev/null differ diff --git a/static/images/ow_lp5.jpg b/static/images/ow_lp5.jpg deleted file mode 100644 index 78ba5c8..0000000 Binary files a/static/images/ow_lp5.jpg and /dev/null differ diff --git a/static/images/ow_lp6.jpg b/static/images/ow_lp6.jpg deleted file mode 100644 index d8facf2..0000000 Binary files a/static/images/ow_lp6.jpg and /dev/null differ diff --git a/static/images/ow_lp7.jpg b/static/images/ow_lp7.jpg deleted file mode 100644 index af6b41b..0000000 Binary files a/static/images/ow_lp7.jpg and /dev/null differ diff --git a/static/images/ow_lp8.jpg b/static/images/ow_lp8.jpg deleted file mode 100644 index 99dfa0c..0000000 Binary files a/static/images/ow_lp8.jpg and /dev/null differ diff --git a/static/images/ow_lp9.png b/static/images/ow_lp9.png deleted file mode 100644 index d22175d..0000000 Binary files a/static/images/ow_lp9.png and /dev/null differ diff --git a/static/images/p2p.png b/static/images/p2p.png deleted file mode 100644 index 79a94a8..0000000 Binary files a/static/images/p2p.png and /dev/null differ diff --git a/static/images/regenerative.png b/static/images/regenerative.png deleted file mode 100644 index fa5a23f..0000000 Binary files a/static/images/regenerative.png and /dev/null differ diff --git a/templates/_default/base.html b/templates/_default/base.html index 9816847..cd756af 100644 --- a/templates/_default/base.html +++ b/templates/_default/base.html @@ -1,11 +1,12 @@ + {% include "partials/head.html" %} {% include "partials/header.html" %} -
+
{% block content %}{% endblock %}
{% include "partials/footer.html" %} diff --git a/templates/blogPage.html b/templates/blogPage.html index 9fafb30..d75d78a 100644 --- a/templates/blogPage.html +++ b/templates/blogPage.html @@ -4,7 +4,7 @@
-
+
diff --git a/templates/layouts/blog.html b/templates/layouts/blog.html index 4968811..fe428b8 100644 --- a/templates/layouts/blog.html +++ b/templates/layouts/blog.html @@ -8,7 +8,7 @@ and a side nav for category and featured post navigation {% block content %} -
+
{%- set section = get_section(path="blog/_index.md") %} @@ -17,11 +17,14 @@ and a side nav for category and featured post navigation {%- set_global featured = page %} {% break %} {% endif %} + {% if not featured %} + {%- set_global featured = section.pages[0] %} + {% endif %} {% endfor %} {% include "partials/featuredBlog.html" %} -
+
{% include "partials/blogPosts.html" %} {% include "partials/blogSidebar.html" %}
diff --git a/templates/partials/blogSidebar.html b/templates/partials/blogSidebar.html index 7c910c7..ca5e58c 100644 --- a/templates/partials/blogSidebar.html +++ b/templates/partials/blogSidebar.html @@ -1,6 +1,6 @@
-
+

FILTER POSTS BY

All {% set taxonomy = get_taxonomy(kind="categories") %} diff --git a/templates/partials/featuredBlog.html b/templates/partials/featuredBlog.html index 80d2320..0592ec7 100644 --- a/templates/partials/featuredBlog.html +++ b/templates/partials/featuredBlog.html @@ -1,29 +1,36 @@ - - -
-
-

FEATURED POST

- -

- {{ featured.title }} -

- -

- {{featured.description}} -

- -

- {{ featured.date | date(format="%B %e, %Y", timezone="America/Chicago")}} - - {{ featured.extra.author }} -

- -
+{% if featured.taxonomies.people %} + {% set people = get_section(path="people/_index.md") %} + {% set pages_str = people.pages | json_encode() | as_str %} + {% if pages_str is containing(featured.taxonomies.people[0]) %} + {% set author_path = 'people/' ~ featured.taxonomies.people[0] ~ '/index.md' %} + {% set author = get_page(path=author_path) %} + {% endif %} +{% endif %} + + + +
+
+

FEATURED POST

+ +

+ {{ featured.title }} +

+ +

+ {{ featured.date | date(format="%B %e, %Y", timezone="America/Chicago")}} - +

-
- -
+
+ +
-
- \ No newline at end of file + +
+ +
+
+ \ No newline at end of file diff --git a/templates/partials/footer.html b/templates/partials/footer.html index 4dcf806..a5ef684 100644 --- a/templates/partials/footer.html +++ b/templates/partials/footer.html @@ -13,9 +13,8 @@ {{ section.content | safe }} {% else %} {% set footer_class = config.extra.footer_class | default(value='') %} -
- - ALL RIGHTS RESERVED 2022 -
+
+ + {% endif %} \ No newline at end of file diff --git a/templates/partials/header.html b/templates/partials/header.html index e8daba4..f335da8 100644 --- a/templates/partials/header.html +++ b/templates/partials/header.html @@ -102,7 +102,7 @@
@@ -122,7 +122,7 @@ \ No newline at end of file diff --git a/templates/shortcodes/row.html b/templates/shortcodes/row.html index 03a514e..0285595 100644 --- a/templates/shortcodes/row.html +++ b/templates/shortcodes/row.html @@ -35,7 +35,7 @@ Parameters: {% set columns = body | safe | markdown | split(pat="

|||

") %} -{% set row_class = "relative py-12 flex flex-col sm:grid sm:grid-cols-2 sm:gap-10 md:flex md:flex-row flex-wrap max-w-fit "%} +{% set row_class = "relative flex flex-col md:flex md:flex-row flex-wrap max-w-fit overflow-hidden"%} {% if 2 < columns | length %} @@ -44,66 +44,94 @@ Parameters: {% set row_class = row_class ~ " lg:items-center" %} {% endif %} -{% set col_class = "flex-1 mb-4 md:mb-12 lg:mb-0 " %} -{% set col_class = col_class ~ " lg:mx-8 " %} +{% set col_class = "flex-1 mb-4 md:mb-12 lg:mb-0 lg:mx-2 xl:mx-4" %} + + +{% set row_id = '' %} + +{% if id %} +{% set row_id = id %} + +{% endif %} + + + +{% set padding_class = " py-8 md:py-8 lg:py-28" %} + +{% if padding %} + {% if "none" in padding %} + {% set padding_class = " py-0" %} + {% elif "top" in padding %} + {% set padding_class = " py-2 md:py-4 lg:pt-28" %} + {% elif "bottom" in padding %} + {% set padding_class = " py-2 md:py-4 lg:pb-28" %} + {% endif %} +{% endif %} + +{% if css %} + {% set padding_class = padding_class ~ " " ~ css %} +{% endif %} + +{% set row_class = row_class ~ padding_class %} -{% set margin_class = " mx-4 md:mx-16 lg:mx-24 " %} +{% set margin_class = " mx-4 md:mx-16 lg:mx-24" %} {% if margin %} {% if "none" in margin %} - {% set margin_class = " mx-0 " %} + {% set margin_class = " mx-0" %} {% elif "wide" in margin %} - {% set margin_class = " mx-4 sm:mx-8 md:mx-12 lg:mx-16 xl:mx-20 " %} + {% set margin_class = " mx-4 sm:mx-8 md:mx-12 lg:mx-16 xl:mx-20" %} {% elif "moderate" in margin %} - {% set margin_class = " mx-8 sm:mx-16 md:mx-24 lg:mx-28 " %} + {% set margin_class = " mx-8 sm:mx-16 md:mx-20 lg:mx-28" %} {% elif "narrow" in margin %} - {% set margin_class = " mx-10 sm:mx-10 md:mx-24 my-10 lg:mx-24 xl:mx-24 2xl:mx-56 " %} + {% set margin_class = " mx-12 sm:mx-20 md:mx-28 lg:mx-40" %} {% elif "tight" in margin %} - {% set margin_class = " mx-20 sm:mx-32 md:mx-60 lg:mx-80 xl:mx-96 " %} + {% set margin_class = " mx-20 sm:mx-32 md:mx-40 lg:mx-80 xl:mx-96" %} + {% elif "header" in margin %} + {% set margin_class = " mx-12 sm:mx-20 md:mx-28 lg:mx-40 my-10" %} {% endif %} {% if "lean-left" in margin %} - {% set col_class = col_class ~ " lg:last:px-20 lg:max-w-[50%] lg:mx-0 " %} - {% set row_class = row_class ~ " !ml-0 sm:gap-0 " %} + {% set margin = margin_class | replace(from=" ", to=" first:")%} + {% set margin_left = margin | replace(from="mx", to="-ml") %} + {% set margin_right = margin | replace(from="mx", to="mr") %} + {% set col_class = col_class ~ " md:last:px-8 lg:last:px-20 lg:max-w-[50%] lg:mx-0 " ~ margin_left ~ margin_right %} + {% set row_class = row_class ~ " sm:gap-0 " %} {% elif "lean-right" in margin %} - {% set col_class = col_class ~ " lg:first:px-20 lg:max-w-[50%] lg:mx-0 " %} - {% set row_class = row_class ~ " !mr-0 sm:gap-0 " %} + {% set margin = margin_class | replace(from=" ", to=" last:")%} + {% set margin_left = margin | replace(from="mx", to="ml") %} + {% set margin_right = margin | replace(from="mx", to="-mr") %} + {% set col_class = col_class ~ " md:first:px-8 lg:first:px-20 lg:max-w-[50%] lg:mx-0 " ~ margin_left ~ margin_right %} + {% set row_class = row_class ~ " sm:gap-0 " %} {% endif %} {% endif %} +{% if css %} + {% set margin_class = margin_class ~ " " ~ css %} +{% endif %} + {% set row_class = row_class ~ margin_class %} {% if style %} {% if "center" in style %} - {% set row_class = row_class ~ " text-center items-center mx-auto justify-center " %} + {% set row_class = row_class ~ " text-center items-center mx-auto " %} {% set col_class = col_class ~ " flex-1 " %} {% endif %} - - {% if "lean" in style %} - {% if "lean-left" in style %} - {% set col_class = col_class ~ " last:px-20 lg:max-w-[50%] " %} - {% set row_class = row_class ~ " sm:gap-0 " %} - {% elif "lean-right" in style %} - {% set col_class = col_class ~ " first:px-20 lg:max-w-[50%] -mr-8 md:-mr-12 lg:-mr-16 xl:-mr-20 " %} - {% set row_class = row_class ~ " sm:gap-0 " %} - {% else %} - {% set row_class = row_class ~ " md:py-0 " %} - {% set col_class = col_class ~ " lg:m-0" %} - {% endif %} - {% else %} - {% set row_class = row_class ~ " w-screen " %} + {% if "items-end" in style %} + {% set row_class = row_class ~ " lg:items-end" %} + {% set col_class = col_class ~ " flex-1 " %} {% endif %} - {% if "between" in style %} - {% set row_class = row_class ~ " lg:max-w-6xl " %} - {% elif "moderate" in style %} - {% set row_class = row_class ~ " " %} - {% endif %} + {% if "between" in style %} + {% set row_class = row_class ~ " lg:max-w-6xl " %} + {% elif "moderate" in style %} + {% set row_class = row_class ~ " " %} + {% endif %} {% if "narrow" in style %} @@ -150,20 +178,25 @@ Parameters: {% if "full" in bgStyle %} {% set styles = styles ~ "height: -webkit-fill-available; height: 100vh;" %} {% elif "hero" in bgStyle %} - {% set div_class = div_class ~ " -mt-24 pt-24 " %} + {% set div_class = div_class ~ " -mt-24 pt-12 " %} {% endif %} {% endif %} {% if bgColor %} {% set styles = "background-color: " ~ bgColor ~ "; background-size: cover" %} - {% set row_class = row_class ~ " py-0 " %} + {% set row_class = row_class %} +{% endif %} + +{% if class %} + {% set styles = "background-color: " ~ bgColor ~ "; background-size: cover" %} + {% set row_class = row_class %} {% endif %} {% set no_margins = " -mx-8 md:-mx-12 lg:-mx-16 xl:-mx-20" %} -
-
+
+
{% for column in columns%}