diff --git a/README.md b/README.md index 625c44e..68c8bff 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ A website created using Zola, a static site generator. ## Getting Started -This repository is meant to use as a template for separate projects as well. +This repository is meant to use as a template for static sites. To use this repository as a template, simply: diff --git a/config.toml b/config.toml index 66c60e2..ae08792 100644 --- a/config.toml +++ b/config.toml @@ -37,6 +37,9 @@ highlight_theme = "visual-studio-dark" # Unicode emoji equivalent in the rendered Markdown files. (e.g.: :smile: => 😄) render_emoji = false +[slugify] +paths = "on" + # Whether external links are to be opened in a new tab # If this is true, a `rel="noopener"` will always automatically be added for security reasons external_links_target_blank = true @@ -62,3 +65,7 @@ name = "categories" feed = true paginate_by = 2 paginate_path = "blog-posts" + +[extra] +header_class = "freeflow" +footer_class = "freeflow" \ No newline at end of file diff --git a/content/_index.md b/content/_index.md index 9e54ef4..7001052 100644 --- a/content/_index.md +++ b/content/_index.md @@ -24,7 +24,7 @@ A better world is one where we all have access to endless information and opport ||| -![Image](/images/OWAsset-15.png#large) +![Image](/images/ow_lp15.jpg) {% end %} diff --git a/content/experiences/OW_Defi.jpg b/content/experiences/OW_Defi.jpg new file mode 100644 index 0000000..dae075e Binary files /dev/null and b/content/experiences/OW_Defi.jpg differ diff --git a/content/experiences/OW_Kutana.jpg b/content/experiences/OW_Kutana.jpg new file mode 100644 index 0000000..a02062d Binary files /dev/null and b/content/experiences/OW_Kutana.jpg differ diff --git a/content/experiences/_index.md b/content/experiences/index.md similarity index 92% rename from content/experiences/_index.md rename to content/experiences/index.md index 922fc0b..6c4e838 100644 Binary files a/content/experiences/_index.md and b/content/experiences/index.md differ diff --git a/content/footer/_index.md b/content/footer/_index.md index ab303a7..400e6ce 100644 --- a/content/footer/_index.md +++ b/content/footer/_index.md @@ -7,16 +7,4 @@ extra: socialLinks: { Github: "https://" } --- -{% row(style="center narrow invert-color" bgColor="#2d103e") %} -## WANNA GET INVOLVED? - -
- -Interested in partnering up? Or just wanna say hi? - -Drop us a message! - - - -{% end %} diff --git a/content/header/_index.md b/content/header/_index.md index 5a7ff99..bb4c135 100644 --- a/content/header/_index.md +++ b/content/header/_index.md @@ -4,7 +4,7 @@ description: "NEAR is on a mission to empower everyone to take back control of t insert_anchor_links: "left" template: "partials/header.html" extra: - logoPath: "/images/OW_logo.png" + logoPath: "/images/OW_Logo.png" imgPath: "" --- diff --git a/content/home/index.md b/content/home/index.md index 9e54ef4..4a877af 100644 --- a/content/home/index.md +++ b/content/home/index.md @@ -10,7 +10,7 @@ extra: -{% row(style="center lean-right") %} +{% row(style="center" margin="narrow") %} ### EXPERIENCE @@ -24,15 +24,15 @@ A better world is one where we all have access to endless information and opport ||| -![Image](/images/OWAsset-15.png#large) +![Image](ow_lp15.jpg) {% end %} {{ space() }} -{% row(style="center lean-left" bgColor="#c4ffeb") %} +{% row(style="center" margin="narrow" bgColor="#c4ffeb") %} -![Image](/images/OW_Asset34.png) +![Image](OW_Asset34.png) ||| @@ -52,11 +52,11 @@ A better world is one where we all have access to endless information and opport {{ space() }} -{% row(style="center narrow") %} +{% row(style="center narrow" margin="narrow") %}
-![Image](/images/OWAsset-16.png) +![Image](OWAsset-16.png) ### THE END OF @@ -70,7 +70,7 @@ OurWorld allows you and your community to prosper together! Learn whatever your {{ space() }} -{% row(style="center lean-right" bgColor="#c4ffeb") %} +{% row(style="center" margin="narrow" bgColor="#c4ffeb") %} #### THE 4 LAYERS OF @@ -84,15 +84,15 @@ OurWorld consists of a decentralized internet network as the foundation. This ba ||| -![Image](/images/OW_Asset25.png#large) +![Image](OW_Asset25.png#large) {% end %} {{ space() }} -{% row(style="center lean-left" bgColor="#fdfeea") %} +{% row(style="center" margin="narrow" bgColor="#fdfeea") %} -![Image](/images/OW_Asset36.png) +![Image](OW_Asset36.png) ||| @@ -108,7 +108,7 @@ OurWorld exists to speed up the transition towards inclusivity. We create thrivi {% end %} -{% row(style="center moderate") %} +{% row(style="center moderate" margin="narrow") %} COMING SOON. @@ -124,11 +124,11 @@ Soon, access all your OurWorld experiences through your Digital Twin. Communicat ||| -![Image](/images/OW_Asset26.jpg) +![Image](OW_Asset26.jpg) {% end %} -{% row(style="center narrow invert-color" bgColor="#4ec48f") %} +{% row(style="center narrow invert-color" margin="narrow" bgColor="#4ec48f") %} ## WANNA GET **INVOLVED?** diff --git a/content/home/ow_lp15.jpg b/content/home/ow_lp15.jpg new file mode 100644 index 0000000..13166ce Binary files /dev/null and b/content/home/ow_lp15.jpg differ diff --git a/content/home/ow_lp34.jpg b/content/home/ow_lp34.jpg new file mode 100644 index 0000000..97e4ffa Binary files /dev/null and b/content/home/ow_lp34.jpg differ diff --git a/content/platform/_index.md b/content/platform/index.md similarity index 92% rename from content/platform/_index.md rename to content/platform/index.md index c30acb7..c8ee938 100644 --- a/content/platform/_index.md +++ b/content/platform/index.md @@ -10,7 +10,7 @@ extra: -![Image](/images/OW_Asset3.jpg) +![Image](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/OW_Asset4.jpg) +![Image](OW_Asset4.jpg) {% 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_Asset34.png) +![Image](OW_Asset34.png) ||| @@ -78,7 +78,7 @@ OurWorld consists of a decentralized internet network as the foundation. This ba ||| -![Image](/images/OW_Asset25.png#large) +![Image](OW_Asset25.png#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/OW_Asset5.jpg) +![Image](OW_Asset5.jpg) ||| diff --git a/css/ffoxobliq.css b/css/ffoxobliq.css deleted file mode 100644 index 41db96f..0000000 --- a/css/ffoxobliq.css +++ /dev/null @@ -1,9 +0,0 @@ -/* === handling obliquing issues in Firefox */ - -@supports (-moz-appearance: none) { - .italic, i, cite, em, var, address, dfn, h3, .h3, h5, .h5 { - font-style: oblique 8deg; - } -} - -/* === end, handling obliquing issues in Firefox */ \ No newline at end of file diff --git a/css/index.css b/css/index.css index 3182f09..573bbcc 100644 --- a/css/index.css +++ b/css/index.css @@ -7,19 +7,38 @@ @import "tailwindcss/components"; @import "admonition.css"; @import "tailwindcss/utilities"; -@import url("https://fonts.googleapis.com/css2?family=Lato:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap"); -@import url("https://fonts.googleapis.com/css2?family=Exo:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap"); /* Custom CSS for header partial */ .backdrop-blur { -webkit-backdrop-filter: blur(40px); } +@font-face { + font-family: "CercoDEMO"; + font-weight: 500; + src: url("https://www2.freeflow.life/fonts/CercoDEMO-Medium.otf") format("opentype"); + src: url("../fonts/CercoDEMO-Medium.otf") format("opentype"); +} + +@font-face { + font-family: "CercoDEMO"; + font-weight: 600; + src: url("https://www2.freeflow.life/fonts/CercoDEMO-Bold.otf") format("opentype"); + src: url("../fonts/CercoDEMO-Bold.otf") format("opentype"); +} + +@font-face { + font-family: "CercoDEMO"; + font-weight: 400; + src: url("https://www2.freeflow.life/fonts/CercoDEMO-Light.otf") format("opentype"); + src: url("../fonts/CercoDEMO-Light.otf") format("opentype"); +} + * { - font-family: "Exo", sans-serif; + font-family: "CercoDEMO", sans-serif; } a { - font-family: "Lato", sans-serif; + font-family: "CercoDEMO", sans-serif; } .bg-semi-white { @@ -35,9 +54,12 @@ img[src*="#small"] { width: 68px; } +img[src*="#md"] { + width: 300px; +} + img[src*="#medium"] { - width: 400px; - margin: auto; + width: 400px; } img[src*="#logo"] { @@ -61,47 +83,48 @@ img[src*="#tft_img"] { @layer components { h1 { - @apply text-5xl lg:text-8xl font-normal leading-none; + @apply text-4xl md:text-5xl lg:text-6xl leading-none font-normal; } h1 strong { - @apply font-semibold; + @apply font-medium; } h2 { - @apply text-4xl md:text-5xl lg:text-6xl xl:text-7xl font-normal leading-none; + @apply text-3xl md:text-4xl lg:text-5xl xl:text-5xl font-normal leading-none; } h2 strong { @apply font-medium; } h3 { - @apply text-3xl lg:text-6xl font-normal leading-none; + @apply text-xl md:text-2xl lg:text-3xl font-light; } h3 strong { - @apply font-semibold; + @apply font-medium; } h4 { - @apply text-xl lg:text-5xl font-normal; + @apply text-xl lg:text-2xl font-normal; } h5 { - @apply text-xl lg:text-3xl font-normal; + @apply text-xl lg:text-xl font-normal; } h6 { - @apply text-base not-italic font-normal my-1; + @apply text-lg not-italic font-normal my-1; } p { - @apply text-lg lg:text-2xl leading-tight; - font-family: "Lato", sans-serif; + @apply text-lg lg:text-xl leading-tight tracking-normal font-normal; + font-family: "CercoDEMO", sans-serif; } blockquote { @apply border-l-4 border-gray-400 mx-2 my-2 p-2; } li { - @apply text-base lg:text-base font-normal; + @apply text-lg lg:text-xl font-normal; } li li { @apply text-sm lg:text-sm font-light; } button { @apply inline-block + text-base lg:text-lg px-12 py-1 @@ -122,6 +145,32 @@ button :is(:where(p)) { font-weight: 400; } +header .freeflow { + background-color: transparent; + position: absolute; +} + +footer .freeflow { + width: 100vw; + background-color: #eae8e3; + display: flex; + flex-direction: column; + align-items: center; + padding: 40px; +} + +footer .freeflow img { + width: 200px; + margin-bottom: 20px; +} + + +header .freeflow div { + box-shadow: none; + text-transform: uppercase; + font-weight: 700 !important; +} + button { background-color: #1a1a1a; border-radius: 20px; @@ -130,6 +179,14 @@ button { font-size: 20px; } +button { + background-color: #1a1a1a; + border-radius: 10px; + border: none; + box-shadow: none; + font-size: 20px; + } + button a { color: white; } diff --git a/css/layout.css b/css/layout.css index ff59c95..678ebfa 100644 --- a/css/layout.css +++ b/css/layout.css @@ -2,6 +2,15 @@ main { @apply pt-0; } +#text-1xl { @apply text-xl } +#text-2xl { @apply text-2xl } +#text-3xl { @apply text-3xl } +#text-4xl { @apply text-4xl } +#text-5xl { @apply text-5xl } +#text-6xl { @apply text-6xl } +#text-7xl { @apply text-7xl } +#text-8xl { @apply text-8xl } + /* html, body { @apply dark:bg-black; @@ -120,26 +129,6 @@ h5, .h5, h6, .h6 { - @apply font-sans leading-none tracking-tight; -} - -h1, -.h1, -h2, -.h2, -h3, -.h3 { - font-family: "Exo", sans-serif; -} - -h4, -.h4, -h5, -.h5, -h6, -.h6 { - @apply font-sans leading-none tracking-tight; - font-family: "Lato", sans-serif; } h1, diff --git a/static/.DS_Store b/static/.DS_Store deleted file mode 100644 index e2dbdea..0000000 Binary files a/static/.DS_Store and /dev/null differ diff --git a/tailwind.config.js b/tailwind.config.js index 5a4e3db..5b0de27 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -1,8 +1,8 @@ -const colors = require('tailwindcss/colors') - +/** @type {import('tailwindcss').Config} */ module.exports = { - important: '#content', - content: [ - './templates/**/*.html' - ] + content: ['./templates/**/*.html'], + theme: { + extend: {}, + }, + plugins: [], } diff --git a/templates/.DS_Store b/templates/.DS_Store deleted file mode 100644 index f9ee9ae..0000000 Binary files a/templates/.DS_Store and /dev/null differ diff --git a/templates/shortcodes/row.html b/templates/shortcodes/row.html index 67961bb..03a514e 100644 --- a/templates/shortcodes/row.html +++ b/templates/shortcodes/row.html @@ -60,7 +60,7 @@ Parameters: {% elif "moderate" in margin %} {% set margin_class = " mx-8 sm:mx-16 md:mx-24 lg:mx-28 " %} {% elif "narrow" in margin %} - {% set margin_class = " mx-12 sm:mx-20 md:mx-28 lg:mx-32 " %} + {% set margin_class = " mx-10 sm:mx-10 md:mx-24 my-10 lg:mx-24 xl:mx-24 2xl:mx-56 " %} {% elif "tight" in margin %} {% set margin_class = " mx-20 sm:mx-32 md:mx-60 lg:mx-80 xl:mx-96 " %} {% endif %}