Skip to content

Commit e5f444d

Browse files
authored
Merge branch 'master' into feat/create-programs-layout
2 parents 6327a93 + d19f143 commit e5f444d

File tree

310 files changed

+1936
-109
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

310 files changed

+1936
-109
lines changed

.github/ISSUE_TEMPLATE/blog.md

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,21 @@ title: '[Blog]'
55
labels: 'area/blog, help wanted, framework/Jekyll, language/markdown'
66
assignees: ''
77
---
8-
Contributors and community members are encouraged to post on https://meshery.io/blog/. A new blog post fitting the following description is requested to be written by a community member:
8+
Contributors and community members are encouraged to post on https://meshery.io/blog. A new blog post fitting the following description is requested to be written by a community member:
9+
10+
**Suggested Title:**
11+
**Suggested Subtitle:**
912

10-
**Desired Title:**
11-
**Topic:**
1213
**Core points to convey in the post:**
13-
1.
14-
1.
15-
1.
14+
15+
1.
16+
1.
17+
1.
18+
1619

1720
---
1821
<img src="https://raw.githubusercontent.com/meshery/meshery.io/master/assets/images/logos/meshery-logo.png" width="16px" align="left" /><h3>Contributor Resources</h3>
1922

2023
The meshery.io website uses Jekyll and GitHub Pages. Site content is found under the [`master` branch](https://github.com/meshery/meshery.io/tree/master).
2124
- See [contributing instructions] (https://github.com/meshery/meshery/blob/master/CONTRIBUTING.md)
22-
- 🎨 Wireframes and [designs for Meshery UI](https://www.figma.com/file/SMP3zxOjZztdOLtgN4dS2W/Meshery-UI) in Figma [(open invite)](https://www.figma.com/team_invite/redeem/qJy1c95qirjgWQODApilR9).
25+
- 🎨 Wireframes and [designs for Meshery UI](https://www.figma.com/file/SMP3zxOjZztdOLtgN4dS2W/Meshery-UI) in Figma [(open invite)](https://www.figma.com/team_invite/redeem/qJy1c95qirjgWQODApilR9).

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ Before contributing, please review the [Contribution Flow](https://github.com/me
9999
- _The Meshery site is built using Jekyll - a simple static site generator! You can learn more about Jekyll and setting up your development environment in the [Jekyll Docs](https://jekyllrb.com/docs/)._
100100

101101
- First [install Ruby](https://jekyllrb.com/docs/installation/), then install Jekyll and Bundler. ( **Note** : Install the same version of Ruby as mentioned in the [Gemfile](https://github.com/meshery/meshery.io/blob/master/Gemfile) )
102+
- If your installed Ruby version does not match the one specified in the Gemfile, you can use [RVM](https://rvm.io/rvm/install) to install the correct version for your operating system.
102103

103104
### 2. Get the code
104105

_config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,7 @@ social_icons:
213213
- Twitter
214214
- YouTube
215215
- RSS
216+
- Bluesky
216217

217218
_comments:
218219
map: Update the map location and display settings.

_config_dev.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,7 @@ social_icons:
212212
- Twitter
213213
- YouTube
214214
- RSS
215+
- Bluesky
215216

216217
_comments:
217218
map: Update the map location and display settings.

_data/discuss/meshery.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

_data/footer.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
link: /programs
2121
social_icon: Internship
2222
new_window: true
23-
- name: Discussion Forums
23+
- name: Forums
2424
link: /community#discussion-forums
2525
social_icon: Forum
2626
new_window: true
@@ -49,17 +49,13 @@
4949
- name: Tutorials
5050
link: https://docs.meshery.io/guides/tutorials
5151
new_window: true
52-
53-
# - name: Service Mesh Interface
54-
# link: https://meshery.io/smi
55-
# new_window: false
5652
- name: Cloud Native Performance
5753
link: https://smp-spec.io
5854
new_window: true
5955
- title: Socials
6056
links:
6157
- name: Twitter
62-
link: https://twitter.com/mesheryio/
58+
link: https://x.com/mesheryio/
6359
social_icon: Twitter
6460
new_window: true
6561
- name: YouTube
@@ -82,3 +78,7 @@
8278
link: https://www.linkedin.com/showcase/meshery
8379
social_icon: LinkedIn
8480
new_window: true
81+
- name: Bluesky
82+
link: https://bsky.app/profile/mesheryio.bsky.social
83+
social_icon: Bluesky
84+
new_window: true

_includes/features.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ <h2 class="feature-title">Dry-run your changes to your infra <span class="specia
148148
</div>
149149
</div>
150150
<label for="slider" id="slider-label">Slider</label>
151-
<input type="range" min="1" max="100" value="50" class="slider" name='slider' id="slider" aria-labelledby="gradient-box-before gradient-box-after">
151+
<input type="range" min="1" max="100" value="50" class="slider" name='slider' id="slider" aria-labelledby="gradient-box-before gradient-box-after" style="top:-3rem;">
152152
<div class='slider-button'></div>
153153
</div>
154154
</div>

_includes/partials/catalog-feature.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ <h3 class="catalog-subheading">Harness Well-Architected Kubernetes Patterns</h3>
192192
<div class="feature-container" style="gap: 40px;">
193193

194194
<div class="card-container box tab-button" style="cursor: pointer;flex:1;position: relative;" data-target="designs-tab">
195-
<a href="catalog/designs" target="_blank" style="position: absolute;top:0;left: 0;right: 0;bottom: 0; text-decoration: none; color: inherit; display: block;z-index: 999;">
195+
<a href="/catalog/designs" target="_blank" style="position: absolute;top:0;left: 0;right: 0;bottom: 0; text-decoration: none; color: inherit; display: block;z-index: 999;">
196196
</a>
197197
<div style="display: flex; align-items: center; justify-content: space-between">
198198
<div style="display: flex
@@ -243,7 +243,7 @@ <h3 class="catalog-subheading">Harness Well-Architected Kubernetes Patterns</h3>
243243

244244

245245
<div class="card-container box tab-button " style="cursor: pointer;flex:1;" data-target="filters-tab">
246-
<a href="catalog/filters" target="_blank" style="position: absolute;top:0;left: 0;right: 0;bottom: 0;text-decoration: none; color: inherit; display: block;z-index: 999;">
246+
<a href="/catalog/filters" target="_blank" style="position: absolute;top:0;left: 0;right: 0;bottom: 0;text-decoration: none; color: inherit; display: block;z-index: 999;">
247247
</a>
248248
<div style="display: flex; align-items: center; justify-content: space-between">
249249
<div style="display: flex
@@ -293,7 +293,7 @@ <h3 class="catalog-subheading">Harness Well-Architected Kubernetes Patterns</h3>
293293
</div>
294294

295295
<div class="card-container box tab-button" style="cursor: pointer;flex:1;" data-target="models-tab">
296-
<a href="catalog/models" target="_blank" style="position: absolute;top:0;left: 0;right: 0;bottom: 0;text-decoration: none; color: inherit; display: block;z-index: 999;"></a>
296+
<a href="/catalog/models" target="_blank" style="position: absolute;top:0;left: 0;right: 0;bottom: 0;text-decoration: none; color: inherit; display: block;z-index: 999;"></a>
297297
<div style="display: flex; align-items: center; justify-content: space-between">
298298
<div style="display: flex
299299
;

_includes/post-title.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</span>
77
{% endfor %}
88
</span>
9-
{% if page.author_contributor != nil %}
9+
1010
<span class="post-author">{{ page.author_contributor }} </span><span class="post-date"> {{ include.post.date | date: "%B %d, %Y" }}</span>
11-
{% endif %}
11+
1212
</p>

_includes/social-icon.html

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,4 +84,12 @@
8484
L13.7,18.6L13.7,18.6z"/>
8585
</g>
8686
</svg>
87+
{% when "Bluesky" %}
88+
<?xml version="1.0" encoding="UTF-8"?>
89+
90+
<svg fill="#000000" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
91+
<path d="M12 10.8c-1.087-2.114-4.046-6.053-6.798-7.995C2.566.944 1.561 1.266.902 1.565C.139 1.908 0 3.08 0 3.768c0 .69.378 5.65.624 6.479c.815 2.736 3.713 3.66 6.383 3.364c.136-.02.275-.039.415-.056c-.138.022-.276.04-.415.056c-3.912.58-7.387 2.005-2.83 7.078c5.013 5.19 6.87-1.113 7.823-4.308c.953 3.195 2.05 9.271 7.733 4.308c4.267-4.308 1.172-6.498-2.74-7.078a8.741 8.741 0 0 1-.415-.056c.14.017.279.036.415.056c2.67.297 5.568-.628 6.383-3.364c.246-.828.624-5.79.624-6.478c0-.69-.139-1.861-.902-2.206c-.659-.298-1.664-.62-4.3 1.24C16.046 4.748 13.087 8.687 12 10.8"></path>
92+
</svg>
93+
94+
8795
{% endcase %}

_layouts/single-page-model.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,11 @@
121121
<button class="import" style="width: 7rem;">Visit Docs</button>
122122
</a>
123123
{% endif %}
124+
{% assign modelName = page.path | split: '/' | last | replace: '.md', '' %}
125+
<a href="/assets/modelsFiles/{{ modelName }}.tar" download>
126+
<button class="import" style="width: 10rem;">Download Model</button>
127+
</a>
128+
124129
<div class="btn-tooltip-grp">
125130
<a href="https://docs.meshery.io/project/contributing/contributing-models-quick-start">
126131
<button class="import" style="width: 12rem;">Add New Model</button>

_sass/footer.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,10 @@
6060
fill: #0077b5;
6161
}
6262

63+
&.bluesky-icon:hover svg {
64+
fill: #1185fe;
65+
}
66+
6367
&.slack-icon:hover svg .first{
6468
fill: #e91e63;
6569
}

assets/images/cilium-color.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

assets/images/cilium-white.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

assets/images/cpx-color.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

assets/images/cpx-white.svg

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)