Skip to content

Commit 8cb8cff

Browse files
authored
Merge branch 'master' into patch-1
2 parents a5d503f + da350cd commit 8cb8cff

File tree

5 files changed

+47
-20
lines changed

5 files changed

+47
-20
lines changed

content-learn/mastering-meshery/introduction-to-meshery/meshery/interpreting-meshery-designs.mdx

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ Let's explore a few of these categories.
9393
1. **Triangles**:
9494

9595
<img
96+
class="image-design-icons"
9697
src={Triangles}
9798
align="center"
9899
width="25%"
@@ -105,9 +106,10 @@ Let's explore a few of these categories.
105106
- **Examples**: API Service, Service.
106107

107108

108-
1. **Rectangles**:
109+
2. **Rectangles**:
109110

110111
<img
112+
class="image-design-icons"
111113
src={Rectangles}
112114
align="center"
113115
width="25%"
@@ -121,9 +123,10 @@ Let's explore a few of these categories.
121123

122124
- **Examples**: Namespace, Node, Pod, ReplicaSet, DaemonSet, Horizontal Pod Autoscaler.
123125

124-
1. **User Icons**:
126+
3. **User Icons**:
125127

126128
<img
129+
class="image-design-icons"
127130
src={Users}
128131
align="center"
129132
width="25%"
@@ -135,9 +138,10 @@ Let's explore a few of these categories.
135138

136139
- **Examples**: ClusterRole, Role, Service Account etc.
137140

138-
1. **Cylinders**:
141+
4. **Cylinders**:
139142

140143
<img
144+
class="image-design-icons"
141145
src={Cylinders}
142146
align="center"
143147
width="25%"
@@ -163,6 +167,7 @@ Note that users have the flexibility to **customize** these arrow styles to suit
163167
**Edge Relationships**
164168

165169
<img
170+
class="image-design-icons"
166171
src={DashedArrows}
167172
align="center"
168173
width="25%"
@@ -173,6 +178,7 @@ These are used to indicate traffic flow and relationships between components. Th
173178
**Annotations**
174179

175180
<img
181+
class="image-design-icons"
176182
src={AnnotationArrow}
177183
align="center"
178184
width="25%"
@@ -185,6 +191,7 @@ These are used to denote annotations or static connections between components. T
185191
1. **Edge-Network Relationship**: Represented by a dashed arrow with **port/network protocol**.
186192

187193
<img
194+
class="image-design-icons"
188195
src={NetworkEdgeRelationship}
189196
align="center"
190197
width="50%"
@@ -205,6 +212,7 @@ These are used to denote annotations or static connections between components. T
205212
The intermediary component (such as a RoleBinding) connects the two, defining how permissions are assigned. For example, a dashed arrow from a `Role` to a `ServiceAccount` with a `RoleBinding` in the middle shows the connection established by the RoleBinding, which links the specific role to the service account and grants the appropriate permissions.
206213

207214
<img
215+
class="image-design-icons"
208216
src={EdgePermissions}
209217
align="center"
210218
width="50%"
@@ -213,7 +221,8 @@ The intermediary component (such as a RoleBinding) connects the two, defining ho
213221
**Creating Edge-Permission Relationships Between Components**
214222

215223
<a href={edgePermissionGif}>
216-
<img src={edgePermissionGif} width="100%" align="center" />
224+
<img src={edgePermissionGif} width="100%" align="center"
225+
/>
217226
</a>
218227

219228

@@ -227,20 +236,17 @@ Meshery extends and offers support for numerous [integrations](https://docs.mesh
227236
In Meshery, these integrated components are distinctly represented by their specific logos as icons and various shapes. These components can be found in `Components` in the dock.
228237

229238
<img
239+
class="image-design-icons"
230240
src={Integrations}
231241
align="center"
232242
width="50%"
233-
style={{
234-
marginTop: '20px',
235-
marginBottom: '20px',
236-
}}
237243
/>
238244
<h5 class="chapter-sub-heading">_Example of integration components in Meshery_</h5>
239245

240246
Below is a Meshery Design with AWS Components.
241247

242248
<MesheryDesignEmbed
243-
style={{ border: "1px solid #eee" }}
249+
style={{ border: "1px solid #eee" , margin: "15px 0px 15px 0px"}}
244250
embedId="embedded-design-79d1f362-39b3-46f2-b658-42a16984f88e"
245251
embedScriptSrc="/embed-test/embedded-design-awscomplex.js"
246252
/>
@@ -271,14 +277,15 @@ Annotations can be created using Meshery's Diagramming tools found in the dock a
271277
1. **Images**: Images can be added to the design to represent components, logos, or any visual aid that supports understanding the architecture.
272278

273279
<a href={AnnotationExampleGif}>
274-
<img src={AnnotationExampleGif} width="100%" align="center" />
280+
<img src={AnnotationExampleGif} width="100%" align="center"
281+
/>
275282
</a>
276283

277284

278285
The design below includes annotations such as sections, images, arrows, and various shapes.
279286

280287
<MesheryDesignEmbed
281-
style={{ border: "1px solid #eee" }}
288+
style={{ border: "1px solid #eee" , margin: "15px 0px 15px 0px"}}
282289
embedId="embedded-design-a83f0098-2f91-4275-b075-c8676e842804"
283290
embedScriptSrc="/embed-test/embedded-design-annotations-example.js"
284291
/>
@@ -292,14 +299,16 @@ While default shapes, colors, and icons are provided for components and annotati
292299
**Customizing Kubernetes Components**
293300

294301
<a href={CustomizeKubernetesGif}>
295-
<img src={CustomizeKubernetesGif} width="100%" align="center" />
302+
<img src={CustomizeKubernetesGif} width="100%" align="center"
303+
/>
296304
</a>
297305

298306

299307
**Creating and Customizing Arrow Annotations**
300308

301309
<a href={CreateAnnotationGif}>
302-
<img src={CreateAnnotationGif} width="100%" align="center" />
310+
<img src={CreateAnnotationGif} width="100%" align="center"
311+
/>
303312
</a>
304313

305314

root-wrapper.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ import { ContextWrapper } from "./context-wrapper";
99
// Custom image component for better CLS scores
1010
const OptimizedImage = props => {
1111
return (
12-
<div style={{ width: "100%", height: "auto", aspectRatio: props.aspectRatio || "16/9", overflow: "hidden" }}>
12+
<div style={{ width: "100%", height: "auto" }}>
1313
<img
1414
{...props}
1515
width={props.width || "100%"}
1616
height={props.height || "auto"}
1717
style={{
18-
objectFit: props.objectFit || "cover",
19-
aspectRatio: props.aspectRatio || "16/9",
18+
objectFit: props.objectFit || "contain",
19+
margin: "20px 0px",
2020
...props.style
2121
}}
2222
loading="lazy"

src/components/Learn-Components/Chapters-Style/chapters.style.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,14 @@ export const ChapterStyle = styled.div`
1717
}
1818
}
1919
}
20+
21+
.image-design-icons {
22+
object-fit: contain !important;
23+
24+
@media (max-width: 768px) {
25+
width: clamp(150px, 70vw, 400px) !important;
26+
height: auto !important;
27+
max-width: none !important;
28+
}
29+
}
2030
`;

src/components/SistentNavigation/index.js

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { HiOutlineChevronLeft } from "@react-icons/all-files/hi/HiOutlineChevron
33
import { Link } from "gatsby";
44
import { IoMdClose } from "@react-icons/all-files/io/IoMdClose";
55
import { IoIosArrowDropdownCircle } from "@react-icons/all-files/io/IoIosArrowDropdownCircle";
6+
import { IoIosArrowForward } from "@react-icons/all-files/io/IoIosArrowForward";
67
import { componentsData } from "../../sections/Projects/Sistent/components/content";
78

89
import TOCWrapper from "./toc.style";
@@ -35,14 +36,14 @@ const TOC = () => {
3536
</Link>
3637
<div className="toc-toggle-btn">
3738
{expand ? (
38-
<IoMdClose
39+
<IoIosArrowDown
3940
className="toc-menu-icon"
4041
onClick={function () {
4142
setExpand(!expand);
4243
}}
4344
/>
4445
) : (
45-
<IoIosArrowDropdownCircle
46+
<IoIosArrowForward
4647
className="toc-menu-icon"
4748
onClick={function () {
4849
setExpand(!expand);
@@ -69,7 +70,10 @@ const TOC = () => {
6970
onClick={() => setExpandIdentity((prev) => !prev)}
7071
>
7172
Identity
72-
{expandIdenity ? <IoIosArrowUp /> : <IoIosArrowDown />}
73+
{expandIdenity ?
74+
<IoIosArrowDown style={{ zIndex: 2 }} /> :
75+
<IoIosArrowForward style={{ zIndex: 2 }} />
76+
}
7377
</li>
7478
{expandIdenity && (
7579
<div className="identity-sublinks">
@@ -129,7 +133,10 @@ const TOC = () => {
129133
onClick={() => setExpandComponent((prev) => !prev)}
130134
>
131135
Components
132-
{expandComponent ? <IoIosArrowUp /> : <IoIosArrowDown />}
136+
{expandComponent ?
137+
<IoIosArrowDown style={{ zIndex: 2 }} /> :
138+
<IoIosArrowForward style={{ zIndex: 2 }} />
139+
}
133140
</li>
134141
{expandComponent && (
135142
<div className="components-sublinks">

src/components/SistentNavigation/toc.style.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ const TOCWrapper = styled.div`
104104
width: auto;
105105
.toc-toggle-btn {
106106
display: inline-block;
107+
z-index: 2;
107108
}
108109
.go-back {
109110
margin-left: 0;

0 commit comments

Comments
 (0)