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

templates/blogPage.html

@@ -24,6 +24,7 @@
 
     <div>
       <article class="article lg:w-4/6 mx-auto">
+        <section class="post-header px-0 mb-4 border-b">
         <h2 class="md:text-4xl text-3xl font-medium mb-2 leading-none  text-gray-700">
           {{ page.title }}
         </h2>
@@ -31,6 +32,7 @@
         <p class="md:text-lg mb-4 text-base text-gray-600">
           {{ page.description }}
         </p>
+      </section>
         <section class="post-author-list mb-3 mt-2 mx-0">
           <div class="flex items-center">
             <div class="flex justify-between items-center">

templates/news-category/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/newsPosts.html" %}
         {% include "partials/newsSidebar.html" %}
     </div>

templates/newsPage.html

@@ -32,21 +32,23 @@
 
 
 <!-- Default page template for news posts and basic informative markdown files -->
-<main>
+<main class="container mx-auto mt-16">
 
-  <div class="container sm:pxi-0 mx-auto overflow-x-hidden pt-16 lg:w-4/6">
+  <div class="article lg:w-4/6 mx-auto">
 
-    <div class="pt-8">
+    <div>
-      <section class="post-header container mx-auto px-0 mb-4 border-b">
+      <section class="post-header px-0 mb-4 border-b">
-        <h1 class="lg:text-5xl text-2xl font-medium leading-none mt-0">
+        <h2 class="md:text-4xl text-3xl font-medium mb-2 leading-none  text-gray-700">
           {{ page.title }}
-        </h1>
+        </h2>
-        <div class="lg:text-2xl text-base pt-4 pb-10 text-gray-700">{{ page.description }}</div>
+        <p class="md:text-lg mb-4 text-base text-gray-600">
+          {{ page.description }}
+        </p>
       </section>
-      <section class="post-author-list mb-10 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 my-10 mr-2 px-0">
+            <ul class="list-none pl-0 flex author-list m-0">
             {% if page.taxonomies.people %}
                 {% for person in page.taxonomies.people %}
                     {% set author_path = 'people/' ~ person ~ '/index.md' %}
@@ -58,8 +60,10 @@
               <li class="author-list-item">
                 <a href="{{author.permalink}}" tooltip="{{author.title}}">
                   <img src="{{author_img}}" alt="{{ author.title }}" class="
-                    w-10
+                    w-8
-                    h-10
+                    h-8
+                    sm:h-10
+                    sm:w-10
                     rounded-full
                     bg-gray-200
                     border-2 border-white
@@ -82,14 +86,14 @@
             {% if pages_str is containing(person) %}
                 {% set author = get_page(path=author_path) %}
                 {% set author_img = get_url(path='/' ~ author.relative_path | replace(from='_', to='-') | replace(from='index.md', to=author.extra.imgPath)) %}
-              <span>
+              <span class="text-xs leading-none uppercase">
                 <a href="{{author.permalink}}" tooltip="{{author.title}}" class="hover:underline text-gray-800">{{ author.title }}</a>
               </span>
               {% endif %}
                 {% endfor %}
             {% endif %}
             </p>
-            <p class="text-gray-700">
+            <p class="text-gray-700 text-xs leading-none uppercase">
               <time datetime="{{page.date}}">
                 {{ page.date | date(format="%B %e, %Y", timezone="America/Chicago") }}
               </time>

templates/partials/featuredBlog.html

@@ -12,7 +12,7 @@
   <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 my-8 w-full md:w-auto mx-3 lg:mx-12">
       <h3 class="text-base not-italic font-medium leading-6 text-gray-600 mb-4">FEATURED POST</h3>
-      <a href={{featured.permalink}} class="">
+      <a href={{featured.permalink}}>
         <h2
           class="text-2xl main-title md:text-4xl fw-500 leading-snug font-medium">
           {{ featured.title }}
@@ -23,6 +23,20 @@
       </a>
       <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")}} -
+        {% for author in featured.taxonomies.people %}
+        {% set author_path = 'people/' ~ author ~ '/index.md' %}
+        {% set author = get_page(path=author_path) %}
+        {% set author_img = get_url(path='/' ~ author.relative_path | replace(from='_', to='-') | replace(from='index.md', to=author.extra.imgPath)) %}
+        <a href="{{author.permalink}}" tooltip="{{author.title}}" class="capitalize	text-gray-800"> <img
+            src="{{ author_img }}" alt="{{ author.title }}" class="
+            inline-flex 
+          w-8
+          h-8
+          rounded-full
+          bg-gray-200
+          border-2 border-white
+        " /> {{ author.title }}</a>
+        {% endfor %}
       </h4>
 
     </div>
@@ -32,7 +46,7 @@
     </div>
   </div>
 
-  <hr class="mt-6 max-w-7xl mx-auto">
+  <hr class="mt-6 container mx-auto">
 
   </div>
   </div>

templates/partials/featuredNews.html

@@ -1,16 +1,19 @@
 <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 NEWS</h3>
+      <h3 class="text-base not-italic font-medium leading-6 text-gray-600 mb-4">FEATURED NEWS</h3>
-      <a href={{featured.permalink}} class="">
+      <a href={{featured.permalink}}>
         <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 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")}} -
         {% for author in featured.taxonomies.people %}
         {% set author_path = 'people/' ~ author ~ '/index.md' %}
@@ -30,13 +33,13 @@
 
     </div>
 
-    <div class="mx-4 relative lg:mt-0 max-w-full">
+    <div class="relative lg:mt-0 max-w-full">
         {% if featured.extra.imgPath %}
-      <img class="relative mx-auto md:w-auto 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="" />
         {% endif %}
     </div>
   </div>
-  <hr class="mt-6">
+  <hr class="mt-6 container mx-auto">
   </div>
   </div>
 </body>

templates/partials/newsCard.html

@@ -1,4 +1,4 @@
-<div class="flex flex-col rounded-lg shadow-lg overflow-hidden">
+<div class="flex flex-col rounded-lg shadow-lg overflow-hidden border">
   <div class="flex-1">
     <a href={{ post.permalink }} class="block">
       <div class="flex-shrink-0">

templates/partials/newsPosts.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 == "news-category" %} - 
         {{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 "Engineering" == "Engineering"%}
             {% include "partials/newsCard.html" %} 

templates/partials/newsSidebar.html

@@ -1,8 +1,8 @@
 
-<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">
-        <h4 class="text-base not-italic font-medium leading-6 text-gray-600 mb-6"> FILTER NEWS BY</h4>
+        <h4 class="text-base not-italic font-medium leading-6 text-gray-600 mb-4"> FILTER NEWS BY</h4>
-        <a id="all" class="mb-3 text-black font-normal" href="/newsroom">All</a>
+        <a id="all" class="mb-2 text-black font-normal" href="/newsroom">All</a>
         {% set taxonomy = get_taxonomy(kind="news-category") %}
         {% set categories = taxonomy.items %}
         {% for category in categories %}

templates/partials/postCard.html

@@ -9,7 +9,7 @@
 {% endif %}
 {% endif %}
 
-<div class="flex flex-col rounded-lg shadow-lg overflow-hidden">
+<div class="flex flex-col rounded-lg shadow-lg overflow-hidden border">
   <div class="flex-1 border-b">
     <a href="{{ post.permalink }}" class="block">
         {% if post.extra.imgPath %}