Skip to content

Commit 39c1747

Browse files
Merge branch 'master' into infinite-scroll
2 parents 8e2a0e5 + 1effa49 commit 39c1747

File tree

3 files changed

+33
-30
lines changed

3 files changed

+33
-30
lines changed

src/collections/integrations/kuma/index.mdx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,12 @@ components: [
320320
"colorIcon": "icons/components/mesh-trust/icons/color/mesh-trust-color.svg",
321321
"whiteIcon": "icons/components/mesh-trust/icons/white/mesh-trust-white.svg",
322322
"description": "",
323+
},
324+
{
325+
"name": "workload",
326+
"colorIcon": "icons/components/workload/icons/color/workload-color.svg",
327+
"whiteIcon": "icons/components/workload/icons/white/workload-white.svg",
328+
"description": "",
323329
}]
324330
featureList: [
325331
"Lightweight and flexible service mesh",

src/sections/Learn/Workshop-grid/WorkshopsGrid.style.js

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,14 @@ export const WorkshopPageWrapper = styled.div`
66
}
77
.btn-and-status {
88
display: flex;
9-
width: 97%;
9+
width: 100%;
1010
position: absolute;
11-
top: 92%;
11+
bottom: 0;
12+
left: 0;
13+
padding: 0.75rem 1rem;
14+
align-items: center;
15+
box-sizing: border-box;
16+
gap: 0.5rem;
1217
1318
p {
1419
color: ${props => props.theme.primaryLightColor};
@@ -54,13 +59,17 @@ export const WorkshopPageWrapper = styled.div`
5459
outline: none;
5560
}
5661
57-
.linkAndReadBtns {
62+
.left-icons {
5863
display: flex;
59-
width: 95%;
60-
flex-direction: row-reverse;
61-
justify-content: space-between;
62-
position: absolute;
63-
bottom: 0rem;
64+
align-items: center;
65+
gap: 0.5rem;
66+
}
67+
68+
a.readmeBtn {
69+
display: flex;
70+
align-items: center;
71+
gap: 0.25rem;
72+
margin-left: auto;
6473
}
6574
6675
.linkAndReadBtns-open {
@@ -106,12 +115,6 @@ export const WorkshopPageWrapper = styled.div`
106115
}
107116
}
108117
109-
.externalLink {
110-
position: relative;
111-
left: 1rem;
112-
margin-top: 0.25rem;
113-
}
114-
115118
.text-contents {
116119
display: none;
117120
width: 100%;
@@ -126,10 +129,6 @@ export const WorkshopPageWrapper = styled.div`
126129
padding: 1.5rem;
127130
}
128131
129-
.social-icons {
130-
display: flex;
131-
}
132-
133132
.links {
134133
display: flex;
135134
align-items: center;
@@ -170,6 +169,7 @@ export const WorkshopPageWrapper = styled.div`
170169
width: 100%;
171170
display: block;
172171
height: auto;
172+
position: relative;
173173
border-radius: 0.3125rem;
174174
margin-bottom: 1.25rem;
175175
box-shadow: 0rem 0.0625rem 0.3125rem rgba(0, 0, 0, 0.2);

src/sections/Learn/Workshop-grid/index.js

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -116,22 +116,19 @@ const WorkshopsPage = () => {
116116
</div>
117117
</div>
118118
<div className={content && ID === id ? "btn-and-status-open" : "btn-and-status"}>
119-
<div className="social-icons">
119+
<div className="left-icons">
120120
{frontmatter.slack && frontmatter.status === "delivered" ?
121-
<a href={frontmatter.slack} target = "_blank" rel="noreferrer" className="links">
121+
<a href={frontmatter.slack} target="_blank" rel="noreferrer" className="links">
122122
<img src={Slack} alt="Slack"/>
123-
Slack
123+
Slack
124124
</a> : ""}
125+
<Link to={fields.slug} className="siteLink">
126+
<FaRegWindowMaximize style={{ height: "25px", width: "auto" }} />
127+
</Link>
125128
</div>
126-
<div className="linkAndReadBtns">
127-
<div className="expand">
128-
<Link to={fields.slug} className="readmeBtn readmreBtn"> Read More <BsArrowRight className="icon" size={30} /></Link>
129-
</div>
130-
131-
<div className="externalLink">
132-
<Link to={fields.slug} className="siteLink"><FaRegWindowMaximize style={{ height: "25px", width: "auto" }} /></Link>
133-
</div>
134-
</div>
129+
<Link to={fields.slug} className="readmeBtn">
130+
Read More <BsArrowRight className="icon" size={30} />
131+
</Link>
135132
</div>
136133
</div>
137134
</Col>

0 commit comments

Comments
 (0)