Skip to content

Commit

Permalink
Merge branch 'layer5io:master' into internships-brand-responsive#5997
Browse files Browse the repository at this point in the history
  • Loading branch information
upsaurav12 authored Nov 3, 2024
2 parents 88ca4f1 + 360f670 commit 4a244a6
Show file tree
Hide file tree
Showing 23 changed files with 844 additions and 828 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions src/collections/integrations/crossplane/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,12 @@ components: [
"colorIcon": "icons/components/store-config/icons/color/store-config-color.svg",
"whiteIcon": "icons/components/store-config/icons/white/store-config-white.svg",
"description": "",
},
{
"name": "image-config",
"colorIcon": "icons/components/image-config/icons/color/image-config-color.svg",
"whiteIcon": "icons/components/image-config/icons/white/image-config-white.svg",
"description": "",
}]
featureList: [
"Highly extensible backend that enables you to orchestrate applications and infrastructure no matter where they run.",
Expand Down
8 changes: 8 additions & 0 deletions src/pages/projects/sistent/components/container/code.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import React from "react";
import { ContainerCode } from "../../../../../sections/Projects/Sistent/components/container/code";

const ContainerCodePage = () => {
return <ContainerCode />;
};

export default ContainerCodePage;
8 changes: 8 additions & 0 deletions src/pages/projects/sistent/components/container/guidance.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import React from "react";
import { ContainerGuidancePage } from "../../../../../sections/Projects/Sistent/components/container/guidance";

const LinkGuidance = () => {
return <ContainerGuidancePage />;
};

export default LinkGuidance;
8 changes: 8 additions & 0 deletions src/pages/projects/sistent/components/container/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import React from "react";
import SistentContainer from "../../../../../sections/Projects/Sistent/components/container/index";

const SistentContainerPage = () => {
return <SistentContainer />;
};

export default SistentContainerPage;
6 changes: 3 additions & 3 deletions src/sections/Community/Handbook/repo-data.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import appmeshLogo from "../../../assets/images/service-mesh-icons/aws-app-mesh.
import ciliumLogo from "../../../assets/images/service-mesh-icons/cilium.svg";
import wasm from "../../../assets/images/webassembly/webssembly_icon.svg";
import recognitionLogo from "../../../assets/images/recognition-program/recognition-program.png";
import kanvasLogo from "../../../assets/images/kanvas-snapshot/kanvas-snapshot.svg";
import kanvasLogo from "../../../assets/images/kanvas/icon-only/kanvas-icon-color.svg";

export const repo_data = [
{
Expand Down Expand Up @@ -85,7 +85,7 @@ export const repo_data = [
},
{
project: "Kanvas",
image: meshery,
image: kanvasLogo,
site: "/cloud-native-management/kanvas",
language: "React.js, Cytoscape.js",
maintainers_name: ["Aabid Sofi"],
Expand Down Expand Up @@ -324,7 +324,7 @@ export const repo_data = [
},
{
project: "Helm Kanvas Snapshot",
image: meshery,
image: kanvasLogo,
language: "Golang",
maintainers_name: ["Vacant"],
link: [""],
Expand Down
2 changes: 1 addition & 1 deletion src/sections/Community/Web-based-from/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ const WebBasedForm = () => {

useEffect(() => {
if (submit) {
axios.post("https://hook.us1.make.com/bmmi8btg3xb2fmx6kcavxmtf0a3uame2", {
axios.post("https://hook.us1.make.com/v66ana9yf3w11k4a1rf3epwquur1s9rd", {
memberFormOne,
MemberFormThirdValue,
MemberFormFourValue,
Expand Down
8 changes: 0 additions & 8 deletions src/sections/Company/News-grid/NewsGrid.style.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,5 @@ export const NewsPageWrapper = styled.div`
}
}
.search-box {
margin: auto;
input {
background-color: ${props => props.theme.shadowDarkColor}!important;
color: ${props => props.theme.text};
transition: all 450ms ease 0s;
}
}
`;
4 changes: 2 additions & 2 deletions src/sections/General/Navigation/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { useStyledDarkMode } from "../../../theme/app/useStyledDarkMode";
import axios from "axios";
// import smp_dark_text from "../../../assets/images/service-mesh-performance/stacked/smp-dark-text.svg";
// import smp_light_text from "../../../assets/images/service-mesh-performance/stacked/smp-light-text.svg";
import kanvas_dark from "../../../assets/images/kanvas/icon-only/kanvas-icon-white.svg";
import kanvas_color from "../../../assets/images/kanvas/icon-only/kanvas-icon-color.svg";
import meshery from "../../../assets/images/meshery/icon-only/meshery-logo-light.svg";
import Data from "./utility/menu-items.js";
import ScrollspyMenu from "./utility/ScrollspyMenu.js";
Expand Down Expand Up @@ -144,7 +144,7 @@ const Navigation = () => {
{
frontmatter: {
thumbnail: {
img: kanvas_dark,
img: kanvas_color,
},
title: "Kanvas, collaborative infrastructure management",
},
Expand Down
10 changes: 1 addition & 9 deletions src/sections/Kanvas/kanvas-cta/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import styled from "styled-components";

import { Container } from "../../../reusecore/Layout";
import Locator from "./locator.svg";
import MesherySurface from "./meshery-surface.svg";
import Button from "../../../reusecore/Button";

const KanvasCTAWrapper = styled.div`
Expand All @@ -17,10 +16,6 @@ const KanvasCTAWrapper = styled.div`
margin: 2rem auto;
align-items: center;
.surface {
width: 60%;
min-width: 160px;
}
.rotate{
animation: coin-rotate 4s ease-in-out infinite alternate;
/* animation-fill-mode: both; */
Expand Down Expand Up @@ -59,9 +54,7 @@ const KanvasCTAWrapper = styled.div`
@media screen and (max-width:767px) {
display: block;
.surface {
width: 30%;
}
.rotate {
margin: 0 auto 0.25rem;
height: 12rem;
Expand Down Expand Up @@ -97,7 +90,6 @@ const KanvasCTA = () => {
<div className="CTAbody">
<div>
<img className="rotate" src={Locator} />
<img className="surface" src={MesherySurface} />
</div>
<div className="text">
<h2><span>Kanvas</span> is here!</h2>
Expand Down
27 changes: 26 additions & 1 deletion src/sections/Kanvas/kanvas-cta/locator.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 20 additions & 1 deletion src/sections/Kanvas/kanvas-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions src/sections/Meshery/Meshery-integrations/Integration.style.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,17 @@ export const HoneycombGrid = styled.div`
}
}
.search-box {
input {
border: 1px solid ${props => props.theme.headingColor} !important;
&:focus {
border-color: #fff !important;
box-shadow: rgba(100, 100, 111, 0.2) 0px 7px 29px 0px !important;
}
}
}
.category {
display: flex;
flex-wrap: wrap;
Expand Down
21 changes: 20 additions & 1 deletion src/sections/Pricing/icons/kanvas-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
96 changes: 95 additions & 1 deletion src/sections/Products/images/layer5-products-overview-dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 4a244a6

Please sign in to comment.