design fixes, hiring subpages, and hiring categories added

config.toml

@@ -57,6 +57,12 @@ feed = true
 paginate_by = 2
 paginate_path = "/blog-posts"
 
+[[taxonomies]]
+name = "hiring_categories"
+feed = true
+paginate_by = 2
+paginate_path = "/blog-posts"
+
 [extra]
 # Put all your custom variables here
 

content/_index.md

@@ -28,7 +28,7 @@ sustainable and inclusive future.
 
 {% end %}
 
-{% row(isLean="true") %}
+{% row(style="lean") %}
 
 ![Image](/images/threefold_img2.png)
 

content/blog/featured/index.md

@@ -1,5 +1,5 @@
 ---
-title: Bridges Connecting the ThreeFold Ecosystem to External Networks
+title: New Bridges Connecting the ThreeFold Ecosystem to External Networks
 description: Sinces the launch of ThreeFold Grid 3.0, TFT is now available on
   three blockchains – Stellar, Binance Smart Chain and the Substrate-based
   ThreeFold Blockchain (aka TF Chain).
@@ -12,12 +12,12 @@ taxonomies:
 extra:
   subtitle: The UNIQUE Post 1 subtitles
   author: HANNAH CORDES
-  imgPath: /images/ourworld_mycellium.png
+  imgPath: images/ourworld_mycellium.png
   date: 2018-10-17T19:40:00.000Z
   isFeatured: "true"
 ---
 
-![Image](images/threefold-blog.png)
+![Image](/images/threefold-blog.png)
 
 ## In-article heading --- it's an H2 because your title is the H1
 

content/footer/_index.md

@@ -8,7 +8,7 @@ extra:
   socialLinks: { Facebook: "https://", Github: "https://", Twitter: "https://" }
 ---
 
-{% row(isLean="true") %}
+{% row(style="lean") %}
 
 #### Purpose
 

content/header/_index.md

@@ -10,7 +10,7 @@ extra:
 
 - Learn
 
-{% row(isLean="true") %}
+{% row(style="lean") %}
 
 ### PURPOSE
 
@@ -20,6 +20,7 @@ extra:
 #### [The Internot](apage)
 
 Whats wrong with the [internet](apage)
+
 <br>
 
 #### Our Internet
@@ -77,7 +78,7 @@ Projects in OurWorld
 
 Be a part of the new internet
 
-- [Join us]("/careers")
+- [Join us]("/join-us")
 - [Blog]("/blog")
 
 {% end %}

content/join-us/_index.md

@@ -1,8 +1,7 @@
 ---
 title: "Join us"
-description: ""
+template: "section.html"
 insert_anchor_links: "left"
-template: "page.html"
 ---
 
 {% row(bgPath="/images/bernhard-eisenmann-unsplash.jpg") %}
@@ -121,3 +120,41 @@ Way more convenient, no need to remember all apps
 Less addictive behavior
 
 {% end %}
+
+{% row() %}
+
+## Find out how you can contribute
+
+<br>
+
+Think about ourworld like a global digital backbone, which allows everyone to extend their current physical life. It's a digital backbone created and owned by all of us. We need creatives, ideators, social entrepreneurs, developers, community builders and wisdom providers to reach our ultimate goal. If you want to be a part in making OurWorld become a reality, check out the ares we need the most help with.
+
+|||
+
+{% end %}
+
+---
+
+{% row(style="lean center") %}
+
+|||
+
+### Create
+
+|||
+
+### Share
+
+|||
+
+### Develop
+
+|||
+
+### Ideate
+
+|||
+
+{% end %}
+
+---

content/join-us/roles/_index.md

@@ -0,0 +1,3 @@
+---
+transparent: true
+---

content/join-us/roles/ourworld_ambassador.md

@@ -0,0 +1,162 @@
+---
+title: "OurWorld Ambassador"
+description: "Together we expand and create this OurWorld platform, with the purpose to give a better digital life to billions of people. Anyone is invited to build solutions and we need help reaching out to people and spreading the vision of a better digital world."
+insert_anchor_links: "left"
+updated: 2019-04-11T20:33:00-05:00 # Comment-out this line with a # if content is unchanged
+template: "page.html"
+---
+
+{% row(bgPath="/images/bernhard-eisenmann-unsplash.jpg") %}
+
+# Create OurWorld together
+
+<br>
+
+Together we expand and create this OurWorld platform, with the purpose to give a better digital life to billions of people. Anyone is invited to build solutions (experiences on top). 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.
+
+[Explore areas of creation](https://)
+
+|||
+
+{% end %}
+
+{% row() %}
+
+## OurWorld is powered by ThreeFold & Source Code Incubator
+
+<br>
+
+The Source Code Incubator and ThreeFold are changing this. OurWorld platform allows everyone to be equal, free and powerful. There is no reason to be afraid. The OurWorld platform allows developers to save on cost and provide better experience to their users. The platform is super complete.
+
+|||
+
+{% end %}
+
+{% row() %}
+
+## OurWorld Ecosystem
+
+<br>
+
+Join an ecosystem of gamechanging communities and organizations
+
+|||
+
+![Image](/images/tf_logo.png)
+![Image](/images/tf_logo.png)
+![Image](/images/tf_logo.png)
+
+|||
+
+![Image](/images/tf_logo.png)
+![Image](/images/tf_logo.png)
+![Image](/images/tf_logo.png)
+
+|||
+
+![Image](/images/tf_logo.png)
+![Image](/images/tf_logo.png)
+
+{% end %}
+
+{% row() %}
+
+## Our Values
+
+<br>
+
+OurWorld platform allows everyone to be equal, free and powerful. There is no reason to be afraid. The OurWorld platform allows developers to save on cost and provide better experience to their users.
+
+<br>
+
+|||
+
+|||
+
+{% end %}
+
+{% row() %}
+
+![Image](/images/tf_icon.png#small)
+
+### For the planet
+
+Carbon Removing Concept (green)
+Sustainable e.g. use less hardware
+Uses a lot less energy (can be upto 100x more efficient compared to today)
+
+|||
+
+![Image](/images/tf_icon.png#small)
+
+### For the end user
+
+Data is private and only owned by end-user.
+More performance, because twin is in country
+Less cost, because this infrastructure costs less
+Hackers & Manipulators have a lot less chance.
+Way more convenient, no need to remember all apps
+Less addictive behavior
+
+|||
+
+![Image](/images/tf_icon.png#small)
+
+### For the planet
+
+Carbon Removing Concept (green)
+Sustainable e.g. use less hardware
+Uses a lot less energy (can be upto 100x more efficient compared to today)
+
+|||
+
+![Image](/images/tf_icon.png#small)
+
+### For the end user
+
+Data is private and only owned by end-user.
+More performance, because twin is in country
+Less cost, because this infrastructure costs less
+Hackers & Manipulators have a lot less chance.
+Way more convenient, no need to remember all apps
+Less addictive behavior
+
+{% end %}
+
+{% row() %}
+
+## Find out how you can contribute
+
+<br>
+
+Think about ourworld like a global digital backbone, which allows everyone to extend their current physical life. It's a digital backbone created and owned by all of us. We need creatives, ideators, social entrepreneurs, developers, community builders and wisdom providers to reach our ultimate goal. If you want to be a part in making OurWorld become a reality, check out the ares we need the most help with.
+
+|||
+
+{% end %}
+
+---
+
+{% row(style="lean center") %}
+
+|||
+
+### Create
+
+|||
+
+### Share
+
+|||
+
+### Develop
+
+|||
+
+### Ideate
+
+|||
+
+{% end %}
+
+---

content/join-us/roles/ourworld_ambassador2.md

@@ -0,0 +1,164 @@
+---
+title: "OurWorld Ambassador"
+description: "Together we expand and create this OurWorld platform, with the purpose to give a better digital life to billions of people. Anyone is invited to build solutions and we need help reaching out to people and spreading the vision of a better digital world."
+insert_anchor_links: "left"
+updated: 2019-04-11T20:33:00-05:00 # Comment-out this line with a # if content is unchanged
+template: "page.html"
+taxonomies:
+  hiring_categories: ["Engineering"]
+---
+
+{% row(bgPath="/images/bernhard-eisenmann-unsplash.jpg") %}
+
+# Create OurWorld together
+
+<br>
+
+Together we expand and create this OurWorld platform, with the purpose to give a better digital life to billions of people. Anyone is invited to build solutions (experiences on top). 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.
+
+[Explore areas of creation](https://)
+
+|||
+
+{% end %}
+
+{% row() %}
+
+## OurWorld is powered by ThreeFold & Source Code Incubator
+
+<br>
+
+The Source Code Incubator and ThreeFold are changing this. OurWorld platform allows everyone to be equal, free and powerful. There is no reason to be afraid. The OurWorld platform allows developers to save on cost and provide better experience to their users. The platform is super complete.
+
+|||
+
+{% end %}
+
+{% row() %}
+
+## OurWorld Ecosystem
+
+<br>
+
+Join an ecosystem of gamechanging communities and organizations
+
+|||
+
+![Image](/images/tf_logo.png)
+![Image](/images/tf_logo.png)
+![Image](/images/tf_logo.png)
+
+|||
+
+![Image](/images/tf_logo.png)
+![Image](/images/tf_logo.png)
+![Image](/images/tf_logo.png)
+
+|||
+
+![Image](/images/tf_logo.png)
+![Image](/images/tf_logo.png)
+
+{% end %}
+
+{% row() %}
+
+## Our Values
+
+<br>
+
+OurWorld platform allows everyone to be equal, free and powerful. There is no reason to be afraid. The OurWorld platform allows developers to save on cost and provide better experience to their users.
+
+<br>
+
+|||
+
+|||
+
+{% end %}
+
+{% row() %}
+
+![Image](/images/tf_icon.png#small)
+
+### For the planet
+
+Carbon Removing Concept (green)
+Sustainable e.g. use less hardware
+Uses a lot less energy (can be upto 100x more efficient compared to today)
+
+|||
+
+![Image](/images/tf_icon.png#small)
+
+### For the end user
+
+Data is private and only owned by end-user.
+More performance, because twin is in country
+Less cost, because this infrastructure costs less
+Hackers & Manipulators have a lot less chance.
+Way more convenient, no need to remember all apps
+Less addictive behavior
+
+|||
+
+![Image](/images/tf_icon.png#small)
+
+### For the planet
+
+Carbon Removing Concept (green)
+Sustainable e.g. use less hardware
+Uses a lot less energy (can be upto 100x more efficient compared to today)
+
+|||
+
+![Image](/images/tf_icon.png#small)
+
+### For the end user
+
+Data is private and only owned by end-user.
+More performance, because twin is in country
+Less cost, because this infrastructure costs less
+Hackers & Manipulators have a lot less chance.
+Way more convenient, no need to remember all apps
+Less addictive behavior
+
+{% end %}
+
+{% row() %}
+
+## Find out how you can contribute
+
+<br>
+
+Think about ourworld like a global digital backbone, which allows everyone to extend their current physical life. It's a digital backbone created and owned by all of us. We need creatives, ideators, social entrepreneurs, developers, community builders and wisdom providers to reach our ultimate goal. If you want to be a part in making OurWorld become a reality, check out the ares we need the most help with.
+
+|||
+
+{% end %}
+
+---
+
+{% row(style="lean center") %}
+
+|||
+
+### Create
+
+|||
+
+### Share
+
+|||
+
+### Develop
+
+|||
+
+### Ideate
+
+|||
+
+{% end %}
+
+---

css/index.css

@@ -9,10 +9,6 @@
 @import "tailwindcss/utilities";
 @import url("https://fonts.googleapis.com/css2?family=Ubuntu&display=swap");
 
-* {
-  font-family: "Ubuntu";
-}
-
 /* Custom CSS for header partial */
 .backdrop-blur {
   -webkit-backdrop-filter: blur(40px);
@@ -48,7 +44,7 @@ img[src*="#large"] {
     @apply text-lg lg:text-xl font-light;
   }
   h5 {
-    @apply text-base lg:text-base font-light leading-8 my-2;
+    @apply text-base lg:text-base font-light leading-8;
   }
   nav p {
     @apply hidden sm:block md:block lg:block xl:block 2xl:block;
@@ -56,6 +52,12 @@ img[src*="#large"] {
   blockquote {
     @apply border-l-4 border-gray-400 mx-2 my-2 p-2;
   }
+  li {
+    @apply text-base lg:text-base font-normal;
+  }
+  li li {
+    @apply text-sm lg:text-sm font-light;
+  }
 }
 
 h3 {
@@ -63,7 +65,6 @@ h3 {
   font-style: normal;
   font-weight: 600;
   color: rgba(0, 0, 0, 0.5);
-  margin: 10px 0px;
 }
 
 p {

css/layout.css

@@ -11,8 +11,7 @@ body {
 }
 */
 
-p,
+p {
-li {
   /* for handling Markdown-created <p> and <li> */
   @apply text-lg;
 }
@@ -58,11 +57,13 @@ code {
   @apply text-xs;
 }
 
-nav a,
+nav h4 a:hover {
-nav a:focus,
+  @apply border-0 text-blue-300 font-light;
-nav a:hover,
+}
-nav a:active {
+nav h4 a,
-  @apply border-0 text-white hover:text-gray-300;
+nav h4 a:focus,
+nav h4 a:active {
+  @apply border-0 text-black font-light;
 }
 
 a {
@@ -225,9 +226,8 @@ article h4 {
   @apply tracking-tight mt-8 mb-6;
 }
 
-article p,
+article p {
-li {
+  @apply text-lg leading-relaxed;
-  @apply text-lg mt-6 mb-6 leading-relaxed;
 }
 
 article img.containedImage {
@@ -249,15 +249,13 @@ article img.containedImage {
 }
 
 @media screen and (min-width: 768px) {
-  article p,
+  article p {
-  li {
     @apply text-xl leading-relaxed;
   }
 }
 
 @media screen and (min-width: 1920px) {
-  article p,
+  article p {
-  li {
     @apply text-2xl leading-relaxed;
   }
 }

templates/_default/base.html

@@ -4,7 +4,6 @@
 
   {% include "partials/header.html" %}
 
-  {%- set section = get_section(path="_index.md") %}
   <body>
 
     <div id="content">

templates/hiring_categories/list.html

@@ -0,0 +1,4 @@
+{% extends "index.html" %}
+
+{% block content %}
+{% endblock content %}

templates/hiring_categories/single.html

@@ -0,0 +1,9 @@
+{% extends "index.html" %}
+
+{% block content %}
+
+<main class="pt-16">
+    {{section}}
+ </main> 
+ 
+ {% endblock content %}

templates/partials/header.html

@@ -134,8 +134,8 @@
     <nav>
         <div id="learn" class="z-50 mt-16 sm:mt-0 md:mt-0 lg:mt-0 xl:mt-0 2xl:mt-0 hidden opacity-0 -translate-y-1 absolute inset-x-0 transform shadow-lg md:backdrop-blur lg:backdrop-blur xl:backdrop-blur">
             <div class="bg-white lg:bg-semi-white md:bg-semi-white xl:bg-semi-white">
-              <div class="mx-8 px-4 py-4 sm:px-6 sm:py-6 lg:px-8 lg:py-8 xl:py-12">
+              <div class="mx-8 lg:mx-20 xl:mx-20 px-4 py-4 sm:px-6 sm:py-6 lg:px-8 lg:py-8 xl:py-12">
-                {{header_menu | replace(from="<br>", to="") | safe }}
+                {{header_menu | safe }}
               </div>
             </div>            
           </div>

templates/partials/pageBox.html

@@ -0,0 +1,3 @@
+<h4>{{page.title}}</h4>
+<p>{{page.description}}</p>
+<p>Last updated: {{page.updated}}</p>

templates/section.html

@@ -0,0 +1,18 @@
+{% extends "_default/base.html" %}
+
+{% block content %}
+
+<main class="pt-16">
+    {{ section.content | safe}}
+<div class="mx-20 flex">
+    {% for page in section.pages %}
+        <div class="w-3/12 m-8" >
+            {% include "partials/pageBox.html" %}
+        </div>
+    {% endfor %}
+</div>
+ 
+
+ </main> 
+
+ {% endblock content %}

templates/shortcodes/row.html

@@ -4,7 +4,8 @@ Divides markdown into columns by splitting content using column identifier "|||"
 Creates equal width blocks in a flex row.
 
 Parameters: 
-- isLean: if an isLean variable is passed, the row doesn't have outer margins
+- style: 
+    - lean: if style is lean, the row doesn't have outer margins
 - bgPath: if bgPath is passed, the row has a full width background
 -->
 
@@ -20,11 +21,19 @@ Parameters:
 
 {% set column_classes = "flex-1 lg:mx-8" %}
 
-{% if isLean %}
+{% if style %}
+
+{% if "lean" in style %}
     {% set classes = "relative flex flex-col lg:flex-row items-baseline w-full" %}
     {% set column_classes = "flex-1" %}
 {% endif %}
 
+{% if "center" in style %}
+    {% set classes = classes ~ " text-center" %}
+{% endif %}
+
+{% endif %}
+
 {% set styles = ""  %}
 
 {% if bgPath %}