diff --git a/content/_index.md b/content/_index.md index 830ba5464..3271037cd 100644 --- a/content/_index.md +++ b/content/_index.md @@ -1,6 +1,6 @@ --- -title: "Together, we create the future" -description: "Together we expand and create this OurWorld platform, with the purpose to give a better digital life to billions of people. OurWorld can provide the alternative to the current too centralized, unsustainable and abused internet. Let's go back to what the internet was supposed to be." # quotation marks to allow colons where used +title: "Home" +description: "A global movement together building an open-source, community-driven, decentralized Internet – from the ground up." # quotation marks to allow colons where used date: 2018-09-14T21:00:00-05:00 updated: 2021-02-20T14:40:00-06:00 draft: false @@ -25,41 +25,37 @@ extra: ## Planet & People-First **Internet.** -We are a global, decentralized, open-source movement of believers in a better world who choose to act. Together we are building an equal, safe, private, and regenerative Internet. +We are a global movement together building an open-source, community-driven, decentralized Internet – from the ground up. {% end %} {% row(style="center narrow") %} - - -||| - ||| - + ||| - + {% end %} - + {% grid_stats() %} -### The ThreeFold Grid +### The ThreeFold Grid v3.6 ## **Live and Operational** {% end %} - + {% row(style="center margin") %} @@ -89,7 +85,7 @@ The community has already started using ThreeFold for its autonomous, decentrali {% end %} - + {% featured_stories() %} @@ -97,7 +93,7 @@ The community has already started using ThreeFold for its autonomous, decentrali {% end %} - + {% team_sec() %} @@ -105,7 +101,7 @@ The community has already started using ThreeFold for its autonomous, decentrali {% end %} - + {% row(style="center margin") %} @@ -123,7 +119,7 @@ We are truly proud to be trusted by some of the biggest names in the industry.
- + {% row(style="center") %} diff --git a/content/careers/index.md b/content/careers/index.md index a35ccf4df..8cf90f4e8 100644 --- a/content/careers/index.md +++ b/content/careers/index.md @@ -1,5 +1,5 @@ --- -title: "careers" +title: "Careers" --- diff --git a/content/cloud/index.md b/content/cloud/index.md index be58bdf8e..3c244ffca 100644 --- a/content/cloud/index.md +++ b/content/cloud/index.md @@ -1,5 +1,5 @@ --- -title: "Cloud" +title: "Build" template: "page.html" insert_anchor_links: "left" --- @@ -22,7 +22,11 @@ Deploy any workload with unprecedented security, scalability, and efficiency, on {% row(style="center narrow") %} - + + +||| + + ||| @@ -30,10 +34,6 @@ Deploy any workload with unprecedented security, scalability, and efficiency, on ||| - - -||| - + + + + + + {% end %} \ No newline at end of file diff --git a/content/tfLabs/_index.md b/content/tfLabs/_index.md index 5e5d29392..aadf6c3c4 100644 --- a/content/tfLabs/_index.md +++ b/content/tfLabs/_index.md @@ -1,5 +1,5 @@ --- -title: "tfLabs" +title: "TF Labs" template: "section.html" insert_anchor_links: "left" --- diff --git a/content/tft/index.md b/content/tft/index.md index 2cddde5dc..93092adb4 100644 --- a/content/tft/index.md +++ b/content/tft/index.md @@ -1,5 +1,5 @@ --- -title: "TFT" +title: "Token" template: "page.html" page_template: "tft_header.html" insert_anchor_links: "left" diff --git a/css/index.css b/css/index.css index 746ce1f23..e299dd14e 100644 --- a/css/index.css +++ b/css/index.css @@ -79,6 +79,40 @@ h1 { line-height: 4rem; } +.nav p > a { + display: flex; + width: 100%; + flex-direction: column; + align-items: flex-start; + text-align: left; + line-height: 1.5rem; + transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter, -webkit-text-decoration-color, -webkit-backdrop-filter; + transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1); + transition-duration: 150ms; + border-radius: 0.25rem; + border-width: 2px; + border-color: transparent; + padding: 0.5rem; + margin-top: 0.75rem; + margin-bottom: 0.75rem; + display: inline-block; + border-width: 2px; + border-color: rgb(0 0 0 / var(--tw-border-opacity)); + padding-left: 3rem; + padding-right: 3rem; + padding-top: 0.25rem; + padding-bottom: 0.25rem; + text-transform: capitalize; + box-shadow: 0 1px 3px 0 rgb(0 0 0 / 0.1), 0 1px 2px -1px rgb(0 0 0 / 0.1); +} + +.nav p > a:hover { + --tw-border-opacity: 1; + border-color: rgb(231 229 228 / var(--tw-border-opacity)); + --tw-bg-opacity: 1; + background-color: rgb(245 245 244 / var(--tw-bg-opacity)); +} + @layer components { h1 { @apply text-3xl lg:text-7xl font-normal; @@ -120,9 +154,8 @@ h1 { @apply inline-block lg:text-lg - px-12 - py-1 lg:mr-5 + py-1 my-3 border-2 shadow @@ -179,7 +212,9 @@ button :is(:where(p)) { } button a { - color: black; + @apply + text-black + px-12 } a { @@ -385,4 +420,33 @@ header { } } -header #menu button { @apply leading-6 border-transparent flex flex-col border-2 w-full items-start rounded transition hover:first:text-gray-500 hover:border-stone-200 hover:bg-stone-100 p-2 text-left} \ No newline at end of file +header #menu button { + @apply + lg:text-lg + px-6 + py-1 + lg:mr-5 + my-3 + shadow + border-black + capitalize + leading-6 + border-transparent + flex + flex-col + border-2 + w-full + items-start + rounded + transition + hover:first:text-gray-500 + hover:border-stone-200 + hover:bg-stone-100 + p-2 + text-left +} + +header #menu button a{ + @apply + px-0 +} \ No newline at end of file diff --git a/static/images/people/adnan_fatayerji.jpg b/static/images/people/adnan_fatayerji.jpg new file mode 100644 index 000000000..2afd00013 Binary files /dev/null and b/static/images/people/adnan_fatayerji.jpg differ diff --git a/static/images/people/ahmed_thabet.jpg b/static/images/people/ahmed_thabet.jpg new file mode 100644 index 000000000..7435f23a8 Binary files /dev/null and b/static/images/people/ahmed_thabet.jpg differ diff --git a/static/images/people/alexandre_hannelas.jpeg b/static/images/people/alexandre_hannelas.jpeg new file mode 100644 index 000000000..e0eca1da6 Binary files /dev/null and b/static/images/people/alexandre_hannelas.jpeg differ diff --git a/static/images/people/christhoper_hutton.jpeg b/static/images/people/christhoper_hutton.jpeg new file mode 100644 index 000000000..853dc8c6d Binary files /dev/null and b/static/images/people/christhoper_hutton.jpeg differ diff --git a/static/images/people/ewald_weizenbauer.jpg b/static/images/people/ewald_weizenbauer.jpg new file mode 100644 index 000000000..260f0ef32 Binary files /dev/null and b/static/images/people/ewald_weizenbauer.jpg differ diff --git a/static/images/people/florian_fournier.jpeg b/static/images/people/florian_fournier.jpeg new file mode 100644 index 000000000..e7c788edc Binary files /dev/null and b/static/images/people/florian_fournier.jpeg differ diff --git a/static/images/people/geert_machtelinckx.jpg b/static/images/people/geert_machtelinckx.jpg new file mode 100644 index 000000000..d3fab8390 Binary files /dev/null and b/static/images/people/geert_machtelinckx.jpg differ diff --git a/static/images/people/gloria_anne.png b/static/images/people/gloria_anne.png new file mode 100644 index 000000000..06a5c86d3 Binary files /dev/null and b/static/images/people/gloria_anne.png differ diff --git a/static/images/people/hannah_cordes.jpg b/static/images/people/hannah_cordes.jpg new file mode 100644 index 000000000..a341e54ed Binary files /dev/null and b/static/images/people/hannah_cordes.jpg differ diff --git a/static/images/people/jan_de_landtsheer.jpeg b/static/images/people/jan_de_landtsheer.jpeg new file mode 100644 index 000000000..a20890161 Binary files /dev/null and b/static/images/people/jan_de_landtsheer.jpeg differ diff --git a/static/images/people/karoline_zizka.jpeg b/static/images/people/karoline_zizka.jpeg new file mode 100644 index 000000000..7e74e79bf Binary files /dev/null and b/static/images/people/karoline_zizka.jpeg differ diff --git a/static/images/people/kristof_de_spiegeleer.jpeg b/static/images/people/kristof_de_spiegeleer.jpeg new file mode 100644 index 000000000..3ee741e73 Binary files /dev/null and b/static/images/people/kristof_de_spiegeleer.jpeg differ diff --git a/static/images/people/lee_smet.png b/static/images/people/lee_smet.png new file mode 100644 index 000000000..f2866a0b0 Binary files /dev/null and b/static/images/people/lee_smet.png differ diff --git a/static/images/people/maxime_daniel.png b/static/images/people/maxime_daniel.png new file mode 100644 index 000000000..cc50362fa Binary files /dev/null and b/static/images/people/maxime_daniel.png differ diff --git a/static/images/people/nickolay_babenko.jpg b/static/images/people/nickolay_babenko.jpg new file mode 100644 index 000000000..410a36835 Binary files /dev/null and b/static/images/people/nickolay_babenko.jpg differ diff --git a/static/images/people/owen_kemp.jpeg b/static/images/people/owen_kemp.jpeg new file mode 100644 index 000000000..ea5e1a570 Binary files /dev/null and b/static/images/people/owen_kemp.jpeg differ diff --git a/static/images/people/peter_van_der_henst.png b/static/images/people/peter_van_der_henst.png new file mode 100644 index 000000000..aa0906df7 Binary files /dev/null and b/static/images/people/peter_van_der_henst.png differ diff --git a/static/images/people/pierre_van_hoorebeke.jpg b/static/images/people/pierre_van_hoorebeke.jpg new file mode 100644 index 000000000..9cc843a35 Binary files /dev/null and b/static/images/people/pierre_van_hoorebeke.jpg differ diff --git a/static/images/people/rajinder_singh_grewal.jpeg b/static/images/people/rajinder_singh_grewal.jpeg new file mode 100644 index 000000000..fad9db2e2 Binary files /dev/null and b/static/images/people/rajinder_singh_grewal.jpeg differ diff --git a/static/images/people/reem_khamis.jpg b/static/images/people/reem_khamis.jpg new file mode 100644 index 000000000..7c613e479 Binary files /dev/null and b/static/images/people/reem_khamis.jpg differ diff --git a/static/images/people/rob_van_mieghem.jpeg b/static/images/people/rob_van_mieghem.jpeg new file mode 100644 index 000000000..b559f9e21 Binary files /dev/null and b/static/images/people/rob_van_mieghem.jpeg differ diff --git a/static/images/people/sabrina_sadik.jpg b/static/images/people/sabrina_sadik.jpg new file mode 100644 index 000000000..1e434db63 Binary files /dev/null and b/static/images/people/sabrina_sadik.jpg differ diff --git a/static/images/people/sacha_obeegadoo.jpg b/static/images/people/sacha_obeegadoo.jpg new file mode 100644 index 000000000..225049929 Binary files /dev/null and b/static/images/people/sacha_obeegadoo.jpg differ diff --git a/static/images/people/sam_taggart.jpg b/static/images/people/sam_taggart.jpg new file mode 100644 index 000000000..78941b2b1 Binary files /dev/null and b/static/images/people/sam_taggart.jpg differ diff --git a/static/images/people/scott_yeager.jpg b/static/images/people/scott_yeager.jpg new file mode 100644 index 000000000..3b6cd4df0 Binary files /dev/null and b/static/images/people/scott_yeager.jpg differ diff --git a/static/images/people/weynand_kuijpers.jpg b/static/images/people/weynand_kuijpers.jpg new file mode 100644 index 000000000..be421c999 Binary files /dev/null and b/static/images/people/weynand_kuijpers.jpg differ diff --git a/templates/shortcodes/grid_stats.html b/templates/shortcodes/grid_stats.html index 91b983b6f..ec9c61f61 100644 --- a/templates/shortcodes/grid_stats.html +++ b/templates/shortcodes/grid_stats.html @@ -1,14 +1,14 @@ {% set styles = "background-image: url('images/grid_map.png');" %} {% set data = load_data(url="https://gridproxy.grid.tf/stats?status=up", required=false, format="json") %} {% if data %} -{% set capacity = data.totalHru + data.totalSru / 1000 %} +{% set capacity = data.totalHru + data.totalSru / (1024 * 1024 * 1024 * 1024 * 1024) %} {% set nodes = data.nodes %} {% set countries = data.countries %} {% set cores = data.totalCru %} {% endif %} -{% if data %} +{% if data %}
@@ -19,7 +19,7 @@
- {{ capacity / 1000000 | round(precision=2) }}PB + {{ capacity | round(precision=2) }}PB capacity
@@ -69,8 +69,9 @@ {{ cores | num_format }} cores
- - + +
diff --git a/templates/shortcodes/row.html b/templates/shortcodes/row.html index cb689e861..5950f30ad 100644 --- a/templates/shortcodes/row.html +++ b/templates/shortcodes/row.html @@ -91,7 +91,7 @@ Parameters: {% if "narrow" in style %} - {% set row_class = row_class ~ " lg:max-w-3xl" %} + {% set row_class = row_class ~ " lg:max-w-5xl" %} {% elif "moderate" in style %} {% set row_class = row_class ~ " lg:m-20" %} {% endif %}