Skip to content

Commit 5d1035b

Browse files
authored
Merge branch 'master' into update-academy-theme-fix
Signed-off-by: Aabid Sofi <[email protected]>
2 parents 4cbab2a + 4a8c9de commit 5d1035b

File tree

11 files changed

+34
-55
lines changed

11 files changed

+34
-55
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ assignees: ''
2828

2929
---
3030
#### Contributor Guide and Resources
31-
- 📚 [Instructions for contributing to exoscale-academy](https://github.com/layer5io/exoscale-academy/blob/master/CONTRIBUTING.md)
31+
- 📚 [Instructions for contributing to academy-build](https://github.com/layer5io/academy-build/blob/master/CONTRIBUTING.md)
3232
- academy-template documentation [site](https://docs.layer5.io/cloud/academy/), [example](https://github.com/layer5io/academy-example/) and [theme](https://github.com/layer5io/academy-theme/)
3333
- 🎨 Wireframes and [designs for Layer5 site](https://www.figma.com/file/5ZwEkSJwUPitURD59YHMEN/Layer5-Designs) in Figma [(open invite)](https://www.figma.com/team_invite/redeem/qJy1c95qirjgWQODApilR9)
34-
- 🙋🏾🙋🏼 Questions: [Layer5 Discussion Forum](https://discuss.layer5.io) and [Layer5 Community Slack](http://slack.layer5.io)
34+
- 🙋🏾🙋🏼 Questions: [Layer5 Discussion Forum](https://discuss.layer5.io) and [Layer5 Community Slack](http://slack.layer5.io)

.github/ISSUE_TEMPLATE/ci.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ assignees: ''
1818
<!-- Stipulations of functional behavior or non-functional items that must be in-place in order for the issue to be closed. -->
1919

2020
---
21-
#### Contributor [Guides](https://docs.meshery.io/project/contributing) and Resources
22-
- 🛠 [Meshery Build & Release Strategy](https://docs.meshery.io/project/build-and-release)
21+
#### Contributor Guide and Resources
22+
- 📚 [Instructions for contributing to academy-build](https://github.com/layer5io/academy-build/blob/master/CONTRIBUTING.md)
23+
- academy-template documentation [site](https://docs.layer5.io/cloud/academy/), [example](https://github.com/layer5io/academy-example/) and [theme](https://github.com/layer5io/academy-theme/)
2324
- 🎨 Wireframes and [designs for Layer5 site](https://www.figma.com/file/5ZwEkSJwUPitURD59YHMEN/Layer5-Designs) in Figma [(open invite)](https://www.figma.com/team_invite/redeem/qJy1c95qirjgWQODApilR9)
24-
- 🙋🏾🙋🏼 Questions: [Layer5 Discussion Forum](https://discuss.layer5.io) and [Layer5 Community Slack](http://slack.layer5.io)
25+
- 🙋🏾🙋🏼 Questions: [Layer5 Discussion Forum](https://discuss.layer5.io) and [Layer5 Community Slack](http://slack.layer5.io)

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: 🙋🏾🙋🏼‍Question
4+
url: https://discuss.layer5.io
5+
about: Submit your question on the discussion forum.

.github/ISSUE_TEMPLATE/documentation.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@ assignees: ''
1313

1414
---
1515

16-
#### [Contributor Guides](https://docs.meshery.io/project/contributing) and Resources
17-
- 📚 [Instructions for contributing to documentation](https://docs.meshery.io/project/contributing/contributing-docs)
18-
- Meshery documentation [site](https://docs.meshery.io/) and [source](https://github.com/meshery/meshery/tree/master/docs)
19-
- 🛠 [Meshery Build & Release Strategy](https://docs.meshery.io/project/build-and-release)
16+
#### Contributor Guide and Resources
17+
- 📚 [Instructions for contributing to academy-build](https://github.com/layer5io/academy-build/blob/master/CONTRIBUTING.md)
18+
- academy-template documentation [site](https://docs.layer5.io/cloud/academy/), [example](https://github.com/layer5io/academy-example/) and [theme](https://github.com/layer5io/academy-theme/)
2019
- 🎨 Wireframes and [designs for Layer5 site](https://www.figma.com/file/5ZwEkSJwUPitURD59YHMEN/Layer5-Designs) in Figma [(open invite)](https://www.figma.com/team_invite/redeem/qJy1c95qirjgWQODApilR9)
2120
- 🙋🏾🙋🏼 Questions: [Layer5 Discussion Forum](https://discuss.layer5.io) and [Layer5 Community Slack](http://slack.layer5.io)

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
name: 💡 Feature Request
3-
about: Suggest an enhancement to Meshery.
3+
about: Suggest an enhancement to academy-build.
44
title: ''
55
labels: 'kind/enhancement'
66
assignees: ''
@@ -21,5 +21,8 @@ assignees: ''
2121
<!-- [Optional] Any visual diagrams of the desired user interface. -->
2222

2323
---
24-
**[Contributor Guide](https://docs.meshery.io/project/contributing)**
24+
#### Contributor Guide and Resources
25+
- 📚 [Instructions for contributing to academy-build](https://github.com/layer5io/academy-build/blob/master/CONTRIBUTING.md)
26+
- academy-template documentation [site](https://docs.layer5.io/cloud/academy/), [example](https://github.com/layer5io/academy-example/) and [theme](https://github.com/layer5io/academy-theme/)
2527
- 🎨 Wireframes and [designs for Layer5 site](https://www.figma.com/file/5ZwEkSJwUPitURD59YHMEN/Layer5-Designs) in Figma [(open invite)](https://www.figma.com/team_invite/redeem/qJy1c95qirjgWQODApilR9)
28+
- 🙋🏾🙋🏼 Questions: [Layer5 Discussion Forum](https://discuss.layer5.io) and [Layer5 Community Slack](http://slack.layer5.io)

.github/ISSUE_TEMPLATE/question.md

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

academy_config.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,15 @@
66
},
77
"1e2a8e46-937c-47ea-ab43-5716e3bcab2e": {
88
"module": "github.com/layer5io/exoscale-academy",
9-
"version": "v4.6"
9+
"version": "v0.6.5"
1010
},
1111
"11111111-1111-1111-1111-111111111111": {
1212
"module": "github.com/layer5io/layer5-academy",
13-
"version": "v2.5"
13+
"version": "v0.4.0"
1414
},
1515
"3e2f9c82-1a4c-4781-adf9-99ec22cd994e": {
16-
"module": "https://github.com/layer5io/digitalocean-academy",
17-
"version": "v0.1"
16+
"module": "github.com/layer5io/digitalocean-academy",
17+
"version": "v0.1.0"
1818
}
19-
2019
}
2120
}

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ replace github.com/FortAwesome/Font-Awesome v4.7.0+incompatible => github.com/Fo
99

1010
require (
1111
github.com/FortAwesome/Font-Awesome v4.7.0+incompatible // indirect
12-
github.com/layer5io/academy-theme v0.1.27 // indirect
13-
github.com/layer5io/exoscale-academy v0.4.6 // indirect
14-
github.com/layer5io/layer5-academy v0.2.5 // indirect
12+
github.com/layer5io/academy-theme v0.2.8 // indirect
13+
github.com/layer5io/exoscale-academy v0.6.5 // indirect
14+
github.com/layer5io/layer5-academy v0.4.1 // indirect
1515
github.com/twbs/bootstrap v5.3.7+incompatible // indirect
1616
)

go.sum

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,10 @@
11
github.com/FortAwesome/Font-Awesome v0.0.0-20241216213156-af620534bfc3 h1:/iluJkJiyTAdnqrw3Yi9rH2HNHhrrtCmj8VJe7I6o3w=
22
github.com/FortAwesome/Font-Awesome v0.0.0-20241216213156-af620534bfc3/go.mod h1:IUgezN/MFpCDIlFezw3L8j83oeiIuYoj28Miwr/KUYo=
3-
github.com/layer5io/academy-theme v0.1.23 h1:usS0IaPSYqZ62r5SsFbQT8gk7mlRgsGBdcTpxPoXmlE=
4-
github.com/layer5io/academy-theme v0.1.23/go.mod h1:Dv72UWsREOvX4Zg4mJjrpoyDxdgxxpiDotxqYBXMjXo=
5-
github.com/layer5io/academy-theme v0.1.24 h1:iz1LUC8OCiqQ1+tb/Mb2aplpipINAUWvuVowEm8SosE=
6-
github.com/layer5io/academy-theme v0.1.24/go.mod h1:Dv72UWsREOvX4Zg4mJjrpoyDxdgxxpiDotxqYBXMjXo=
7-
github.com/layer5io/academy-theme v0.1.25 h1:2yC9gunWtWoPNdVqhEEBOoIdHKI6hpjPhsoA+Uxd7hY=
8-
github.com/layer5io/academy-theme v0.1.25/go.mod h1:Dv72UWsREOvX4Zg4mJjrpoyDxdgxxpiDotxqYBXMjXo=
9-
github.com/layer5io/academy-theme v0.1.26 h1:bRt6Z5jFwZMEovRZDtceyOeUENjaFh0iIzqeGUlru7Y=
10-
github.com/layer5io/academy-theme v0.1.26/go.mod h1:Dv72UWsREOvX4Zg4mJjrpoyDxdgxxpiDotxqYBXMjXo=
11-
github.com/layer5io/academy-theme v0.1.27 h1:vVHBtZMOLJn9CbBG9iIcxxv6+TAmD3d7UusKH0a5KcE=
12-
github.com/layer5io/academy-theme v0.1.27/go.mod h1:Dv72UWsREOvX4Zg4mJjrpoyDxdgxxpiDotxqYBXMjXo=
13-
github.com/layer5io/exoscale-academy v0.4.0 h1:yC163yGQrvplEcGjrJmZRz5XHe+EknCkgfHlANuNn7Y=
14-
github.com/layer5io/exoscale-academy v0.4.0/go.mod h1:mVXp2h/NImCJ5IvVfM8q4fq8qT3Qxc5OMTBhQw4mEZ8=
15-
github.com/layer5io/exoscale-academy v0.4.1 h1:XA4nwObZPxabYjgxxg4Qk/v9nuhrNcEtcXIvQzHLppY=
16-
github.com/layer5io/exoscale-academy v0.4.1/go.mod h1:61bAPmqE//ZpzqSkYUKOi8xb+bzp1EiqGIypkBFxtgE=
17-
github.com/layer5io/exoscale-academy v0.4.3 h1:ybej05sWVwmpYfGv/Pk5omAjMUGqIwFPm0zu/oV/px8=
18-
github.com/layer5io/exoscale-academy v0.4.3/go.mod h1:+v0DqA6/WzgfjsgGzV7eMih+0ZP5o4vj9XoKUQ2u5FU=
19-
github.com/layer5io/exoscale-academy v0.4.4 h1:bIt9rxI40zrIeaeuW+07VamQz6MBgMkjj8bt0/wXUsQ=
20-
github.com/layer5io/exoscale-academy v0.4.4/go.mod h1:+v0DqA6/WzgfjsgGzV7eMih+0ZP5o4vj9XoKUQ2u5FU=
21-
github.com/layer5io/exoscale-academy v0.4.5 h1:+SweSaArX84mafwegGV/bs3obd14v8D7vM7eS2Ifei4=
22-
github.com/layer5io/exoscale-academy v0.4.5/go.mod h1:+v0DqA6/WzgfjsgGzV7eMih+0ZP5o4vj9XoKUQ2u5FU=
23-
github.com/layer5io/exoscale-academy v0.4.6 h1:Sc0K8TmHVkQAErPQR7A23kC5/hHe/Y5ZET+Z4xCTS1o=
24-
github.com/layer5io/exoscale-academy v0.4.6/go.mod h1:+v0DqA6/WzgfjsgGzV7eMih+0ZP5o4vj9XoKUQ2u5FU=
25-
github.com/layer5io/layer5-academy v0.2.2 h1:l6jAGtcntpHHz4BisUsHAJUD6ik0vKrnZO+ySlrkBAQ=
26-
github.com/layer5io/layer5-academy v0.2.2/go.mod h1:oXzz2zG5re4qo8vuuuFKQwfpTtfXUIfGly4Wv4uqYh0=
27-
github.com/layer5io/layer5-academy v0.2.4 h1:1RtR3hNyRS0XG+Nzlw6vG4YKBKAHz+sG+KYx3QO++Pg=
28-
github.com/layer5io/layer5-academy v0.2.4/go.mod h1:8CvyTQ0/L/4tLWXdsLDqUbSCOLg5kelVKg5ALvDP5rk=
29-
github.com/layer5io/layer5-academy v0.2.5 h1:v2wyTBb7UW591308n6Lh5MRVsh0doUXudz1+82F2wQI=
30-
github.com/layer5io/layer5-academy v0.2.5/go.mod h1:K+fXaaTUz/PF0JJc8y4Ta5gBB0q8evImEpE9IncTNl8=
3+
github.com/layer5io/academy-theme v0.2.8 h1:iJmAQM5jGLbpSyOAgKOpaAX6GE8AuqOz6Jm/jkqQo4g=
4+
github.com/layer5io/academy-theme v0.2.8/go.mod h1:Dv72UWsREOvX4Zg4mJjrpoyDxdgxxpiDotxqYBXMjXo=
5+
github.com/layer5io/exoscale-academy v0.6.5 h1:ZC36fwf/AwaTLdCLsBcj0rafpDCfhf9UObUid5y7G2I=
6+
github.com/layer5io/exoscale-academy v0.6.5/go.mod h1:Plyt2oY6ptY2b/m0B3LthZ5yF62lsEz4iXuSiaZy+kE=
7+
github.com/layer5io/layer5-academy v0.4.1 h1:I7Ggh8DAtR8CmVxRV9CBMB0JrHLaALvjwTYFtPposUI=
8+
github.com/layer5io/layer5-academy v0.4.1/go.mod h1:4WqhzGQQN6veMumx/IUXi6T9YEvtsP9qUxPLuGCq8mY=
319
github.com/twbs/bootstrap v5.3.7+incompatible h1:ea1W8TOWZFkqSK2M0McpgzLiUQVru3bz8aHb0j/XtuM=
3210
github.com/twbs/bootstrap v5.3.7+incompatible/go.mod h1:fZTSrkpSf0/HkL0IIJzvVspTt1r9zuf7XlZau8kpcY0=

resources/_gen/assets/scss/main.scss_a7b64cfe358ca0f98a9b572608f3a01d.content

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

0 commit comments

Comments
 (0)