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

content/people/mario_bassem/index.md

@@ -1,25 +0,0 @@
----
-title: Mario Bassem
-weight: 4
-description: Software Engineer
-taxonomies:
-    people: [mario_bassem]
-    memberships: [team]
-extra:
-    imgPath: mario.jpg
-    organizations: [threefold_tech]
-    countries: [Egypt]
-    cities: [Cairo]
-    private: 0
-    socialLinks: {
-        LinkedIn: https://www.linkedin.com/in/mario-wassef,
-        github: https://github.com/mariobassem,
-        websites: https://threefold.tech,
-    }
----
-
-<!--
-
-Software Engineer.  
-
---!>

content/people/mayar_osama/index.md

@@ -1,25 +0,0 @@
----
-title: Mayar Osama
-weight: 4
-description: Development Team
-taxonomies:
-    people: [mayar_osama]
-    memberships: [team]
-extra:
-    imgPath: mayar_osama.jpeg
-    organizations: [threefold_tech]
-    countries: [Egypt]
-    cities: [Cairo]
-    private: 0
-    socialLinks: {
-        LinkedIn: https://www.linkedin.com/in/mayar-osama-0177a4204/,
-        github: https://github.com/maayarosama,
-        websites: https://threefold.tech,
-    }
----
-
-<!--
-
-Mayar is a Software Engineer who has over 1 year of practical experience. She's experienced in working with different programming languages as python and go, as well as popular JS frameworks & libraries such as Vue, Svelte & React in addition to cloud tools like Docker, Kubernetes & Helm.
-
---!>

templates/blogPage.html

@@ -55,9 +55,10 @@
               </ul>
             </div>
 
-            <div class="pl-3 flex flex-col text-xs leading-none uppercase">
+            <div class="pl-3 flex flex-col text-xs leading-none uppercase text-gray-400">
               {% if author %}
-              <a href="{{author.permalink}}" class="text-gray-400 text-xs">{{ author.title }}</a>
+              {{ author.title }}
+              <!-- <a href="{{author.permalink}}" class="text-gray-400 text-xs">{{ author.title }}</a> -->
               {% endif %}
               <p class="text-gray-400 text-xs">
                 <time datetime="{{ page.date }}"> {{ page.date | date(format="%B %e, %Y", timezone="America/Chicago")

templates/newsPage.html

@@ -58,7 +58,7 @@
                         {% 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)) %}
               <li class="author-list-item">
-                <a href="{{author.permalink}}" tooltip="{{author.title}}">
+                <!-- <a href="{{author.permalink}}" tooltip="{{author.title}}"> -->
                   <img src="{{author_img}}" alt="{{ author.title }}" class="
                     w-8
                     h-8
@@ -68,7 +68,7 @@
                     bg-gray-200
                     border border-gray-600
                   " />
-                </a>
+                <!-- </a> -->
               </li>
               {% endif %}
               {% endfor %}
@@ -86,8 +86,8 @@
             {% 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 class="text-xs leading-none uppercase">
+              <span class="text-xs leading-none uppercase">{{ author.title }}
-                <a href="{{author.permalink}}" tooltip="{{author.title}}" class="hover:underline text-gray-400">{{ author.title }}</a>
+                <!-- <a href="{{author.permalink}}" tooltip="{{author.title}}" class="hover:underline text-gray-400">{{ author.title }}</a> -->
               </span>
               {% endif %}
                 {% endfor %}

templates/partials/featuredBlog.html

@@ -27,7 +27,8 @@
         {% 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-200"> <img
+        <!-- <a href="{{author.permalink}}" tooltip="{{author.title}}" class="capitalize	text-gray-200"> -->
+          <img
             src="{{ author_img }}" alt="{{ author.title }}" class="
             inline-flex 
           w-8
@@ -35,7 +36,8 @@
           rounded-full
           bg-gray-200
           border border-gray-400
-        " /> {{ author.title }}</a>
+        " /> {{ author.title }}
+      <!-- </a> -->
         {% endfor %}
       </h4>
 

templates/partials/featuredNews.html

@@ -19,7 +19,8 @@
         {% 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-200"> <img
+        <!-- <a href="{{author.permalink}}" tooltip="{{author.title}}" class="capitalize	text-gray-200"> -->
+          <img
             src="{{ author_img }}" alt="{{ author.title }}" class="
             inline-flex 
           w-8
@@ -27,7 +28,8 @@
           rounded-full
           bg-gray-200
           border-2 border-white
-        " /> {{ author.title }}</a>
+        " /> {{ author.title }}
+      <!-- </a> -->
         {% endfor %}
       </h4>
 

templates/partials/tagCard.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 border-gray-600">
   <div class="flex-1">
     <a href={{ post.permalink }} class="block">
       <div class="flex-shrink-0">
@@ -6,13 +6,13 @@
         <img class="h-48 w-full mx-auto object-cover" src={{ post.permalink }}{{post.extra.imgPath}} alt="" />
         {%endif %}
     </div>
-      <div class="flex-1 bg-white p-6 flex flex-col justify-between">
+      <div class="flex-1 p-6 flex flex-col justify-between">
 
-        <h3 class="mt-2 text-xl leading-7 font-medium text-gray-900 text-left not-italic">
+        <h3 class="mt-2 text-xl leading-7 font-medium text-gray-100 text-left not-italic">
           {{ post.title }}
         </h3>
         {% if post.description %}
-        <p class="mt-3 text-sm font-normal leading-6 text-gray-500 text-left">
+        <p class="mt-3 text-sm font-normal leading-6 text-gray-300 text-left">
           {{ post.description }}
         </p>
         {% endif %}

templates/partials/tagsCards.html

@@ -18,7 +18,7 @@
             {% include "partials/tagCard.html" %} 
         {%endif%} {%- endfor %}
     </div>
-    <hr class="mt-6" />
+    <hr class="my-10 border-gray-700" />
     <p class="text-center text-sm mt-2 mb-16">
       {% if paginator.previous %}
       <a

templates/partials/tagsSidebar.html

@@ -1,12 +1,12 @@
 <div class="mx-8 md:mx-4 flex flex-col">
     <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 BY</h4>
+        <h4 class="text-base not-italic font-medium leading-6 text-white mb-6"> FILTER BY</h4>
         {% set taxonomy = get_taxonomy(kind="tags") %}
         {% set tags = taxonomy.items %}
         {% for tag in tags %}
         {% set path = tag.name | slugify %}
         {% set fullpath = "/tags/" ~ path %}
-        <a id="{{path}}" class="mb-3 text-black font-normal" href={{fullpath}}> #{{tag.name}} </a>
+        <a id="{{path}}" class="mb-3 text-gray-300 font-normal" href={{fullpath}}> #{{tag.name}} </a>
         {% endfor %}
     </div>
 </div>
@@ -16,7 +16,7 @@
         let activeCategory = window.location.pathname.split("/")[2]
         if (typeof activeCategory === "undefined") { activeLink = document.getElementById("all") }
         else { activeLink = document.getElementById(activeCategory) }
-        activeLink.className = activeLink.className.replace("text-black font-normal", "text-black font-semibold");
+        activeLink.className = activeLink.className.replace("text-gray-300 font-normal", "text-gray-300 font-semibold");
     }
 
     setActiveCategory()

templates/tags/single.html

@@ -4,7 +4,7 @@
 
 <main class="pt-16">
 
-    <div class="flex flex-col md:flex-row">
+    <div class="flex flex-col md:flex-row container mx-auto my-6">
         {% include "partials/tagsCards.html" %}
         {% include "partials/tagsSidebar.html" %}
     </div>