Skip to content

Commit 3d56086

Browse files
authored
Merge branch 'master' into fix/6946-event-details-overlap
Signed-off-by: Rishi Raj <rishiraj438gt@gmail.com>
2 parents 42fd619 + fa76589 commit 3d56086

7 files changed

Lines changed: 1004 additions & 224 deletions

File tree

src/collections/events/2025/hacktoberfest-2025/index.mdx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ Prepare for Hacktoberfest and ready yourself for contributing to CNCF projects t
4040
<img src={hacktoberfestBadge} style={{ width: '200px', maxWidth: '100%', height: 'auto', flexShrink: '0' }} alt="Hacktoberfest Badge" />
4141
</div>
4242

43+
<img src={hacktoberfestOpenArms} style="display:block; justify-content:center; width: 750px; margin-right: auto;"/>
44+
45+
46+
4347
<h3 style={{marginBottom: '10px'}}>Event Details</h3>
4448

4549
<ul>

src/components/CookieConsent/index.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
Stack,
99
} from "@mui/material";
1010

11-
11+
import {Link} from "gatsby";
1212
import Button from "../../reusecore/Button";
1313
import styled from "styled-components";
1414

@@ -54,10 +54,11 @@ const CookieConsent = () => {
5454
<Typography variant="body2" >
5555
We use cookies to enhance your browsing experience. By clicking
5656
"Accept", you consent to our use of cookies. Read more in our{" "}
57-
<a href="/company/legal/privacy" target="_blank" rel="noopener noreferrer">
57+
<Link to="/company/legal/privacy" target="_self" rel="noopener noreferrer">
5858
Privacy Policy
59-
</a>
60-
.
59+
</Link> or visit our <Link to="/company/legal" target="_self" rel="noopener noreferrer">
60+
Trust Center
61+
</Link>.
6162
</Typography>
6263

6364
<Box display="flex" justifyContent="flex-end" gap={1}>

src/sections/Company/Legal/terms-of-service/index.js

Lines changed: 126 additions & 120 deletions
Large diffs are not rendered by default.

src/sections/Meshery/Meshery-integrations/Integration.style.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ export const HoneycombGrid = styled.div`
6565
-webkit-transform: translateZ(0);
6666
display: flex;
6767
height: 100%;
68-
background: ${(props) => props.theme.radialToWhite};
68+
background: ${(props) => props.theme.radialToBlue};
6969
justify-content: center;
7070
align-items: center;
7171
padding: 0.625rem;

src/sections/Pricing/feature_data.json

Lines changed: 3 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -1137,107 +1137,11 @@
11371137
},
11381138
{
11391139
"theme": "",
1140-
"categoryOrder": "11",
1140+
"categoryOrder": "add-on",
11411141
"category": "Academy",
11421142
"functionOrder": "1101",
1143-
"function": "Basic Academy Portal",
1144-
"feature": "Access to the public Academy platform with free learning paths, challenges, and certifications.",
1145-
"subscription_tier": "Free",
1146-
"comparison_tiers": {
1147-
"free": "x",
1148-
"teamDesigner": "x",
1149-
"teamOperator": "x",
1150-
"enterprise": "x"
1151-
},
1152-
"docs": ""
1153-
},
1154-
{
1155-
"theme": "",
1156-
"categoryOrder": "11",
1157-
"category": "Academy",
1158-
"functionOrder": "1102",
1159-
"function": "Personal Learning Tracking",
1160-
"feature": "Track learning progress across courses and view achievements earned.",
1161-
"subscription_tier": "Free",
1162-
"comparison_tiers": {
1163-
"free": "x",
1164-
"teamDesigner": "x",
1165-
"teamOperator": "x",
1166-
"enterprise": "x"
1167-
},
1168-
"docs": ""
1169-
},
1170-
{
1171-
"theme": "",
1172-
"categoryOrder": "11",
1173-
"category": "Academy",
1174-
"functionOrder": "1103",
1175-
"function": "Instructor Console",
1176-
"feature": "Instructor console with detailed analytics and reporting on student progress, course performance, and engagement metrics.",
1177-
"subscription_tier": "Enterprise",
1178-
"comparison_tiers": {
1179-
"free": "",
1180-
"teamDesigner": "",
1181-
"teamOperator": "",
1182-
"enterprise": "x"
1183-
},
1184-
"docs": ""
1185-
},
1186-
{
1187-
"theme": "",
1188-
"categoryOrder": "11",
1189-
"category": "Academy",
1190-
"functionOrder": "1104",
1191-
"function": "Create Learning Contents",
1192-
"feature": "Content authoring tools for educational materials including learning paths, challenges, and certifications with interactive content and assessments.",
1193-
"subscription_tier": "Enterprise",
1194-
"comparison_tiers": {
1195-
"free": "",
1196-
"teamDesigner": "",
1197-
"teamOperator": "",
1198-
"enterprise": "x"
1199-
},
1200-
"docs": ""
1201-
},
1202-
{
1203-
"theme": "",
1204-
"categoryOrder": "11",
1205-
"category": "Academy",
1206-
"functionOrder": "1105",
1207-
"function": "Learner Management",
1208-
"feature": "Administrative control over all learners in your organization. Enroll users in specific courses and track their progress.",
1209-
"subscription_tier": "Enterprise",
1210-
"comparison_tiers": {
1211-
"free": "",
1212-
"teamDesigner": "",
1213-
"teamOperator": "",
1214-
"enterprise": "x"
1215-
},
1216-
"docs": ""
1217-
},
1218-
{
1219-
"theme": "",
1220-
"categoryOrder": "11",
1221-
"category": "Academy",
1222-
"functionOrder": "1106",
1223-
"function": "Organization Private Content",
1224-
"feature": "Internal content repository separate from public Academy. Control access within your organization, create proprietary training materials, and share sensitive or company-specific knowledge.",
1225-
"subscription_tier": "Enterprise",
1226-
"comparison_tiers": {
1227-
"free": "",
1228-
"teamDesigner": "",
1229-
"teamOperator": "",
1230-
"enterprise": "x"
1231-
},
1232-
"docs": ""
1233-
},
1234-
{
1235-
"theme": "",
1236-
"categoryOrder": "11",
1237-
"category": "Academy",
1238-
"functionOrder": "1107",
1239-
"function": "White-label Customization",
1240-
"feature": "Customize the Academy platform with your organization's branding, logos, and visual identity.",
1143+
"function": "Academy",
1144+
"feature": "A comprehensive learning management system for creators and instructors on how to build, manage, and extend educational content like learning paths, challenges, and certifications with an inclusive, collaborative, hands-on learning environment for students.",
12411145
"subscription_tier": "Enterprise",
12421146
"comparison_tiers": {
12431147
"free": "",

src/theme/app/themeStyles.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ const lighttheme = {
182182
linearToGreen: "linear-gradient(90.2deg,rgba(255, 255, 255, 0.38) 33.89%,rgba(0, 179, 159, 0.74) 99.81%)",
183183
linearToWhite: "#FFFFFF",
184184
radialToWhite: "radial-gradient( circle 100px at 50% 50%, rgba(215,205,220,0.15) 0%, rgba(203,210,218,0.25) 80%, rgba(167,173,180,.25) 100% )",
185+
radialToBlue: "linear-gradient(135deg, rgba(45, 55, 70, 0.9) 0%, rgba(25, 30, 40, 0.9) 70%, rgba(15, 20, 30, 0.95) 100%), url('data:image/svg+xml,%3Csvg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 100 100\"%3E%3Cpath d=\"M0 0 L50 50 L0 100 L100 50 Z\" fill=\"none\" stroke=\"rgba(255, 255, 255, 0.1)\" stroke-width=\"1\"/%3E%3C/svg%3E') repeat center",
185186
linearDarkToLinearLight: "linear-gradient(61.3deg, rgba(0, 179, 159, 0.2) -26.19%, rgba(255, 255, 255, 0.2) 40.19%), linear-gradient(303.45deg, rgba(0, 179, 159, 0.2) 0%, rgba(255, 255, 255, 0.2) 37.23%), linear-gradient(360deg, #00B39F -108%, #FFFFFF 63.36%)",
186187
whiteEightToBlack: "#000000",
187188
whiteEightToBlackEight: "rgb(0 0 0 / 0.8)",
@@ -417,6 +418,7 @@ export const darktheme = {
417418
linearToGreen: "linear-gradient(90.2deg, rgba(0, 0, 0, 0.2) 0.16%, rgba(0, 179, 159, 0.74) 99.81%)",
418419
linearToWhite: "linear-gradient(to right, #666666, #444444)",
419420
radialToWhite: "radial-gradient( circle 100px at 50% 50%, rgba(167,173,180,0.78) 0%, rgba(103,110,118,0.79) 80%, rgba(103,110,118,1) 100% )",
421+
radialToBlue: "linear-gradient(135deg, rgba(15, 20, 30, 0.9) 0%, rgba(25, 30, 40, 0.9) 70%, rgba(45, 55, 70, 0.9) 100%), url('data:image/svg+xml,%3Csvg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 100 100\"%3E%3Cpath d=\"M0 0 L50 50 L0 100 L100 50 Z\" fill=\"none\" stroke=\"rgba(255, 255, 255, 0.1)\" stroke-width=\"1\ \"/%3E%3C/svg%3E') repeat center",
420422
linearDarkToLinearLight: "linear-gradient(180deg, rgba(0, 0, 0, 0.2) 0%, rgba(0, 179, 159, 0.58) 46.87%, rgba(0, 179, 159, 0.034) 100%), linear-gradient(179.39deg, rgba(0, 179, 159, 0) 0.58%, #000000 99.54%)",
421423
whiteEightToBlack: "rgb(255 255 255 / 0.8)",
422424
whiteEightToBlackEight: "rgb(255 255 255 / 0.8)",

0 commit comments

Comments
 (0)