Merge branch 'master' into webp

Signed-off-by: Akash Singh <92908347+AkashS20@users.noreply.github.com>
layer5io · May 25, 2023 · 296376d · 296376d
2 parents cce756c + 76561a8
commit 296376d
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 17 deletions.
diff --git a/src/collections/service-mesh-books/service-mesh-patterns/index.mdx b/src/collections/service-mesh-books/service-mesh-patterns/index.mdx
@@ -2,7 +2,7 @@
 title: "Service Mesh Patterns"
 date: 2020-04-08 21:15:05 +0000
 cover: ./service-mesh-patterns.webp
-thumbnail: ./service-mesh-patterns-small.webp
+thumbnail: ./service-mesh-patterns.webp
 author: Lee Calcote and Nic Jackson
 abstract: "Patterns, recipes and best practices for deploying and operating service meshes."
 published: true

diff --git a/...h-books/the-enterprise-path-to-service-mesh-architectures-2nd-Edition/index.mdx b/...h-books/the-enterprise-path-to-service-mesh-architectures-2nd-Edition/index.mdx
@@ -2,7 +2,7 @@
 title: "The Enterprise Path to Service Mesh Architectures (2nd Edition)"
 date: 2020-10-23 21:15:05 +0000
 cover: ./The-Enterprise-path-to-service-mesh-Architectures-2nd-Edition.webp
-thumbnail: ./The-Enterprise-path-to-service-mesh-Architectures-2nd-Edition-small.webp
+thumbnail: ./The-Enterprise-path-to-service-mesh-Architectures-2nd-Edition.webp
 author: "Lee Calcote"
 abstract: "Planning to build a microservice-driven cloud native application or looking to modernize existing application services?"
 published: true

diff --git a/src/components/Terminal/Terminal.style.js b/src/components/Terminal/Terminal.style.js
@@ -16,6 +16,7 @@ export const TerminalWrapper = styled.div`
   --terminal-body-color: var(--gray-1);
 
   width: 837px;
+  max-width: 90%;
 
   .title-bar {
     display: flex;
@@ -59,7 +60,6 @@ export const TerminalWrapper = styled.div`
     background: var(--terminal-body-color);
     border-radius: 0 0 var(--terminal-radius) var(--terminal-radius);
     padding: 24px 32px;
-
     @media (min-width: 768px) {
       height: 525px;
     }
@@ -80,9 +80,9 @@ export const TerminalWrapper = styled.div`
     width: 0;
     height: 0;
   }
-
+  
   .code-wrapper {
-     pre {
+    pre {
       padding: 0;
       margin: 0;
       width: 100%;
@@ -106,6 +106,8 @@ export const TerminalWrapper = styled.div`
         color: var(--white);
       }
 
+      wrap-word: normal;
+      
       @media (min-width: 768px){
         font-size: 13.5px;
         line-height: 26px;

diff --git a/src/sections/General/Navigation/index.js b/src/sections/General/Navigation/index.js
@@ -33,10 +33,9 @@ const Navigation = () => {
         thumbnail {
           childImageSharp {
             gatsbyImageData(
-              width: 240
-              height: 160
-              transformOptions: {cropFocus: CENTER}
-              layout: FIXED
+              width: 1050
+              height:1360
+              layout: CONSTRAINED
             )
           }
           publicURL

diff --git a/src/sections/Home/Projects-home/index.js b/src/sections/Home/Projects-home/index.js
@@ -46,7 +46,7 @@ const Projects = () => {
             <Col sm={12} md={6} lg={3}>
               <Link className="project-card" to="/cloud-native-management/meshery">
                 <div className="project__block__inner">
-                  <StaticImage loading="lazy" src={projectImage3} alt="Meshery Logo"  width={80} height={80} imgStyle={{ width: "40px", height: "40px" }} />
+                  <StaticImage loading="lazy" src={projectImage3} alt="Meshery Logo" width={80} height={80} imgStyle={{ width: "40px", height: "40px" }} />
                   <p>Meshery</p>
                   <h3>Cloud Native Management and Governance</h3>
                 </div>
@@ -64,14 +64,14 @@ const Projects = () => {
             <Col sm={12} md={6} lg={3}>
               <Link className="project-card" to="/projects/nighthawk">
                 <div className="project__block__inner">
-                  <StaticImage loading="lazy" src={projectImage4} alt="Nighthawk Logo" width={100} height={80} imgStyle={{ width: "50px", height: "40px" }}/>
+                  <StaticImage loading="lazy" src={projectImage4} alt="Nighthawk Logo" width={100} height={80} imgStyle={{ width: "50px", height: "40px" }} />
                   <p>Nighthawk</p>
                   <h3>Distributed Performance Management for Microservices</h3>
                 </div>
               </Link>
             </Col>
             <Col sm={12} md={6} lg={3}>
-              <Link className="project-card" to="/service-mesh-landscape">
+              <Link className="project-card" to="/catalog">
                 <div className="project__block__inner">
                   {/* <StaticImage src={catalogLogo} alt="Meshery Catalog" height={40} /> */}
                   <CatalogLogo height="40px" width="auto" style={{ margin: "10px auto", minHeight: "40px" }} />

diff --git a/src/sections/Meshmap/Meshmap-collaborate/meshmap-collaborate-banner.js b/src/sections/Meshmap/Meshmap-collaborate/meshmap-collaborate-banner.js
@@ -57,7 +57,7 @@ const CollaborationBannerWrapper = styled.div`
         /* font-size: 4rem; */
         position: relative;
         display: inline-block;
-        color: ${props => props.theme.primaryColor};
+        /* color: ${props => props.theme.primaryColor}; */
         transition: 0.8s cubic-bezier(0.2, 0.8, 0.2, 1);
 /*
         @media only screen and (min-width: 500px) {
@@ -195,7 +195,7 @@ const MeshmapCollaborateBanner = () => {
         <div className="banner-text">
           <h1>Collaborate with the team. <br /> Build solutions together </h1>
           <h4>Designer and Visualizer live side-by-side, so all design work, from ideation to operation, can be found in one place.</h4>
-          <Button primary className="join-community-button" title="Start Collaborating" url="/projects" />
+          <Button primary className="join-community-button" title="Start Collaborating" url="https://play.meshery.io/" />
         </div>
         <div className="transition-container" ref={transitionRef}>
           <img className="canvas" src={isDark ? EmptyDark : EmptyLight} alt="" />

diff --git a/src/sections/Playground/images/playground-feature-2.svg b/src/sections/Playground/images/playground-feature-2.svg
diff --git a/src/sections/Playground/index.js b/src/sections/Playground/index.js
@@ -1,5 +1,4 @@
 import React from "react";
-import styled from "styled-components";
 import Reviews from "../Pricing/review-slider";
 import PlaygroundHero from "./playground-hero";
 import PlaygroundFeatures from "./playground-features";

diff --git a/src/sections/Playground/playground-features.js b/src/sections/Playground/playground-features.js
@@ -14,6 +14,12 @@ const PlaygroundFeaturesWrapper = styled.div`
     align-items: center;
     margin: 5% 0%;
 
+    svg {
+      .playground-feature-2_svg__text {
+        fill: ${props => props.theme.whiteToBlack};
+        transition: 0.8s cubic-bezier(0.2, 0.8, 0.2, 1);
+      }
+    }
     h1 {
         margin-bottom: 8px;
     }

diff --git a/src/sections/Projects/Project-grid/index.js b/src/sections/Projects/Project-grid/index.js
@@ -108,7 +108,7 @@ const ProjectPage = () => {
               </div>
             </Link>
             <Link
-              to=""
+              to="/catalog"
               className="project__card ten"
             >
               <div className="project__card-container-ten">