Skip to content

Commit 6f93ca2

Browse files
authored
Merge branch 'master' into feature/koppeks/687
2 parents 1d4e26a + fecf11e commit 6f93ca2

File tree

1,216 files changed

+10526
-225718
lines changed

Some content is hidden

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

1,216 files changed

+10526
-225718
lines changed
File renamed without changes.

.github/workflows/cloud-release-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
export PRERELEASE=$( cat latest_release.json | jq '.["prerelease"]' | tr -d '"')
3333
export RELEASE_BODY=$( cat latest_release.json | jq '.["body"]' | tr -d '"')
3434
export DATE=$( cat latest_release.json | jq '.["published_at"]' | tr -d '"')
35-
printf '%b\n' "---\ntitle: $RELEASE_TAG\ndate: $DATE\ntag: $RELEASE_TAG\nprerelease: $PRERELEASE\n---\n\n$RELEASE_BODY" > ./content/en/cloud/reference/releases/$RELEASE_TAG.md
35+
printf '%b\n' "---\ntitle: $RELEASE_TAG\ndate: $DATE\ntag: $RELEASE_TAG\nprerelease: $PRERELEASE\ntoc_hide: true\n---\n\n$RELEASE_BODY" > ./content/en/cloud/reference/releases/$RELEASE_TAG.md
3636
- name: Update current release version
3737
if: steps.meshery-cloud.outputs.current_tag != steps.meshery-cloud.outputs.release_tag
3838
run: |

.github/workflows/meshery-extension-release-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
export PRERELEASE=$( cat latest_release.json | jq '.["prerelease"]' | tr -d '"')
3333
export RELEASE_BODY=$( cat latest_release.json | jq '.["body"]' | tr -d '"')
3434
export DATE=$( cat latest_release.json | jq '.["published_at"]' | tr -d '"')
35-
printf '%b\n' "---\ntitle: $RELEASE_TAG\ndate: $DATE\ntag: $RELEASE_TAG\nprerelease: $PRERELEASE\n---\n\n$RELEASE_BODY" > ./content/en/kanvas/reference/releases/$RELEASE_TAG.md
35+
printf '%b\n' "---\ntitle: $RELEASE_TAG\ndate: $DATE\ntag: $RELEASE_TAG\nprerelease: $PRERELEASE\ntoc_hide: true\n---\n\n$RELEASE_BODY" > ./content/en/kanvas/reference/releases/$RELEASE_TAG.md
3636
- name: Update current release version
3737
if: steps.meshery-extensions.outputs.current_tag != steps.meshery-extensions.outputs.release_tag
3838
run: |

.github/workflows/slack.yml

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,27 @@ jobs:
1515
- name: Get current star count
1616
run: |
1717
echo "STARS=$(curl --silent 'https://api.github.com/repos/${{ github.repository }}' -H 'Accept: application/vnd.github.preview' | jq '.stargazers_count')" >> $GITHUB_ENV
18+
1819
- name: Notify Slack
19-
env:
20-
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
21-
uses: pullreminders/slack-action@master
20+
uses: slackapi/slack-github-action@v2.1.1
2221
with:
23-
args: '{\"channel\":\"CSK7N9TGX\",\"text\":\"${{ github.actor }} just starred ${{ github.repository }}! (https://github.com/${{ github.repository }}/stargazers) Total ⭐️: ${{ env.STARS }}\"}'
22+
method: chat.postMessage
23+
token: ${{ secrets.SLACK_BOT_TOKEN }}
24+
payload: |
25+
channel: CSK7N9TGX
26+
type: "mrkdwn"
27+
text: "<https://github.com/${{ github.actor }}|${{ github.actor }}> just starred <https://github.com/${{ github.repository }}/stargazers|${{ github.repository }}> bringing the total ⭐️ count up to: ${{ env.STARS }}"
2428
2529
good-first-issue-notify:
2630
if: github.event_name == 'issues' && (github.event.label.name == 'good first issue' || github.event.label.name == 'first-timers-only')
2731
name: Notify Slack for new good-first-issue
2832
runs-on: ubuntu-latest
2933
steps:
3034
- name: Notify Slack
31-
env:
32-
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
33-
uses: pullreminders/slack-action@master
35+
uses: slackapi/slack-github-action@v2.1.1
3436
with:
35-
args: '{\"channel\":\"C019426UBNY\",\"type\":\"section\",\"text\":\":new: Good first issue up for grabs: ${{ github.event.issue.title }} - ${{ github.event.issue.html_url }} \"}'
36-
37+
method: chat.postMessage
38+
token: ${{ secrets.SLACK_BOT_TOKEN }}
39+
payload: |
40+
channel: C019426UBNY
41+
text: ":new: Good first issue up for grabs: <${{ github.event.issue.html_url }}|${{ github.event.issue.title }}>"

README.md

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -41,18 +41,6 @@ Explore tutorials and documentation by product in the https://docs.layer5.io web
4141

4242
If you find a typo or you feel like you can improve the HTML, CSS, or JavaScript, we welcome contributions. Feel free to open issues or pull requests like any normal GitHub project, and we'll merge it in 🚀
4343

44-
### Running the Site Locally
45-
46-
The website can be run locally through Golang (Hugo) or Docker. If you choose to run through Docker, everything will be a little bit slower due to the additional overhead, so for frequent contributors it may be worth it to use Golang.
47-
48-
### With Docker
49-
50-
Running the site locally is simple. Provided you have Docker installed, clone this repo, run `make docker`, and then visit <http://localhost:1313>.
51-
52-
> [!IMPORTANT]
53-
> This requires Docker Desktop version **4.24** or later, or Docker Engine with Docker
54-
> Compose version [**2.22**](https://docs.docker.com/compose/file-watch/) or later.
55-
5644
### With Golang
5745

5846
If your local development environment has a supported version (v1.21.0+) of Golang installed, next you'll need to install extended Hugo version as it has necessary SCSS/SASS support. Find all the Hugo packages here: <https://github.com/gohugoio/hugo/releases/tag/v0.120.4>
@@ -65,6 +53,15 @@ Now to setup and run the site locally run:
6553

6654
If you pull down new code from GitHub, you will occasionally need to run `make setup` again. Otherwise, there's no need to re-run `make setup` each time the site is run, you can just run `make site` to get it going and have it automatically reload as you make and save site edits.
6755

56+
### With Docker
57+
58+
Running the site locally is simple. Provided you have Docker installed, clone this repo, run `make docker`, and then visit <http://localhost:1313>.
59+
60+
> [!IMPORTANT]
61+
> This requires Docker Desktop version **4.24** or later, or Docker Engine with Docker
62+
> Compose version [**2.22**](https://docs.docker.com/compose/file-watch/) or later.
63+
64+
6865
## Layer5 Documentation Structure
6966

7067
## High-Level Outline & Information Architecture for Layer5 Documentation
@@ -76,7 +73,8 @@ If you pull down new code from GitHub, you will occasionally need to run `make s
7673
- **Personas:** Beginners, developers, admins, operators, security specialists, contributors, users of all experience levels.
7774
- **Needs:** Varied - learning fundamentals, managing tasks, understanding advanced concepts, contributing code.
7875

79-
## Cloud Docs
76+
<details>
77+
<summary><h2>Cloud Docs</h2></summary>
8078

8179
### Getting Started
8280

@@ -122,7 +120,9 @@ Keep your Kanvas designs internal to your workplace. Get remote support from Lay
122120

123121
Low-level ReST API reference for extending Layer5 Cloud.
124122

125-
## Kanvas Docs
123+
</details>
124+
<details>
125+
<summary><h2>Kanvas Docs</h2>
126126

127127
### Getting Started with Designs
128128

@@ -148,15 +148,15 @@ Operator mode is for operating your Kubernetes clusters and cloud native infrast
148148
### Core Tasks
149149

150150
- **Whiteboarding:** Kanvas Designer supports freestyle design, meaning that you can customize the appearance and layout of your diagrams without any constraints.
151-
152151
- **Deploying Designs:** Validating Designs, Undeploying Designs, Deploying Designs, Cloning a Design
153152

154153
### Reference
155154

156155
- **Keyboard Shortcuts:** Learn the keyboard shortcuts for Kanvas to enhance your designing experience.
157-
158156
- **Troubleshooting Kanvas:** Learn to Troubleshoot the Kanvas
159157

158+
</details>
159+
160160
### Contribution Guidelines
161161

162162
A detailed contribution guide for Layer5 Docs.

assets/scss/_content_project.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ h6 {
151151
>ol,
152152
>p,
153153
>pre,
154+
>details,
154155
>ul {
155156
@extend .td-max-width-on-larger-screens;
156157
}

assets/scss/_landing_project.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,13 +104,13 @@
104104
&.catalog-logo {
105105
background-image: url("/images/logos/black-semi-opaque.svg"), url("/images/logos/catalog.svg");
106106
}
107-
&.learning-path-logo{
108-
background-image: url("/images/logos/black-semi-opaque.svg"), url("/images/logos/learning-path.svg");
107+
&.academy-logo{
108+
background-image: url("/images/logos/black-semi-opaque.svg"), url("/images/logos/academy.svg");
109109
}
110110
&.recognition-program-logo{
111111
background-image: url("/images/logos/black-semi-opaque.svg"), url("/images/logos/recognition-program.png");
112112
}
113-
&.catalog-logo, &.learning-path-logo , &.recognition-program-logo {
113+
&.catalog-logo, &.academy-logo , &.recognition-program-logo {
114114
background-repeat: no-repeat;
115115
background-position: center;
116116
background-size: 50%;
@@ -196,7 +196,7 @@
196196
}
197197
}
198198

199-
.playground-card {
199+
.academy-card {
200200
max-width: 351.88px;
201201
@media (max-width:768px){
202202
max-width: 100%;

assets/scss/_styles_project.scss

Lines changed: 43 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
@import "subscription.scss";
1313
@import "_video-landing_project.scss";
1414
@import "elements_project";
15+
@import "summary.scss";
1516

1617
.navbar-dark {
1718
min-height: 5rem;
@@ -138,6 +139,9 @@ body {
138139

139140
overflow-x: hidden;
140141
}
142+
.td-content .card img {
143+
width: 100% ;
144+
}
141145

142146
// Links
143147

@@ -712,78 +716,54 @@ a:not([href]):not([class]):hover {
712716
color: $body-color;
713717
}
714718

715-
.tab-body {
716-
overflow-x: scroll;
717-
background: transparent;
718-
flex-direction: column;
719-
gap: 1rem;
720-
}
721-
722-
.tab-content>.active {
719+
.nav-tabs {
720+
border: none;
723721
display: flex;
722+
flex-wrap: nowrap;
723+
overflow-x: auto;
724+
-ms-overflow-style: none; /* IE and Edge */
725+
scrollbar-width: none; /* Firefox */
724726
}
725727

726-
.nav-tabs .nav-link.active {
727-
color: #00d3a9;
728+
.nav-tabs::-webkit-scrollbar {
729+
display: none; /* Chrome, Safari and Opera */
728730
}
729731

730-
.csvtable {
731-
width: 100%;
732+
.nav-tabs .nav-item {
733+
margin-bottom: 0;
734+
margin-right: 0;
732735
}
733-
// Only target the tabbed panels using ID naming convention
734736

735-
[id^="tabs-"] {
736-
border: 1px solid rgba($light, 0.1);
737-
border-radius: 0.5rem;
738-
padding: .5rem;
739-
margin-bottom: 1rem;
740-
background-color: rgba($light, 0.02);
741-
box-shadow: 0 0 8px rgba($dark, 0.2);
742-
743-
.nav-link {
744-
color: $light;
745-
background-color: rgba($light, 0.3); // 🆕 consistent visible bg for inactive tabs
746-
border: 2px solid rgba($light, 0.15);
747-
border-radius: 0.5rem 0.5rem 0 0;
748-
margin: 2px;
749-
padding: 0.5rem 1rem;
750-
font-weight: 500;
751-
line-height: 1.5rem;
752-
display: inline-block;
753-
transition: background-color 0.2s ease, color 0.2s ease;
754-
white-space: nowrap;
755-
box-shadow: 0 0 4px rgba($dark, 0.05); // 🆕 soft shadow for depth
756-
757-
&:hover {
758-
background-color: rgba($light, 0.5);
759-
color: $white;
760-
}
737+
.nav-tabs .nav-link {
738+
position: relative;
739+
border: 1px solid transparent;
740+
border-bottom: 1px solid $lightslategray;
741+
border-radius: 5px 5px 0 0;
742+
color: $primary;
743+
padding: 0.6rem 1.2rem;
744+
white-space: nowrap;
745+
}
761746

762-
&.active {
763-
background-color: $primary;
764-
color: #fff;
765-
border-color: $primary $primary transparent;
766-
font-weight: 600;
767-
position: relative;
768-
z-index: 2;
769-
box-shadow: none; // remove shadow from active to flatten it into content
770-
}
771-
}
747+
.nav-tabs .nav-link:not(.active):hover {
748+
background-color: lighten($dark, 10%);
749+
color: lighten($primary, 15%);
750+
border-bottom-color: lighten($lightslategray, 20%);
751+
}
772752

773-
.nav-link.disabled {
774-
background: transparent;
775-
border: none;
776-
color: rgba($light, 0.5);
777-
font-weight: 400;
778-
cursor: default;
779-
box-shadow: none;
780-
pointer-events: none;
781-
padding-left: 0;
782-
padding-right: 0;
783-
margin-right: 0.5rem;
784-
margin-left: 0.25rem;
785-
letter-spacing: 0.03em;
786-
}
753+
.nav-tabs .nav-link.active {
754+
background-color: $body-bg;
755+
font-weight: 500;
756+
border-color: $lightslategray $lightslategray;
757+
border-bottom: 1px solid $body-bg;
758+
z-index: 1;
759+
}
760+
761+
.tab-content .tab-pane {
762+
border: 1px solid $lightslategray;
763+
margin-top: -1px;
764+
padding: 1.5rem;
765+
border-radius: 0 0 5px 5px;
766+
background-color: $body-bg;
787767
}
788768

789769
html {

assets/scss/_summary.scss

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
2+
details {
3+
width: 100%;
4+
margin: 0 ;
5+
background-color: lighten($dark, 5%);
6+
margin-top: 1rem;
7+
margin-bottom: 1rem;
8+
box-shadow: 0 .1rem 1rem -.5rem rgba($dark, 0.4);
9+
border-radius: 5px;
10+
overflow: hidden;
11+
font-size: 1rem;
12+
padding: 0rem 1.5rem 0rem 1.5rem;
13+
& > h6 { color: $blonde};
14+
& > p {
15+
color: $body-color;
16+
margin-top: 1rem;
17+
}
18+
}
19+
20+
summary {
21+
padding: .25rem 0rem;
22+
margin-right: -1.5rem;
23+
margin-left: -1.5rem;
24+
display: block;
25+
background-color: lighten($dark, 10%);
26+
color: $navbar-dark-color;
27+
padding-left: 2.2rem;
28+
position: relative;
29+
cursor: pointer;
30+
font-size: 1.1rem;
31+
font-weight: normal;
32+
}
33+
34+
summary:before {
35+
content: '';
36+
border-width: .4rem;
37+
border-style: solid;
38+
border-color: transparent transparent transparent $body-color;
39+
position: absolute;
40+
left: 1rem;
41+
right: 0;
42+
top: 0;
43+
bottom: 0;
44+
height: .02rem;
45+
margin: auto;
46+
transform: rotate(0);
47+
transform-origin: .2rem 50%;
48+
transition: .25s transform ease;
49+
}
50+
51+
details[open] {
52+
padding-bottom: 0.5rem;
53+
}
54+
55+
details[open] > summary:before {
56+
transform: rotate(90deg);
57+
}
58+
59+
details summary::-webkit-details-marker {
60+
display:none;
61+
}
62+
63+
details > ul {
64+
padding: 1rem auto;
65+
margin-bottom: 0;
66+
}

build/meshery-cloud.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v0.8.309
1+
v0.8.490

0 commit comments

Comments
 (0)