Merge branch 'development' of https://github.com/threefoldfoundation/www_threefold_io into development

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") %}
 
-<button>[Farm](/farm)</button>
-
-|||
-
 <button>[Build](/cloud)</button>
 
 |||
 
-<button>[Token](https://library.threefold.me/info/threefold#/tokens/threefold__tokens_home)</button>
+<button>[Get TFT](https://library.threefold.me/info/threefold#/tokens/threefold__how_to_buy)</button>
 
 |||
 
-<button>[Chat](https://t.me/threefold)</button>
+<button>[TF Chat](https://t.me/threefold)</button>
 
 {% end %}
 
-<!-- section 5 (Map) -->
+<!-- section 2 (Map) -->
 
 
 {% grid_stats() %}
 
-### The ThreeFold Grid
+### The ThreeFold Grid v3.6
 
 ## **Live and Operational**
 
 {% end %}
 
 
-<!-- section 2 (EXPAND) -->
+<!-- section 3 (EXPAND) -->
 
 {% row(style="center margin") %}
 
@@ -89,7 +85,7 @@ The community has already started using ThreeFold for its autonomous, decentrali
 
 {% end %}
 
-<!-- section 9 (FEATURED STORIES) -->
+<!-- section 4 (FEATURED STORIES) -->
 
 {% featured_stories() %}
 
@@ -97,7 +93,7 @@ The community has already started using ThreeFold for its autonomous, decentrali
 
 {% end %}
 
-<!-- section 6 (THE TEAM) -->
+<!-- section 5 (THE TEAM) -->
 
 {% team_sec() %}
 
@@ -105,7 +101,7 @@ The community has already started using ThreeFold for its autonomous, decentrali
 
 {% end %}
 
-<!-- section 7 (PARTNERS) -->
+<!-- section 6 (PARTNERS) -->
 
 {% row(style="center margin") %}
 
@@ -123,7 +119,7 @@ We are truly proud to be trusted by some of the biggest names in the industry.
 
 <br>
 
-<!-- section 8 (IN THE NEWS) -->
+<!-- section 7 (IN THE NEWS) -->
 
 {% row(style="center") %}
 

content/careers/index.md

@@ -1,5 +1,5 @@
 ---
-title: "careers"
+title: "Careers"
 ---
 
 

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") %}
 
-<button>[Deploy](https://dashboard.grid.tf)</button>
+<button>[Dashboard](https://dashboard.grid.tf)</button>
+
+|||
+
+<button>[Weblets](https://play.grid.tf)</button>
 
 |||
 
@@ -30,10 +34,6 @@ Deploy any workload with unprecedented security, scalability, and efficiency, on
 
 |||
 
-<button>[Learn](https://library.threefold.me/info/threefold#/cloud/threefold__cloud_intro)</button>
-
-|||
-
 <button>[Chat](https://t.me/threefoldtesting)
 
 {% end %}

content/community/index.md

@@ -1,5 +1,5 @@
 ---
-title: "community"
+title: "Community"
 template: "page.html"
 insert_anchor_links: "left"
 ---

content/developer/index.md

@@ -1,5 +1,5 @@
 ---
-title: "Developer"
+title: "Developers"
 template: "page.html"
 ---
 

content/faq/_index.md

@@ -1,4 +1,4 @@
 ---
-title: "Frequently Asked Questions"
+title: "FAQ"
 template: "layouts/faq.html"
 ---

content/farmfaq/_index.md

@@ -1,4 +1,4 @@
 ---
-title: "Frequently Asked Questions"
+title: "Farm FAQ"
 template: "layouts/faq.html"
 ---

content/footer/_index.md

@@ -26,6 +26,9 @@ extra:
 
 ###### [Testing Community](https://t.me/threefoldtesting)
 
+###### [ThreeFold Connect: iOS](https://apps.apple.com/us/app/3bot-login/id1459845885)
+
+###### [ThreeFold Connect: Android](https://play.google.com/store/apps/details?id=org.jimber.threebotlogin&hl=en_US)
 
 |||
 

content/header/index.md

@@ -10,7 +10,7 @@ extra:
 
 - [Mission]("/mission")
 - [Grid]("/grid")
-- [Cloud]("/cloud")
+- [Build]("/cloud")
 - [Farm]("/farm")
 - [TFT]("/tft")
 - Ecosystem
@@ -57,18 +57,36 @@ Join The Developer Community
 
 - MoreInfo
 
-{% row() %}
+{% row(style="wide") %}
 
-#### Resources 
+
+#### Tools
 
 <button>
 
-[Explorer](https://dashboard.grid.tf/)
-
-ThreeFold Capacity Explorer
+[ThreeFold Connect](https://library.threefold.me/info/threefold#/tokens/threefold__threefold_connect)
+<br>
+TFT Wallet, 2FA, & More
 
 </button>
 
+<button>
+
+[Dashboard](https://dashboard.grid.tf/)
+<br>
+Portal & Capacity Explorer
+
+</button>
+
+<button>
+
+[Weblet Playground](https://play.grid.tf)
+<br>
+Deploy a VM & More
+
+|||
+
+#### Resources 
 
 <button>
 
@@ -84,6 +102,14 @@ Explore the Documentation
 <br>
 Get Started on the Grid
 
+</button>
+
+<button>
+
+[GitHub](https://github.com/)
+<br>
+Code Library & Documentation
+
 |||
 
 #### Dive Deeper
@@ -106,9 +132,9 @@ Check the Latest Updates
 
 <button>
 
-[Litepaper](https://litepaper.threefold.me)
+[Intro Docs](https://intro.threefold.me)
 <br>
-Get the Full Picture
+Perfect for Newcomers
 
 |||
 

content/newsroom/_index.md

@@ -1,5 +1,5 @@
 ---
-title: "Newsroom"
+title: "News"
 paginate_by: 9
 # paginate_reversed: false
 sort_by: "date"

content/support/index.md

@@ -1,5 +1,5 @@
 ---
-title: "support"
+title: "Support"
 template: "page.html"
 insert_anchor_links: "left"
 ---
@@ -11,7 +11,7 @@ insert_anchor_links: "left"
 {% row(style="center narrow") %}
 
 
-## GET IN TOUCH <br> **WITH THREEFOLD**
+## Get in Touch <br> **with ThreeFold**
 
 
 {% end %}
@@ -45,7 +45,7 @@ insert_anchor_links: "left"
 
 {% row(bgColor="#f2f2f2" style="center margin") %}
 
-## FREQUENTLY ASKED <br> **QUESTIONS**
+## Frequently Asked <br> **Questions**
 
 Check out the most common questions from the community. <br> There's a good chance your answer is there already!
 
@@ -64,10 +64,10 @@ Check out the most common questions from the community. <br> There's a good chan
 ![Image](ask.png#mx-auto)
 <br>
 
-## HAVE A QUESTION ABOUT <br> **BUILDING ON THREEFOLD?**
+## Have a Question About <br> **Building on ThreeFold?**
 
 
-<button>[Create Forum Post](https://forum.threefold.io/)</button>
+<button>[Create a Forum Post](https://forum.threefold.io/)</button>
 
 
 {% end %}

content/tfLabs/_index.md

@@ -1,5 +1,5 @@
 ---
-title: "tfLabs"
+title: "TF Labs"
 template: "section.html"
 insert_anchor_links: "left"
 ---

content/tft/index.md

@@ -1,5 +1,5 @@
 ---
-title: "TFT"
+title: "Token"
 template: "page.html"
 page_template: "tft_header.html"
 insert_anchor_links: "left"

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}
+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
+}

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 %}
 <section class="px-2 h-auto bg-center bg-cover bg-no-repeat" style="{{styles}}">
     <div class="flex flex-wrap lg:p-12 text-center -mx-auto">
         <div class="text-center rounded lg:px-6 mt-10 lg:mt-0 mx-auto">
@@ -19,7 +19,7 @@
 
                 <!-- capacity -->
                 <div class="leading-none font-extrabold text-5xl">
-                    {{ capacity / 1000000 | round(precision=2) }}PB
+                    {{ capacity | round(precision=2) }}PB
                     <span class="block text-3xl uppercase">capacity</span>
                 </div>
                 <div class="..."></div>
@@ -69,8 +69,9 @@
                 {{ cores | num_format }}
                 <span class="block text-2xl uppercase">cores</span>
             </div>
-            
-            <button class="my-8"><a href="https://dashboard.grid.tf/explorer/statistics" target="_blank">Explore ThreeFold Grid Capacity</a></button>
+
+            <button class="my-8"><a href="https://dashboard.grid.tf/explorer/statistics" target="_blank">Explore
+                    ThreeFold Grid Capacity</a></button>
         </div>
     </div>
 </section>

templates/shortcodes/row.html

@@ -91,7 +91,7 @@ Parameters:
 
         <!-- makes row full screen width, strips margins -->
     {% 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 %}