Skip to content

Commit

Permalink
Merge branch 'meshery:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
SAHU-01 authored Oct 22, 2024
2 parents 2fcd6f8 + b5063d6 commit 158c520
Show file tree
Hide file tree
Showing 119 changed files with 588 additions and 74 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ Find out more about the <a href="https://layer5.io/community#meshmate">Layer5 co

<p>
✔️ <em><strong>Join</strong></em> any or all of the weekly meetings on the <a href="https://calendar.google.com/calendar/b/1?cid=bGF5ZXI1LmlvX2VoMmFhOWRwZjFnNDBlbHZvYzc2MmpucGhzQGdyb3VwLmNhbGVuZGFyLmdvb2dsZS5jb20">community calendar</a>.<br />
✔️ <em><strong>Watch</strong></em> community <a href="https://www.youtube.com/playlist?list=PL3A-A6hPO2IMPPqVjuzgqNU5xwnFFn3n0">meeting recordings</a>.<br />
✔️ <em><strong>Watch</strong></em> community <a href="https://www.youtube.com/Layer5io?sub_confirmation=1">meeting recordings</a>.<br />
✔️ <em><strong>Access</strong></em> the <b>Community Drive</b>-by completing a community <a href="https://layer5.io/newcomer">Member Form</a>.<br />
✔️ <em><strong>Discuss</strong></em> in the <a href="https://discuss.layer5.io">Community Forum</a>.<br />
✔️ <em><strong>RSVP</strong></em> to the <a href="https://community.cncf.io/meshery-community/">CNCF Meshery Community</a> meetings.<br />
Expand Down
2 changes: 1 addition & 1 deletion _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ collections:
charts:
output: false
contributors:
output: true
output: false
extensions:
output: true
permalink: /:collection/:name
Expand Down
2 changes: 1 addition & 1 deletion _data/discuss/meshery.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion _data/footer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
social_icon: Twitter
new_window: true
- name: YouTube
link: https://www.youtube.com/channel/UCFL1af7_wdnhHXL1InzaMvA
link: https://www.youtube.com/Layer5io?sub_confirmation=1
social_icon: YouTube
new_window: true
- name: Docker Hub
Expand Down
2 changes: 1 addition & 1 deletion _data/navigation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
external: true
img_src: /assets/images/nav-icons/Slack.svg
- name: Youtube
link: https://www.youtube.com/channel/UCFL1af7_wdnhHXL1InzaMvA?sub_confirmation=1
link: https://www.youtube.com/Layer5io?sub_confirmation=1
new_window: true
external: true
img_src: /assets/images/nav-icons/Youtube.svg
Expand Down
5 changes: 3 additions & 2 deletions _includes/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,13 @@
<!-- End Google Tag Manager (noscript) -->


<div class="sitewide-banner hidden">
<!-- Sitewide Banner
<div class="sitewide-banner hidden">
<p>Meshery's CNCF incubation proposal is here. Are you a fan of Meshery?</p>
<p>
<a href="https://github.com/cncf/toc/pull/1264">Show your support by adding a reaction!</a>
</p>
</div>
</div> -->
<header id="mainHeader" class="filledHeader">
{% else %}
<header id="mainHeader">
Expand Down
2 changes: 1 addition & 1 deletion _includes/list-posts.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% for post in include.posts %}
<li class="blog-post">
<h3><a href="{% include relative-src.html src=post.url %}">{{ post.title }}</a></h3>
<h2><a href="{% include relative-src.html src=post.url %}">{{ post.title }}</a></h2>

{% include post-title.html post=post %}
<div class="post-content">
Expand Down
4 changes: 2 additions & 2 deletions _includes/partials/community.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<p class="community-block">
<ul class="project-block">
<li><em>Join</em> any or all of the weekly meetings on the <a href="https://bit.ly/2SbrRhe">community calendar</a>.</li>
<li><em>Watch</em> community <a href="https://www.youtube.com/channel/UCFL1af7_wdnhHXL1InzaMvA">meeting recordings</a>.</li>
<li><em>Watch</em> community <a href="https://www.youtube.com/Layer5io?sub_confirmation=1">meeting recordings</a>.</li>
<li><em>Submit</em> your <a href="https://layer5.io/newcomer">community member form</a>.</li>
<li><em>Discuss</em> in the <a href="https://discuss.layer5.io">community forum</a>.</li>
<li><em>Read</em> the community member <a href="https://layer5.io/community/handbook/repository-overview">welcome guide</a>.</li>
</ul>
</p>
</p>
2 changes: 1 addition & 1 deletion _includes/partials/connect.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<p class="community-block">
<ul class="project-block">
<li><em>Participate</em> in any or all of the weekly meetings on the <a href="/calendar">community calendar</a>.</li>
<li><em>Watch</em> community <a href="https://www.youtube.com/channel/UCFL1af7_wdnhHXL1InzaMvA">meeting recordings</a>.</li>
<li><em>Watch</em> community <a href="https://www.youtube.com/Layer5io?sub_confirmation=1">meeting recordings</a>.</li>
<li><em>Fill-in</em> a <a href="https://layer5.io/newcomers">community member form</a> to gain access to community resources.</li>
<li><em>Discuss</em> in the <a href="https://discuss.layer5.io">community forum</a>.</li>
<li><em>Read</em> the community member <a href="https://docs.google.com/document/d/17OPtDE_rdnPQxmk2Kauhm3GwXF1R5dZ3Cj8qZLKdo5E/edit">welcome guide</a>.</li>
Expand Down
6 changes: 4 additions & 2 deletions _sass/blog.scss
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@

.post-details {
border-bottom: 1px solid var(--brand-color-secondary);
font-size: 0.9em;
font-size: 1.25rem;
justify-content: space-between;
width: 100%;
display: flex;
Expand Down Expand Up @@ -98,14 +98,16 @@
}
.post-author {
align-self: flex-start;
font-size: 1rem;
}
}

.post-content {
.button {
margin: 30px 0 0 0;
}
li {
margin: .9rem 0;
}
}
}
.callout {
Expand Down
3 changes: 2 additions & 1 deletion _sass/elements.scss
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ html, body {
}

body {
font-family: 'Open Sans', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Helvetica Neue', sans-serif;
font-family: "Qanelas Soft", "Open Sans", sans-serif;
-webkit-font-smoothing: antialiased;
background:var(--background-light) !important;
transition: all .5s;
}
Expand Down
Loading

0 comments on commit 158c520

Please sign in to comment.