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

content/footer/_index.md

@@ -18,7 +18,7 @@ extra:
 
 ###### [Host (Farm)](/host)
 
-###### [Dashboard](https://next.dashboard.grid.tf/)
+###### [Dashboard](https://dashboard.grid.tf/)
 
 ###### [Download TF Connect: iOS](https://apps.apple.com/us/app/3bot-login/id1459845885)
 

content/host/index.md

@@ -150,7 +150,7 @@ The ThreeFold Dashboard is today's go-to-interface for hosters (farmers) and gri
 
 <br>
 
-<button>[Visit the Dashboard](https://next.dashboard.grid.tf/)</button>
+<button>[Visit the Dashboard](https://dashboard.grid.tf/)</button>
 
 {% end %}
 

templates/blogPage.html

@@ -20,21 +20,21 @@
   loop.first %} {% set_global content=part%} {% else %} {% set_global content=content ~ "threefold.io" ~ part%} {% endif
   %} {% endfor %} {% endif %} <main>
 
-  <div class="container mx-auto mt-10">
+  <div class="container mx-auto mt-16">
 
     <div>
       <article class="article lg:w-4/6 mx-auto">
-        <h1 class="lg:text-5xl text-2xl font-medium leading-none mt-0  text-gray-700">
+        <h2 class="md:text-4xl text-3xl font-medium mb-2 leading-none  text-gray-700">
           {{ page.title }}
-        </h1>
+        </h2>
 
-        <h4 class="lg:text-2xl text-base text-gray-600 leading-8">
+        <p class="md:text-lg mb-4 text-base text-gray-600">
           {{ page.description }}
-        </h4>
+        </p>
-        <section class="post-author-list mb-3 mx-0">
+        <section class="post-author-list mb-3 mt-2 mx-0">
           <div class="flex items-center">
             <div class="flex justify-between items-center">
-              <ul class="list-none flex author-list m-0">
+              <ul class="list-none pl-0 flex author-list m-0">
                 <li class="author-list-item">
                   {% if author %}
                   {% set author_img = get_url(path='/' ~ author.relative_path | replace(from='_', to='-') |

templates/categories/single.html

@@ -2,9 +2,9 @@
 
 {% block content %}
 
-<main class="pt-16">
+<main class="pt-12">
 
-    <div class="flex flex-col md:flex-row">
+    <div class="flex flex-col md:flex-row container mx-auto">
         {% include "partials/blogPosts.html" %}
         {% include "partials/blogSidebar.html" %}
     </div>

templates/partials/blogPosts.html

@@ -1,8 +1,8 @@
 {% block content %}
 
-<div class="text-center main-title px-0 md:w-2/3 lg:w-2/3 mx-8 md:mx-12">
+<div class="text-center main-title px-0 md:w-2/3 mx-8 md:mx-12">
-  <h1
+  <h2
-    class="tracking-tight text-left text-2xl md:text-4xl lg:text-5xl fw-500 leading-snug font-normal mb-10"
+    class="tracking-tight text-left text-2xl md:text-4xl fw-500 leading-snug font-medium"
   >
   {% set path_array = current_path | split(pat="/") %}
   {% set taxonomy = path_array[1] %}
@@ -11,9 +11,9 @@
     {% if taxonomy == "categories" %} - 
         {{category | replace(from='-', to=' ' ) | title}}
     {% endif %}
-  </h1>
+  </h2>
   <div>
-    <div class="mt-12 grid gap-5 max-w-lg mx-auto lg:grid-cols-2 xl:grid-cols-3 lg:max-w-none">
+    <div class="mt-3 grid gap-5 max-w-lg mx-auto md:grid-cols-2 lg:grid-cols-3 lg:max-w-none">
       {%- for post in paginator.pages %} 
           {% if not post.extra.hidden %}
             {% include "partials/postCard.html" %} 

templates/partials/blogSidebar.html

@@ -1,14 +1,14 @@
 
-<div class="mx-8 md:mx-4 flex flex-col">
+<div class="mx-8 md:mx-4 flex flex-col mt-2 md:mt-8">
-    <div class="flex flex-col mb-12 mr-8 lg:mr-24">
+    <div class="flex flex-col mb-12">
-        <h4 class="text-base not-italic font-medium leading-6 text-gray-600 mb-6"> FILTER POSTS BY</h4>
+        <h4 class="text-base not-italic font-medium leading-6 text-gray-600 mb-4"> FILTER POSTS BY</h4>
-        <a id="all" class="mb-3 text-black font-normal" href="/blog">All</a>
+        <a id="all" class="mb-2 text-black font-normal" href="/blog">All</a>
         {% set taxonomy = get_taxonomy(kind="categories") %}
         {% set categories = taxonomy.items %}
         {% for category in categories %}
             {% set path = category.name | slugify %}
             {% set fullpath = "/categories/" ~ path %}
-            <a id="{{path}}" class="mb-3 text-black font-normal" href={{fullpath}}> {{category.name}} </a>
+            <a id="{{path}}" class="mb-2 text-black font-normal" href={{fullpath}}> {{category.name}} </a>
         {% endfor %}
     </div>
 

templates/partials/featuredBlog.html

@@ -9,27 +9,30 @@
 
 <body>
 
-  <div class="md:grid md:grid-cols-2 md:gap-8 relative mt-16 lg:mt-16 items-center container mx-auto">
+  <div class="md:grid md:grid-cols-2 md:gap-8 relative mt-12 md:mt-10 items-center container mx-auto">
-    <div class="relative lg:ml-8 my-8 w-full md:w-auto">
+    <div class="relative my-8 w-full md:w-auto mx-3 lg:mx-12">
-      <h3 class="text-base not-italic leading-6 text-gray-600">FEATURED POST</h3>
+      <h3 class="text-base not-italic font-medium leading-6 text-gray-600 mb-4">FEATURED POST</h3>
       <a href={{featured.permalink}} class="">
         <h2
-          class="mt-8 text-2xl main-title sm:text-3xl md:text-4xl lg:text-5xl fw-500 leading-snug font-normal mb-4 md:mb-10 ">
+          class="text-2xl main-title md:text-4xl fw-500 leading-snug font-medium">
           {{ featured.title }}
         </h2>
+        <p class="mt-2 text-base font-normal text-gray-500 text-left">
+          {{ featured.description }}
+        </p>
       </a>
-      <h4 class="text-sm not-italic font-light leading-6 text-gray-600">
+      <h4 class="my-2 text-sm not-italic font-light leading-6 text-gray-600">
         {{ featured.date | date(format="%B %e, %Y", timezone="America/Chicago")}} -
       </h4>
 
     </div>
 
-    <div class="mx-4 relative lg:mt-0 max-w-full">
+    <div class="relative lg:mt-0 max-w-full">
-      <img class="relative mx-auto md:w-auto rounded md:max-w-full max-h-80" src={{featured.permalink}}{{featured.extra.imgPath}} alt="" />
+      <img class="relative rounded mx-auto  max-h-64 p-2 border-2 border-gray-100" src={{featured.permalink}}{{featured.extra.imgPath}} alt="" />
     </div>
   </div>
 
-  <hr class="mt-6">
+  <hr class="mt-6 max-w-7xl mx-auto">
 
   </div>
   </div>

templates/partials/postCard.html

@@ -19,9 +19,9 @@
         <img class="h-48 w-full mx-auto object-cover" src={{img_url}} alt="{{post.title ~ ' Picture'}}" />
       </div>
       {%endif%}
-      <div class="flex-1 bg-white p-6 flex flex-col justify-between">
+      <div class="flex-1 bg-white p-4 flex flex-col justify-between">
 
-        <h3 class="mt-2 text-xl leading-6 font-medium text-gray-900 text-left not-italic">
+        <h3 class="mt-2 text-lg leading-6 font-medium text-gray-900 text-left not-italic">
           {{ post.title }}
         </h3>
         {% if post.description %}

templates/shortcodes/grid_stats.html

@@ -50,7 +50,7 @@
                 </div>
             </div>
             <button class="my-8">
-                <a href="https://dashboard.grid.tf/explorer/statistics" target="_blank">
+                <a href="https://dashboard.grid.tf/#/tf-grid/node-statistics/" target="_blank">
                     Explore ThreeFold Grid Capacity
                 </a>
             </button>

templates/shortcodes/grid_stats_expand.html

@@ -58,7 +58,7 @@
  
             </div>
             
-        <button><a href="https://dashboard.grid.tf/explorer/statistics">Explore Grid Capacity</a></button>
+        <button><a href="https://dashboard.grid.tf/#/tf-grid/node-statistics/">Explore Grid Capacity</a></button>
         <button><a href="/host">Become a Host</a></button>
         </div>
     </div>