From 9f4a8e1883acedd499045c1d4b5675d05b37241d Mon Sep 17 00:00:00 2001
From: Vilnite <vilnitekristine@gmail.com>
Date: Tue, 6 Apr 2021 12:32:48 +0300
Subject: [PATCH 1/6] updated navbar

---
 content/navigation/navigation.md               |  17 ++++++-----------
 .../comparison/main/main.md                    |   0
 .../comparison/section1/privacy.png            | Bin
 .../comparison/section1/private.svg            |   0
 .../comparison/section1/section1.md            |   0
 .../comparison/section2/equal.svg              |   0
 .../comparison/section2/equality.png           | Bin
 .../comparison/section2/section2.md            |   0
 .../comparison/section3/section3.md            |   0
 .../comparison/section3/sustainability.png     | Bin
 .../comparison/section3/sustainable.svg        |   0
 .../productData/main/main.md                   |   0
 .../productData/product1/farming.md            |   0
 .../productData/product1/farming.png           | Bin
 .../productData/product1/farming.svg           |   0
 .../productData/product2/cloud.md              |   0
 .../productData/product2/cloud.png             | Bin
 .../productData/product2/cloud.svg             |   0
 .../productData/product3/marketplace.md        |   0
 .../productData/product3/marketplace.png       | Bin
 .../productData/product3/marketplace.svg       |   0
 .../productData/product4/twin.md               |   0
 .../productData/product4/twin.png              | Bin
 .../productData/product4/twin.svg              |   0
 .../productData/product5/tech.md               |   0
 .../productData/product5/tech.png              | Bin
 .../productData/product5/tech.svg              |   0
 .../productData/product6/aci.md                |   0
 .../productData/product6/aci.png               | Bin
 .../productData/product6/aci.svg               |   0
 .../products.md => universe/universe.md}       |   2 +-
 31 files changed, 7 insertions(+), 12 deletions(-)
 rename content/page/{products => universe}/comparison/main/main.md (100%)
 rename content/page/{products => universe}/comparison/section1/privacy.png (100%)
 rename content/page/{products => universe}/comparison/section1/private.svg (100%)
 rename content/page/{products => universe}/comparison/section1/section1.md (100%)
 rename content/page/{products => universe}/comparison/section2/equal.svg (100%)
 rename content/page/{products => universe}/comparison/section2/equality.png (100%)
 rename content/page/{products => universe}/comparison/section2/section2.md (100%)
 rename content/page/{products => universe}/comparison/section3/section3.md (100%)
 rename content/page/{products => universe}/comparison/section3/sustainability.png (100%)
 rename content/page/{products => universe}/comparison/section3/sustainable.svg (100%)
 rename content/page/{products => universe}/productData/main/main.md (100%)
 rename content/page/{products => universe}/productData/product1/farming.md (100%)
 rename content/page/{products => universe}/productData/product1/farming.png (100%)
 rename content/page/{products => universe}/productData/product1/farming.svg (100%)
 rename content/page/{products => universe}/productData/product2/cloud.md (100%)
 rename content/page/{products => universe}/productData/product2/cloud.png (100%)
 rename content/page/{products => universe}/productData/product2/cloud.svg (100%)
 rename content/page/{products => universe}/productData/product3/marketplace.md (100%)
 rename content/page/{products => universe}/productData/product3/marketplace.png (100%)
 rename content/page/{products => universe}/productData/product3/marketplace.svg (100%)
 rename content/page/{products => universe}/productData/product4/twin.md (100%)
 rename content/page/{products => universe}/productData/product4/twin.png (100%)
 rename content/page/{products => universe}/productData/product4/twin.svg (100%)
 rename content/page/{products => universe}/productData/product5/tech.md (100%)
 rename content/page/{products => universe}/productData/product5/tech.png (100%)
 rename content/page/{products => universe}/productData/product5/tech.svg (100%)
 rename content/page/{products => universe}/productData/product6/aci.md (100%)
 rename content/page/{products => universe}/productData/product6/aci.png (100%)
 rename content/page/{products => universe}/productData/product6/aci.svg (100%)
 rename content/page/{products/products.md => universe/universe.md} (88%)

diff --git a/content/navigation/navigation.md b/content/navigation/navigation.md
index d52926061..d1669ae88 100644
--- a/content/navigation/navigation.md
+++ b/content/navigation/navigation.md
@@ -1,8 +1,12 @@
 ---
 id: navigation
 navLinks:
-  - name: PRODUCTS
-    link: /products
+  - name: HOME
+    link: /
+    external: false
+    expandable: false
+  - name: UNIVERSE
+    link: /universe
     external: false
     expandable: false
   - name: WHY
@@ -36,18 +40,9 @@ navLinks:
     submenu:
       - title: Team
         path: /team
-
       - title: Partners
         path: /partners
 
-      - title: Conscious Internet
-        path: /aci
-        external: true
-
-      - title: ThreeFold Tech
-        path: https://threefold.tech/
-        external: true
-
   - name: MORE
     link: ""
     external: false
diff --git a/content/page/products/comparison/main/main.md b/content/page/universe/comparison/main/main.md
similarity index 100%
rename from content/page/products/comparison/main/main.md
rename to content/page/universe/comparison/main/main.md
diff --git a/content/page/products/comparison/section1/privacy.png b/content/page/universe/comparison/section1/privacy.png
similarity index 100%
rename from content/page/products/comparison/section1/privacy.png
rename to content/page/universe/comparison/section1/privacy.png
diff --git a/content/page/products/comparison/section1/private.svg b/content/page/universe/comparison/section1/private.svg
similarity index 100%
rename from content/page/products/comparison/section1/private.svg
rename to content/page/universe/comparison/section1/private.svg
diff --git a/content/page/products/comparison/section1/section1.md b/content/page/universe/comparison/section1/section1.md
similarity index 100%
rename from content/page/products/comparison/section1/section1.md
rename to content/page/universe/comparison/section1/section1.md
diff --git a/content/page/products/comparison/section2/equal.svg b/content/page/universe/comparison/section2/equal.svg
similarity index 100%
rename from content/page/products/comparison/section2/equal.svg
rename to content/page/universe/comparison/section2/equal.svg
diff --git a/content/page/products/comparison/section2/equality.png b/content/page/universe/comparison/section2/equality.png
similarity index 100%
rename from content/page/products/comparison/section2/equality.png
rename to content/page/universe/comparison/section2/equality.png
diff --git a/content/page/products/comparison/section2/section2.md b/content/page/universe/comparison/section2/section2.md
similarity index 100%
rename from content/page/products/comparison/section2/section2.md
rename to content/page/universe/comparison/section2/section2.md
diff --git a/content/page/products/comparison/section3/section3.md b/content/page/universe/comparison/section3/section3.md
similarity index 100%
rename from content/page/products/comparison/section3/section3.md
rename to content/page/universe/comparison/section3/section3.md
diff --git a/content/page/products/comparison/section3/sustainability.png b/content/page/universe/comparison/section3/sustainability.png
similarity index 100%
rename from content/page/products/comparison/section3/sustainability.png
rename to content/page/universe/comparison/section3/sustainability.png
diff --git a/content/page/products/comparison/section3/sustainable.svg b/content/page/universe/comparison/section3/sustainable.svg
similarity index 100%
rename from content/page/products/comparison/section3/sustainable.svg
rename to content/page/universe/comparison/section3/sustainable.svg
diff --git a/content/page/products/productData/main/main.md b/content/page/universe/productData/main/main.md
similarity index 100%
rename from content/page/products/productData/main/main.md
rename to content/page/universe/productData/main/main.md
diff --git a/content/page/products/productData/product1/farming.md b/content/page/universe/productData/product1/farming.md
similarity index 100%
rename from content/page/products/productData/product1/farming.md
rename to content/page/universe/productData/product1/farming.md
diff --git a/content/page/products/productData/product1/farming.png b/content/page/universe/productData/product1/farming.png
similarity index 100%
rename from content/page/products/productData/product1/farming.png
rename to content/page/universe/productData/product1/farming.png
diff --git a/content/page/products/productData/product1/farming.svg b/content/page/universe/productData/product1/farming.svg
similarity index 100%
rename from content/page/products/productData/product1/farming.svg
rename to content/page/universe/productData/product1/farming.svg
diff --git a/content/page/products/productData/product2/cloud.md b/content/page/universe/productData/product2/cloud.md
similarity index 100%
rename from content/page/products/productData/product2/cloud.md
rename to content/page/universe/productData/product2/cloud.md
diff --git a/content/page/products/productData/product2/cloud.png b/content/page/universe/productData/product2/cloud.png
similarity index 100%
rename from content/page/products/productData/product2/cloud.png
rename to content/page/universe/productData/product2/cloud.png
diff --git a/content/page/products/productData/product2/cloud.svg b/content/page/universe/productData/product2/cloud.svg
similarity index 100%
rename from content/page/products/productData/product2/cloud.svg
rename to content/page/universe/productData/product2/cloud.svg
diff --git a/content/page/products/productData/product3/marketplace.md b/content/page/universe/productData/product3/marketplace.md
similarity index 100%
rename from content/page/products/productData/product3/marketplace.md
rename to content/page/universe/productData/product3/marketplace.md
diff --git a/content/page/products/productData/product3/marketplace.png b/content/page/universe/productData/product3/marketplace.png
similarity index 100%
rename from content/page/products/productData/product3/marketplace.png
rename to content/page/universe/productData/product3/marketplace.png
diff --git a/content/page/products/productData/product3/marketplace.svg b/content/page/universe/productData/product3/marketplace.svg
similarity index 100%
rename from content/page/products/productData/product3/marketplace.svg
rename to content/page/universe/productData/product3/marketplace.svg
diff --git a/content/page/products/productData/product4/twin.md b/content/page/universe/productData/product4/twin.md
similarity index 100%
rename from content/page/products/productData/product4/twin.md
rename to content/page/universe/productData/product4/twin.md
diff --git a/content/page/products/productData/product4/twin.png b/content/page/universe/productData/product4/twin.png
similarity index 100%
rename from content/page/products/productData/product4/twin.png
rename to content/page/universe/productData/product4/twin.png
diff --git a/content/page/products/productData/product4/twin.svg b/content/page/universe/productData/product4/twin.svg
similarity index 100%
rename from content/page/products/productData/product4/twin.svg
rename to content/page/universe/productData/product4/twin.svg
diff --git a/content/page/products/productData/product5/tech.md b/content/page/universe/productData/product5/tech.md
similarity index 100%
rename from content/page/products/productData/product5/tech.md
rename to content/page/universe/productData/product5/tech.md
diff --git a/content/page/products/productData/product5/tech.png b/content/page/universe/productData/product5/tech.png
similarity index 100%
rename from content/page/products/productData/product5/tech.png
rename to content/page/universe/productData/product5/tech.png
diff --git a/content/page/products/productData/product5/tech.svg b/content/page/universe/productData/product5/tech.svg
similarity index 100%
rename from content/page/products/productData/product5/tech.svg
rename to content/page/universe/productData/product5/tech.svg
diff --git a/content/page/products/productData/product6/aci.md b/content/page/universe/productData/product6/aci.md
similarity index 100%
rename from content/page/products/productData/product6/aci.md
rename to content/page/universe/productData/product6/aci.md
diff --git a/content/page/products/productData/product6/aci.png b/content/page/universe/productData/product6/aci.png
similarity index 100%
rename from content/page/products/productData/product6/aci.png
rename to content/page/universe/productData/product6/aci.png
diff --git a/content/page/products/productData/product6/aci.svg b/content/page/universe/productData/product6/aci.svg
similarity index 100%
rename from content/page/products/productData/product6/aci.svg
rename to content/page/universe/productData/product6/aci.svg
diff --git a/content/page/products/products.md b/content/page/universe/universe.md
similarity index 88%
rename from content/page/products/products.md
rename to content/page/universe/universe.md
index 18cef75ca..9f6eb02c9 100644
--- a/content/page/products/products.md
+++ b/content/page/universe/universe.md
@@ -1,5 +1,5 @@
 ---
-id: products
+id: universe
 productsMain: product_page
 productData: [farming, cloud, marketplace, twin, tech, aci]
 ---

From 440cf3f213fa3d843de3f8da209333cfc5def842 Mon Sep 17 00:00:00 2001
From: Vilnite <vilnitekristine@gmail.com>
Date: Tue, 6 Apr 2021 12:44:14 +0300
Subject: [PATCH 2/6] button fix

---
 src/components/custom/sections/CallToAction.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/custom/sections/CallToAction.vue b/src/components/custom/sections/CallToAction.vue
index 5ab5d0673..d001bf491 100644
--- a/src/components/custom/sections/CallToAction.vue
+++ b/src/components/custom/sections/CallToAction.vue
@@ -19,25 +19,25 @@
       <div class="mt-8 tracking-wide leading-loose" v-if="cta.video_button">
         <a
           @click="toggleModal"
-          class="inline-block bg-blue-900 lowercase text-sm learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 mb-4 rounded shadow rounded-full"
+          class="inline-block bg-blue-900 text-sm learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 mb-4 rounded shadow rounded-full"
           >{{ cta.video_button }}</a
         >
       </div>
       <g-link
-        class="inline-block bg-blue-900 lowercase text-md learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 mb-4 rounded shadow rounded-full"
+        class="inline-block bg-blue-900 text-md learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 mb-4 rounded shadow rounded-full"
         target="_blank"
         v-if="cta.button"
         :to="cta.link"
         >{{ cta.button }}</g-link
       >
       <g-link
-        class="inline-block bg-blue-900 lowercase text-sm learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 mb-4 rounded shadow rounded-full"
+        class="inline-block bg-blue-900 text-sm learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 mb-4 rounded shadow rounded-full"
         v-if="cta.button2"
         :to="cta.link2"
         >{{ cta.button2 }}</g-link
       >
       <g-link
-        class="inline-block bg-blue-900 lowercase text-sm learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 mb-4 rounded shadow rounded-full"
+        class="inline-block bg-blue-900 text-sm learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 mb-4 rounded shadow rounded-full"
         v-if="cta.button3"
         :to="cta.link3"
         >{{ cta.button3 }}</g-link

From 0b4852de481eef2d544a52c62e89cc2b2fbc8720 Mon Sep 17 00:00:00 2001
From: ehab-hassan <hassane@codescalers.com>
Date: Tue, 6 Apr 2021 12:19:19 +0200
Subject: [PATCH 3/6] fix conflict

---
 src/components/custom/Navbar/Navbar.vue              | 10 +++++-----
 src/components/custom/sections/CallToAction.vue      | 11 +++++------
 .../marketing/sections/cta-sections/BrandPanel.vue   |  2 +-
 .../marketing/sections/cta-sections/Header.vue       | 12 ++++++------
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/components/custom/Navbar/Navbar.vue b/src/components/custom/Navbar/Navbar.vue
index 9a5da317a..8ec07e448 100644
--- a/src/components/custom/Navbar/Navbar.vue
+++ b/src/components/custom/Navbar/Navbar.vue
@@ -173,17 +173,17 @@
           <a
             v-else-if="element.external"
             :href="element.link"
-            @click="clicked"
+            @click.native="clicked"
             target="_blank"
             class="inline-flex sm:flex uppercase p-2 mr-4 animated-link"
             >{{ element.name }}</a
           >
-          <a
+         <g-link
             v-else
-            :href="element.link"
-            @click="clicked"
+            :to="element.link"
+            @click.native="clicked"
             class="inline-flex sm:flex uppercase p-2 mr-4 animated-link"
-            >{{ element.name }}</a
+            >{{ element.name }}</g-link
           >
         </div>
         <!-- <div
diff --git a/src/components/custom/sections/CallToAction.vue b/src/components/custom/sections/CallToAction.vue
index d001bf491..d42838a94 100644
--- a/src/components/custom/sections/CallToAction.vue
+++ b/src/components/custom/sections/CallToAction.vue
@@ -37,8 +37,7 @@
         >{{ cta.button2 }}</g-link
       >
       <g-link
-        class="inline-block bg-blue-900 text-sm learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 mb-4 rounded shadow rounded-full"
-        v-if="cta.button3"
+        class="inline-block bg-blue-900 text-sm learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 mb-4 rounded shadow rounded-full"       v-if="cta.button3"
         :to="cta.link3"
         >{{ cta.button3 }}</g-link
       >
@@ -58,25 +57,25 @@
       <div class="mt-8 tracking-wide leading-loose" v-if="cta.video_button">
         <a
           @click="toggleModal"
-          class="inline-block bg-blue-900 lowercase text-sm learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 mb-4 rounded shadow rounded-full"
+          class="inline-block bg-blue-900 text-sm learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 mb-4 rounded shadow rounded-full"
           >{{ cta.video_button }}</a
         >
       </div>
       <a
-        class="inline-block lowercase bg-blue-900 lowercase text-sm learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 mb-4 rounded shadow rounded-full"
+        class="inline-block bg-blue-900 text-sm learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 mb-4 rounded shadow rounded-full"
         target="_blank"
         v-if="cta.button"
         :href="cta.link"
         >{{ cta.button }}</a
       >
       <g-link
-        class="inline-block lowercase bg-blue-900 lowercase text-sm learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 mb-4 rounded shadow rounded-full"
+        class="inline-block bg-blue-900 text-sm learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 mb-4 rounded shadow rounded-full"
         v-if="cta.button2"
         :to="cta.link2"
         >{{ cta.button2 }}</g-link
       >
       <g-link
-        class="inline-block lowercase bg-blue-900 lowercase text-sm learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 mb-4 rounded shadow rounded-full"
+        class="inline-block bg-blue-900 text-sm learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 mb-4 rounded shadow rounded-full"
         v-if="cta.button3"
         :to="cta.link3"
         >{{ cta.button3 }}</g-link
diff --git a/src/components/marketing/sections/cta-sections/BrandPanel.vue b/src/components/marketing/sections/cta-sections/BrandPanel.vue
index 6c0822255..b29a411e0 100644
--- a/src/components/marketing/sections/cta-sections/BrandPanel.vue
+++ b/src/components/marketing/sections/cta-sections/BrandPanel.vue
@@ -30,7 +30,7 @@
               v-if="brand.btnTxt"
               target="_blank"
               :href="brand.sourceUrl"
-              class="bg-blue-900 lowercase text-sm learn-button hover:bg-blue-800 text-white px-12 py-2 mr-3 shadow rounded-full"
+              class="bg-blue-900 text-sm learn-button hover:bg-blue-800 text-white px-12 py-2 mr-3 shadow rounded-full"
               >{{ brand.btnTxt }}</a
             >
           </div>
diff --git a/src/components/marketing/sections/cta-sections/Header.vue b/src/components/marketing/sections/cta-sections/Header.vue
index d7c3e5fef..0d2b4d577 100644
--- a/src/components/marketing/sections/cta-sections/Header.vue
+++ b/src/components/marketing/sections/cta-sections/Header.vue
@@ -25,13 +25,13 @@
           <a
             v-if="link.includes('http')"
             target="_blank"
-            class="nline-block bg-blue-900 lowercase text-sm learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 mb-4 rounded shadow rounded-full"
+            class="nline-block bg-blue-900 text-sm learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 mb-4 rounded shadow rounded-full"
             :href="link"
             >{{ button }}</a
           >
           <a
             v-else
-            class="nline-block bg-blue-900 lowercase text-md learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 mb-4 rounded shadow rounded-full"
+            class="nline-block bg-blue-900 text-md learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 mb-4 rounded shadow rounded-full"
             :href="link"
             >{{ button }}</a
           >
@@ -60,13 +60,13 @@
           <a
             v-if="link.includes('http')"
             target="_blank"
-            class="bg-blue-900 text-md lowercase learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mb-4 shadow rounded-full"
+            class="bg-blue-900 text-md learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mb-4 shadow rounded-full"
             :href="link"
             >{{ button }}</a
           >
           <a
             v-else
-            class="bg-blue-900 text-md  lowercase learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mb-4 shadow rounded-full"
+            class="bg-blue-900 text-md  learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mb-4 shadow rounded-full"
             :href="link"
             >{{ button }}</a
           >
@@ -91,13 +91,13 @@
           <a
             v-if="link.includes('http')"
             target="_blank"
-            class="inline-block lowercase bg-blue-900 text-sm learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 mb-4 rounded shadow rounded-full"
+            class="inline-block bg-blue-900 text-sm learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 mb-4 rounded shadow rounded-full"
             :href="link"
             >{{ button }}</a
           >
           <a
             v-else
-            class="inline-block lowercase bg-blue-900 text-md learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 mb-4 rounded shadow rounded-full"
+            class="inline-block bg-blue-900 text-md learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 mb-4 rounded shadow rounded-full"
             :href="link"
             >{{ button }}</a
           >

From 7c2ac0f6a4c0366cf60cd661b78592a753d3b731 Mon Sep 17 00:00:00 2001
From: ehab-hassan <hassane@codescalers.com>
Date: Tue, 6 Apr 2021 12:26:42 +0200
Subject: [PATCH 4/6] fix

---
 src/components/custom/sections/Comparison.vue                 | 4 ++--
 .../marketing/sections/cta-sections/ShowcaseProducts.vue      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/custom/sections/Comparison.vue b/src/components/custom/sections/Comparison.vue
index b56137a4c..077238057 100644
--- a/src/components/custom/sections/Comparison.vue
+++ b/src/components/custom/sections/Comparison.vue
@@ -37,13 +37,13 @@
         v-if="main.link.includes('http')"
         target="_blank"
         :href="main.link"
-        class="bg-blue-900 lowercase text-sm learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 rounded shadow rounded-full"
+        class="bg-blue-900 text-sm learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 rounded shadow rounded-full"
         >{{ main.button }}</a
       >
       <g-link
         v-else
         :href="main.link"
-        class="bg-blue-900 lowercase text-sm learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 rounded shadow rounded-full"
+        class="bg-blue-900 text-sm learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 rounded shadow rounded-full"
         >{{ main.button }}</g-link
       >
     </div>
diff --git a/src/components/marketing/sections/cta-sections/ShowcaseProducts.vue b/src/components/marketing/sections/cta-sections/ShowcaseProducts.vue
index e05d5bc37..a0295896f 100644
--- a/src/components/marketing/sections/cta-sections/ShowcaseProducts.vue
+++ b/src/components/marketing/sections/cta-sections/ShowcaseProducts.vue
@@ -61,13 +61,13 @@
         v-if="main.link.includes('http')"
         target="_blank"
         :href="main.link"
-        class="bg-blue-900 lowercase text-sm learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 rounded shadow rounded-full"
+        class="bg-blue-900 text-sm learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 rounded shadow rounded-full"
         >{{ main.button }}</a
       >
       <g-link
         v-else
         :href="main.link"
-        class="bg-blue-900 lowercase text-sm learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 rounded shadow rounded-full"
+        class="bg-blue-900 text-sm learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 rounded shadow rounded-full"
         >{{ main.button }}</g-link
       >
     </div>

From aea27da2f04120046d04d46b2a4d9f00a2bb688c Mon Sep 17 00:00:00 2001
From: Vilnite <vilnitekristine@gmail.com>
Date: Tue, 6 Apr 2021 13:51:37 +0300
Subject: [PATCH 5/6] few content updates per feedback

---
 content/page/token/partenerships/sec1/index.md   | 2 +-
 content/page/token/productData/product3/index.md | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/content/page/token/partenerships/sec1/index.md b/content/page/token/partenerships/sec1/index.md
index 8c8b64f1f..b8bea1942 100644
--- a/content/page/token/partenerships/sec1/index.md
+++ b/content/page/token/partenerships/sec1/index.md
@@ -1,7 +1,7 @@
 ---
 id: be_ur_bank
 img: ./be_ur_bank.png
-title: Be Your Own Bank
+title: Truly Yours
 ---
 
 TFT lets you be your own bank. You can control your own funds with your wallets as proof of ownership – no third parties needed.
diff --git a/content/page/token/productData/product3/index.md b/content/page/token/productData/product3/index.md
index 41ec082af..c2a119b90 100644
--- a/content/page/token/productData/product3/index.md
+++ b/content/page/token/productData/product3/index.md
@@ -1,8 +1,10 @@
 ---
 id: earn_interst
-title: EARN INTEREST
+title: BUY TFT
 image : ./earn_interst.png
 url :
 ---
 
-Earn even more by staking your TFTs (coming 2021).
+Earn even more by vesting your TFTs.
+
+Coming in 2021.

From 049d9ad66a168e6eaa2e327a2be418f224ec45f3 Mon Sep 17 00:00:00 2001
From: ehab-hassan <hassane@codescalers.com>
Date: Tue, 6 Apr 2021 13:27:37 +0200
Subject: [PATCH 6/6] fix font

---
 src/assets/scss/main.scss                                   | 5 +++++
 src/components/AppListItem.vue                              | 4 ++--
 src/components/custom/sections/CallToAction.vue             | 6 +++---
 .../marketing/sections/cta-sections/ShowcaseProducts.vue    | 4 ++--
 .../sections/cta-sections/ShowcaseProductsHome.vue          | 2 +-
 .../sections/team-sections/grid_with_large_round_images.vue | 4 ++--
 src/index.html                                              | 3 +--
 7 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/assets/scss/main.scss b/src/assets/scss/main.scss
index fed7a0267..555a26d7c 100644
--- a/src/assets/scss/main.scss
+++ b/src/assets/scss/main.scss
@@ -11,6 +11,11 @@ blockquote {
     }
 }
 
+
+body {
+    font-family: 'Lato', sans-serif;
+}
+
 body h2 {
     font-family: 'Lato', sans-serif;
 }
diff --git a/src/components/AppListItem.vue b/src/components/AppListItem.vue
index 8ee49f1cd..c80437351 100644
--- a/src/components/AppListItem.vue
+++ b/src/components/AppListItem.vue
@@ -1,11 +1,11 @@
 <template>
   <div class="flex flex-wrap with-large pt-8 pb-8 mx-4 sm:-mx-4">
     <div class="text-center mx-auto my-4">
-      <h1 class="text-3xl text-gray-900 font-light sm:text-9xl sm:leading-10">
+      <h1 class="text-4xl text-gray-900 font-light sm:text-9xl sm:leading-10">
         {{ main.title }} <span class="font-extrabold">{{ main.slogan }}</span>
       </h1>
       <div
-        class="mt-3 max-w-2xl mx-auto text-lg leading-7 text-gray-700 sm:mt-4"
+        class="mt-3 max-w-2xl mx-auto text-gray-600 sm:mt-4"
         v-html="main.content"
       ></div>
     </div>
diff --git a/src/components/custom/sections/CallToAction.vue b/src/components/custom/sections/CallToAction.vue
index d42838a94..c407facd0 100644
--- a/src/components/custom/sections/CallToAction.vue
+++ b/src/components/custom/sections/CallToAction.vue
@@ -14,7 +14,7 @@
       </span>
       <div
         v-html="cta.content"
-        class="mb-8 mt-10 text-center text-lg text-gray-800"
+        class="mt-6 mb-8 text-gray-600"
       ></div>
       <div class="mt-8 tracking-wide leading-loose" v-if="cta.video_button">
         <a
@@ -46,13 +46,13 @@
     <div class="w-full max-w-7xl mx-auto" v-else>
       <h2
         v-if="cta.title"
-        class="text-4xl mb-2 leading-tight font-semibold font-heading"
+        class="text-4xl mb-2 uppercase leading-tight font-semibold font-heading"
       >
         {{ cta.title }}
       </h2>
       <div
         v-html="cta.content"
-        class="mt-6 mb-8 text-lg text-gray-700 leading-relaxed"
+        class="mt-6 mb-8 text-gray-600"
       ></div>
       <div class="mt-8 tracking-wide leading-loose" v-if="cta.video_button">
         <a
diff --git a/src/components/marketing/sections/cta-sections/ShowcaseProducts.vue b/src/components/marketing/sections/cta-sections/ShowcaseProducts.vue
index a0295896f..4c37348a9 100644
--- a/src/components/marketing/sections/cta-sections/ShowcaseProducts.vue
+++ b/src/components/marketing/sections/cta-sections/ShowcaseProducts.vue
@@ -9,7 +9,7 @@
       </h2>
       <p
         v-if="main !== null && main.subtitle"
-        class="mb-6 text-m tracking-widest text-gray-800"
+        class="mb-6 text-gray-600"
       >
         {{ main.subtitle }}
       </p>
@@ -29,7 +29,7 @@
         <div class="px-2 py-2">
           <g-image class="py-4" :src="img(product.image)" />
           <div class="font-bold text-xl mb-2">{{ product.title }}</div>
-          <div v-html="product.content" class="text-gray-700 text-base"></div>
+          <div v-html="product.content" class="text-gray-600"></div>
         </div>
       </a>
     </div>
diff --git a/src/components/marketing/sections/cta-sections/ShowcaseProductsHome.vue b/src/components/marketing/sections/cta-sections/ShowcaseProductsHome.vue
index b3d07f9a4..6f6d4f491 100644
--- a/src/components/marketing/sections/cta-sections/ShowcaseProductsHome.vue
+++ b/src/components/marketing/sections/cta-sections/ShowcaseProductsHome.vue
@@ -23,7 +23,7 @@
         <div class="px-2 py-2">
           <g-image class="py-4" :src="img(product.image)" />
           <!-- <div class="font-bold text-xl mb-2">{{ product.title }}</div> -->
-          <div v-html="product.content" class="text-gray-700 text-base"></div>
+          <div v-html="product.content" class="text-gray-600"></div>
         </div>
       </a>
     </div>
diff --git a/src/components/marketing/sections/team-sections/grid_with_large_round_images.vue b/src/components/marketing/sections/team-sections/grid_with_large_round_images.vue
index 498d1f394..b9e95706c 100644
--- a/src/components/marketing/sections/team-sections/grid_with_large_round_images.vue
+++ b/src/components/marketing/sections/team-sections/grid_with_large_round_images.vue
@@ -8,7 +8,7 @@
           {{ main.title }} <span class="font-extrabold">{{ main.slogan }}</span>
         </h1>
         <div
-          class="mt-3 max-w-2xl mx-auto text-xl leading-7 text-gray-700 sm:mt-4"
+          class="mt-3 max-w-2xl mx-auto text-gray-600 sm:mt-4"
           v-html="main.content"
         ></div>
       </div>
@@ -29,7 +29,7 @@
             <div class="text-lg leading-6 font-medium space-y-1">
               <h4>{{ partnership.title }}</h4>
               <div
-                class="text-base text-gray-700"
+                class="text-base text-gray-600"
                 v-html="partnership.content"
               ></div>
             </div>
diff --git a/src/index.html b/src/index.html
index 3cd52bb46..cbb5dc3dc 100644
--- a/src/index.html
+++ b/src/index.html
@@ -3,8 +3,7 @@
 
 <head>
     ${head}
-    <link rel="preconnect" href="https://fonts.gstatic.com" />
-    <link href="https://fonts.googleapis.com/css2?family=Roboto:wght@300&display=swap" rel="stylesheet" />
+    
     <link rel="preconnect" href="https://fonts.gstatic.com">
     <link href="https://fonts.googleapis.com/css2?family=Lato&family=Nunito:wght@700&display=swap" rel="stylesheet">