Skip to content

Commit 36147f0

Browse files
iArchitSharmaiArchitSharma
authored
Merge branch 'master' into develop
2 parents 0810837 + f4cb652 commit 36147f0

File tree

8 files changed

+178
-101
lines changed

8 files changed

+178
-101
lines changed

‎CONTRIBUTING.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,8 @@ Make sure you have the following prerequisites installed on your operating syste
4141
go version
4242
```
4343

44-
- [Docsy](https://www.docsy.dev/docs/get-started/docsy-as-module/installation-prerequisites/)
44+
- [Hugo](https://gohugo.io/installation/)
4545

46-
This site uses Docsy Theme and the following are basic prerequisites for using Docsy in your site:
4746

4847
- Install a recent release of the Hugo "extended" version. If you install from
4948
the [Hugo release page](https://github.com/gohugoio/hugo/releases), make sure

‎assets/scss/_landing_project.scss

Lines changed: 76 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,59 @@
11
.wrapper {
22
box-sizing: border-box;
33
}
4+
45
.product-section {
5-
display: grid;
6-
//justify-content: space-between;
6+
font-family: $font-qanelas;
7+
display: flex;
8+
align-items: stretch;
9+
justify-content: center;
10+
flex-wrap: wrap;
711
gap: 20px;
8-
//grid-template-columns: 1fr 1fr 1fr;
9-
//grid-template-columns: repeat(2, 1fr);
10-
//grid-template-rows: auto auto;
11-
grid-template-columns: repeat(3, 1fr);
1212
a {
1313
color: $white;
1414
}
15-
@media (max-width: 1000px) {
16-
grid-template-columns: 1fr 1fr;
17-
}
18-
@media (max-width: 768px) {
19-
grid-template-columns: 1fr;
20-
}
2115
}
22-
// .box1, .box2 {
23-
// grid-row: span 1;
24-
// }
2516

26-
// .box3 {
27-
// grid-column: span 2;
28-
// grid-row: span 1;
29-
// }
17+
.flex-row {
18+
display: flex;
19+
flex-direction: row;
20+
flex-wrap: wrap;
21+
}
3022

31-
// .box4 {
32-
// grid-column: span 2;
33-
// grid-row: span 2;
34-
// }
23+
.flex-col {
24+
display: flex;
25+
flex-direction: column;
26+
}
3527

36-
.box3 {
37-
grid-row: span 2;
28+
.gap-20px {
29+
gap: 20px;
3830
}
3931

40-
.box4 {
41-
grid-column: span 2;
42-
grid-row: span 1;
32+
.grow-1 {
33+
flex-grow: 1;
4334
}
4435

45-
.grid-card {
36+
.landing-card {
4637
border-radius: 1rem;
4738
border: 2px solid #515151;
4839
background: #000;
4940
box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.25);
5041
padding: 20px;
5142
text-align: left;
5243
font-size: 1.25rem;
53-
// aspect-ratio: 3/2;
5444
min-height: 300px;
5545
&:hover {
5646
border: 2px solid $secondary;
5747

5848
}
5949
}
60-
.product-head {
50+
.landing-card-title {
6151
font-size: 1.5rem;
62-
font-weight: 500;
52+
font-weight: 700;
6353
color: $primary;
6454
text-transform: uppercase;
6555
gap: 20px;
56+
white-space: nowrap;
6657
}
6758
.playground-section {
6859
&.playground-logo {
@@ -95,20 +86,14 @@
9586
}
9687
.handbook-section {
9788
display: flex;
98-
grid-column: span 2;
99-
// flex-basis: 100%;
100-
// flex: 2;
89+
align-items: center;
10190
background: linear-gradient(112deg, #000 34.88%, rgba(0, 110, 88, 0.82) 92.89%, #000 159.16%);
102-
flex-direction: row;
103-
align-items: start;
10491

10592
@media (max-width: 768px) {
10693
flex-direction: column;
107-
grid-column: span 1;
10894
}
10995
}
11096
.handbook-image{
111-
padding-top:40px;
11297
width: 110%;
11398
height: 100%;
11499
display: flex;
@@ -119,14 +104,13 @@
119104

120105
}
121106
img{
122-
//box-shadow: -8px 4px 25px 0px rgba(0, 211, 169, 0.50), 0px -8px 25px 0px rgba(0, 211, 169, 0.50);
107+
box-shadow: -8px 4px 25px 0px rgba(0, 211, 169, 0.50), 0px -8px 25px 0px rgba(0, 211, 169, 0.50);
123108
border-radius: 20px;
124109
width: 100%;
125110
}
126111

127112
}
128-
.handbook-text{
129-
padding-top:20px;
113+
.landing-card-text{
130114
display: flex;
131115
line-height: 30px;
132116
width: 90%;
@@ -137,22 +121,59 @@
137121
}
138122
}
139123

140-
.forum-section {
141-
grid-row: span 3;
142-
overflow: hidden;
143-
124+
.forum-image {
125+
padding: 3.85rem 0 0 1.5rem;
144126
img {
145127
box-shadow: -8px 4px 25px 0px rgba(0, 211, 169, 0.50), 0px -8px 25px 0px rgba(0, 211, 169, 0.50);
146-
147-
border-radius: 20px;
148-
height: 18rem;
149-
min-height: 70%;
150-
128+
border-radius: 20px 0 0 0;
129+
height: 25.5rem;
130+
width: auto;
131+
object-fit: contain;
151132
}
152-
@media (max-width: 1000px) {
153-
grid-column: span 2;
133+
}
134+
135+
.forum-section {
136+
border-radius: 1rem;
137+
border: 2px solid #515151;
138+
background: #000;
139+
box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.25);
140+
text-align: left;
141+
font-size: 1.25rem;
142+
height: 100%;
143+
&:hover {
144+
border: 2px solid $secondary;
154145
}
155-
@media (max-width: 768px) {
156-
grid-column: span 1;
146+
147+
display: flex;
148+
flex-direction: column;
149+
justify-content: space-between;
150+
151+
padding-right: 0;
152+
padding-bottom: 0;
153+
max-height: 620px;
154+
overflow: hidden;
155+
}
156+
157+
.playground-card {
158+
max-width: 351.88px;
159+
}
160+
161+
.catalog-card {
162+
max-width: 351.9px;
163+
}
164+
165+
.handbook-card {
166+
max-width: 723.78px;
167+
}
168+
169+
.forum-card {
170+
max-width: 723.78px;
171+
172+
overflow: hidden;
173+
}
174+
175+
@media (min-width: 1536px) {
176+
.forum-card {
177+
max-width: 552px;
157178
}
158179
}

‎assets/scss/_styles_project.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ a:not([href]):not([class]):hover {
119119
}
120120

121121
// Taxonomy
122-
.article-meta {
122+
.article-meta-bg {
123123

124124
background-color: $gray-900;
125125
padding: .5rem;
@@ -176,7 +176,7 @@ a:not([href]):not([class]):hover {
176176
font-size: 0.85rem;
177177
}
178178

179-
.article-meta {
179+
.article-meta-bg {
180180
margin-bottom: 0em;
181181
}
182182
}

‎content/en/_index.md

Lines changed: 33 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -39,55 +39,62 @@ onmouseover="changeImage('meshery', 'images/logos/meshery-light.svg')" onmouseou
3939
</a>
4040
</div>
4141

42-
<div class="wrapper">
4342
<div class= "product-section">
4443

45-
<div class="box">
44+
<div class="gap-20px flex-col">
45+
<div class="flex-row gap-20px">
46+
<div class="playground-card grow-1">
4647
<a href="https://playground.meshery.io">
47-
<div class="grid-card">
48+
<div class="landing-card">
4849
<div class= "playground-section playground-logo">
49-
<span class="product-head">Meshery playground</span>
50+
<span class="landing-card-title">Meshery playground</span>
5051
<p>Use Meshery Playground to explore a new way of DevOps - visual and collaborative configuration management for your infrastructure.</p>
5152
</div>
5253
</div>
5354
</a></div>
5455

55-
<div class="box">
56+
<div class="catalog-card">
5657
<a href="https://meshery.layer5.io/catalog">
57-
<div class="grid-card">
58+
<div class="landing-card">
5859
<div class= "catalog-section catalog-logo">
59-
<span class="product-head">Meshery Catalog</span>
60+
<span class="landing-card-title">Meshery Catalog</span>
6061
<p>Discover top-quality cloud native services for your infrastructure with the Cloud Native Catalog. Discover best practices and upgrade your Kubernetes management practices.</p>
6162
</div>
6263
</div>
6364
</a></div>
65+
</div>
6466

65-
<div class="box box3">
66-
<a href="https://discuss.layer5.io">
67-
<div class= "forum-section">
68-
<div class="grid-card">
69-
<span class="product-head">Discussion forum</span>
70-
<p>Cloud Native Management of developer-defined infrastructure. Join the open source-first community of cloud native engineers.</p>
71-
<img src="images/landing/discuss.png" alt="Discussion Forum Image" />
72-
</div>
73-
</div>
74-
</a></div>
75-
76-
<div class="box box4">
67+
<div class="handbook-card">
7768
<a href="https://layer5.io/community/handbook">
78-
<div class= "handbook-section grid-card">
79-
<div class= "handbook-text">
80-
<span class="product-head">Community Handbook</span>
69+
<div class= "handbook-section landing-card">
70+
<div class= "landing-card-text">
71+
<span class="landing-card-title">Community Handbook</span>
8172
<p>Use Meshery Playground to explore a new way of DevOps - visual and collaborative configuration management for your infrastructure.</p>
8273
</div>
8374
<div class= "handbook-image">
8475
<img src="images/landing/handbook.png" alt="Community Handbook Image" />
85-
</div></div>
86-
</a>
87-
</div>
76+
</div>
8877
</div>
78+
</a>
79+
</div>
80+
</div>
81+
82+
<div class="forum-card">
83+
<a href="https://discuss.layer5.io">
84+
<div class="forum-section landing-card">
85+
<div class="landing-card-text">
86+
<span class="landing-card-title">Discussion forum</span>
87+
<p>Cloud Native Management of developer-defined infrastructure. Join the open source-first community of cloud native engineers.</p>
88+
</div>
89+
<div class="forum-image">
90+
<img src="images/landing/discuss.png" alt="Discussion Forum Image" />
91+
</div>
92+
</div>
93+
</a>
94+
</div>
8995

90-
</div> <!-- Wrapper close -->
96+
</div>
97+
<!-- Wrapper close -->
9198

9299
<div class="dash-tangle"></div>
93100
<div class="dash-ircle-container">

‎layouts/_default/baseof.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
<main role="main" class="td-main">{{ block "main" . }}{{ end }}</main>
1717
{{ partial "footer.html" . }}
1818
</div>
19-
{{ partialCached "scripts.html" . }} {{ partial "image-modal.html" . }}
19+
{{ partialCached "scripts.html" . }}
2020
</body>
2121
</html>

‎layouts/_default/content.html

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<div class="td-content">
2+
<h1>{{ .Title }}</h1>
3+
{{ with .Params.description }}<div class="lead">{{ . | markdownify }}</div>{{ end }}
4+
<header class="article-meta{{ if or .Params.categories .Params.tags }} article-meta-bg{{ end }}">
5+
{{ partial "taxonomy_terms_article_wrapper.html" . -}}
6+
{{ if (and (not .Params.hide_readingtime) (.Site.Params.ui.readingtime.enable)) -}}
7+
{{ partial "reading-time.html" . -}}
8+
{{ end -}}
9+
</header>
10+
{{ .Content }}
11+
{{ if (.Site.Params.DisqusShortname) -}}
12+
<br />
13+
{{- partial "disqus-comment.html" . -}}
14+
{{ end -}}
15+
{{ partial "page-meta-lastmod.html" . }}
16+
</div>
17+
{{/**/ -}}

‎layouts/docs/list.html

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{{ define "main" }}
2+
<div class="td-content">
3+
<h1>{{ .Title }}</h1>
4+
{{ with .Params.description }}<div class="lead">{{ . | markdownify }}</div>{{ end }}
5+
<header class="article-meta{{ if or .Params.categories .Params.tags }} article-meta-bg{{ end }}">
6+
{{ partial "taxonomy_terms_article_wrapper.html" . -}}
7+
{{ if (and (not .Params.hide_readingtime) (.Site.Params.ui.readingtime.enable)) -}}
8+
{{ partial "reading-time.html" . -}}
9+
{{ end -}}
10+
</header>
11+
{{ .Content }}
12+
{{ partial "section-index.html" . -}}
13+
14+
{{ if (.Site.DisqusShortname) -}}
15+
<br />
16+
{{- partial "disqus-comment.html" . -}}
17+
{{ end -}}
18+
{{ partial "page-meta-lastmod.html" . -}}
19+
</div>
20+
{{ end -}}

0 commit comments

Comments
 (0)