Merge branch 'development'

.gitignore

@@ -18,3 +18,4 @@ install.sh
 run.sh
 build.sh
 package-lock.json
+dist

content/page/home/InTheNews/inTheNews.md

@@ -1,24 +1,23 @@
 ---
 id: in_the_news
-# Add logos in src/assets/images/ 
 partners:
-  - path: /test
+  - path: https://www.forbes.com/sites/johnkoetsier/2020/06/20/largest-distributed-peer-to-peer-grid-on-the-planet-laying-foundation-for-a-decentralized-internet/?fbclid=IwAR1WKCpqLcWPRWg5bPD6RCQE5JJjRPt6ey5vbEnu3db2FvJnp6-YKeVZNW8#79aa340e6798'
-    logo: https://tailwindui.com/img/logos/v1/transistor-logo.svg
+    logo: ./logos/forbers.png
 
-  - path: /test
+  - path: https://cointelegraph.com/news/peer-to-peer-internet-has-lofty-goal-to-bring-true-decentralization
-    logo: https://tailwindui.com/img/logos/v1/mirage-logo.svg
+    logo: ./logos/thecointel.png
 
-  - path: /test
+  - path: https://hackernoon.com/is-it-possible-to-create-a-decentralized-internet-this-startup-and-its-farmers-think-so-ey2e3ycf
-    logo: https://tailwindui.com/img/logos/v1/tuple-logo.svg
+    logo: ./logos/hackernoon.png
 
-  - path: /test
+  - path: https://cryptodaily.co.uk/2019/11/data-centers-are-under-pressure-to-meet-internet-demand
-    logo: https://tailwindui.com/img/logos/v1/laravel-logo.svg
+    logo: ./logos/cryptodaily.png
 
-  - path: /test
+  - path: https://gritdaily.com/belarus-governments-control-internet/
-    logo: https://tailwindui.com/img/logos/v1/statickit-logo.svg
+    logo: ./logos/grit_daily.png
 
-  - path: /test
+  - path: https://btcmanager.com/digibyte-dgb-threefold-decentralize-global-internet-architecture/?q=/digibyte-dgb-threefold-decentralize-global-internet-architecture/&q=/digibyte-dgb-threefold-decentralize-global-internet-architecture/
-    logo: https://tailwindui.com/img/logos/v1/statamic-logo.svg
+    logo: ./logos/btc.png
 ---
 
-Some text can go here
+In the News

content/page/home/home.md

@@ -14,6 +14,7 @@ link: https://farming.threefold.io/token #link for button
 comparisonMain: comparison
 comparisonSecs: [section1, section2, section3]
 brandPanel: brand_panel
+inTheNews: in_the_news
 solution_image2: ./cta_image.png
 cta: home_cta
 ---

src/assets/scss/main.scss

@@ -11,11 +11,11 @@ blockquote {
     }
 }
 
-body h2{
+body h2 {
     font-family: 'Roboto', sans-serif;
 }
 
-body p{
+body p {
     font-family: 'Roboto', sans-serif;
 }
 
@@ -44,7 +44,7 @@ ul {
     @apply ml-5;
 }
 
-:not(pre) > code {
+:not(pre)>code {
     @apply text-red-600;
     @apply text-base;
 }
@@ -84,7 +84,7 @@ ul {
 }
 
 .brandpanel {
-  background-color: #1072ba;
+    background-color: #C2AEEC;
 }
 
 .no-border {
@@ -120,18 +120,19 @@ ul {
 button:focus {
     outline: none;
 }
-.telegram_icon{
-  font-size: 1.2rem;
 
+.telegram_icon {
+    font-size: 1.2rem;
 }
 
 .text-8xl {
     font-size: 5rem;
     line-height: 1;
 }
+
 @media (min-width: 768px) {
-  .with-large > .flex-post:nth-child(5n),
+    .with-large>.flex-post:nth-child(5n),
-  .with-large > .flex-post:nth-child(5n-1) {
+    .with-large>.flex-post:nth-child(5n-1) {
         // @apply flex-100;
         flex: 1 1 50%;
         @apply flex-col;
@@ -158,8 +159,8 @@ button:focus {
             @apply text-xl;
         }
     }
-  .news > .flex-post:nth-child(5n),
+    .news>.flex-post:nth-child(5n),
-  .news > .flex-post:nth-child(5n-1) {
+    .news>.flex-post:nth-child(5n-1) {
         // @apply flex-100;
         flex: 1 1 50%;
         @apply flex-col;
@@ -307,7 +308,6 @@ button:focus {
 //     background-color: #191b1f;
 //   }
 //   .bg-white,
-   
 //   .bg-gray-100,
 //   .bg-gray-200 {
 //     background-color: #191b1f;

src/components/custom/Navbar/Navbar.vue

@@ -141,7 +141,7 @@
                     v-else
                     class="block px-4 py-2 mt-2 text-sm font-semibold bg-transparent rounded-lg dark:bg-transparent dark:hover:bg-gray-600 dark-:focus:bg-gray-600 dark:focus:text-white dark:hover:text-white dark:text-gray-200 md:mt-0 hover:text-gray-900 focus:text-gray-900 hover:bg-gray-200 focus:bg-gray-200 focus:outline-none focus:shadow-outline"
                     @click="open = false"
-                    :href="link.path"
+                    :href="$url(link.path)"
                     >{{ link.title }}</a
                   >
                 </div>

src/components/custom/TagFilterHeader.vue

@@ -65,7 +65,7 @@
                     v-for="tag in tags"
                     :key="tag.path"
                     class="cursor-pointer block px-4 py-2 mt-2 text-sm font-semibold bg-transparent rounded-lg dark:bg-transparent dark:hover:bg-gray-600 dark-:focus:bg-gray-600 dark:focus:text-white dark:hover:text-white dark:text-gray-200 md:mt-0 hover:text-gray-900 focus:text-gray-900 hover:bg-gray-200 focus:bg-gray-200 focus:outline-none focus:shadow-outline"
-                    :href="tag.path"
+                    :href="$url(tag.path)"
                     @click.self="open = false"
                     >{{ tag.title }}</a
                   >

src/components/marketing/sections/cta-sections/BrandPanel.vue

@@ -22,7 +22,7 @@
             ></div>
             <g-link
               :to="brand.sourceUrl"
-              class="bg-teal-300 text-sm learn-button hover:bg-teal-400 text-gray-900 px-12 py-2 mr-3 rounded shadow rounded-full"
+              class="bg-teal-300 text-sm learn-button hover:bg-57EEF8-400 text-gray-900 px-12 py-2 mr-3 rounded shadow rounded-full"
               >{{ brand.btnTxt }}</g-link
             >
           </div>

src/components/marketing/sections/logo-clouds/off_white_grid.vue

@@ -1,11 +1,10 @@
 <template>
   <div class="bg-white">
     <div class="max-w-screen-xl mx-auto py-12 px-4 sm:px-6 lg:py-16 lg:px-8">
-      <p
+      <div
+        v-html="news.content"
         class="text-center text-base leading-6 font-semibold uppercase text-gray-600 tracking-wider"
-      >
+      ></div>
-        {{ news.excerpt }}
-      </p>
       <div class="mt-6 grid grid-cols-2 gap-0.5 md:grid-cols-3 lg:mt-8">
         <g-link
           v-for="partner in news.partners"
@@ -14,15 +13,7 @@
           target="_blank"
           class="col-span-1 flex justify-center py-8 px-8 m-1 bg-gray-100"
         >
-          <!-- <img
+          <img class="max-h-12" :src="img(partner.logo)" />
-            class="max-h-12"
-            :src="require(`!!assets-loader!@images/${partner.logo}`)"
-          /> -->
-
-          <img
-            class="max-h-12"
-            :src="partner.logo"
-          />
         </g-link>
       </div>
     </div>
@@ -32,5 +23,12 @@
 <script>
 export default {
   props: ["news"],
+  methods: {
+    img(image) {
+      if (!image) return "";
+      if (image.src) return image.src;
+      return image;
+    },
+  },
 };
 </script>

src/pages/Index.vue

@@ -1,9 +1,11 @@
 <template>
   <Layout :hideHeader="true" :disableScroll="true">
+    <div class="container-fluid sm:pxi-0 mx-auto overflow-x-hidden">
       <g-image
         v-if="$page.markdownPage.solution_image"
         :src="$page.markdownPage.solution_image.src"
       />
+    </div>
     <div class="container sm:pxi-0 mx-auto overflow-x-hidden py-5">
       <SolutionsHeader
         v-if="$page.markdownPage.header"
@@ -53,22 +55,27 @@
       :card="card"
     /> -->
 
-      <!-- <InTheNews
+      <InTheNews
         v-if="$page.markdownPage.inTheNews"
         :news="$page.markdownPage.inTheNews"
-    /> -->
+      />
 
       <!-- <SignUp
       v-if="$page.markdownPage.signup"
       :signup="$page.markdownPage.signup"
     /> -->
     </div>
+    <div class="container-fluid sm:pxi-0 mx-auto overflow-x-hidden">
       <g-image
         v-if="$page.markdownPage.solution_image2"
         :src="$page.markdownPage.solution_image2.src"
       />
 
-    <CallToAction v-if="$page.markdownPage.cta" :cta="$page.markdownPage.cta" />
+      <CallToAction
+        v-if="$page.markdownPage.cta"
+        :cta="$page.markdownPage.cta"
+      />
+    </div>
   </Layout>
 </template>
 
@@ -156,7 +163,7 @@
         }
         inTheNews {
           id
-          excerpt
+          content
           partners {
             path
             logo
@@ -207,3 +214,8 @@ export default {
   },
 };
 </script>
+<style scoped>
+.container-fluid {
+  max-width: 100% !important;
+}
+</style>