Skip to content

Commit

Permalink
Merge branch 'hotfix/7.0.1' into production
Browse files Browse the repository at this point in the history
  • Loading branch information
cotes2020 committed May 18, 2024
2 parents e33547f + 33a1fa7 commit 39e4338
Show file tree
Hide file tree
Showing 9 changed files with 172 additions and 193 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,6 @@ jobs:
publish:
needs: release
uses: ./.github/workflows/publish.yml
secrets:
GH_PAT: ${{ secrets.GH_PAT }}
BUILDER: ${{ secrets.BUILDER }}
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ on:
push:
branches:
- "master"
- "hotfix/**"
paths-ignore:
- ".github/**"
- "!.github/workflows/ci.yml"
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ on:
branches:
- docs
workflow_call:
secrets:
GH_PAT:
required: true
BUILDER:
required: true

jobs:
launch:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/style-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: "Style Lint"

on:
push:
branches: ["master"]
branches: ["master", "hotfix/**"]
paths: ["_sass/**/*.scss"]
pull_request:
paths: ["_sass/**/*.scss"]
Expand Down
16 changes: 8 additions & 8 deletions _data/origin/cors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,24 @@ webfonts: https://fonts.googleapis.com/css2?family=Lato:wght@300;400&family=Sour
# Libraries

toc:
css: https://cdn.jsdelivr.net/npm/tocbot@4.25.0/dist/tocbot.min.css
js: https://cdn.jsdelivr.net/npm/tocbot@4.25.0/dist/tocbot.min.js
css: https://cdn.jsdelivr.net/npm/tocbot@4.27.20/dist/tocbot.min.css
js: https://cdn.jsdelivr.net/npm/tocbot@4.27.20/dist/tocbot.min.js

fontawesome:
css: https://cdn.jsdelivr.net/npm/@fortawesome/[email protected].1/css/all.min.css
css: https://cdn.jsdelivr.net/npm/@fortawesome/[email protected].2/css/all.min.css

search:
js: https://cdn.jsdelivr.net/npm/[email protected]/dest/simple-jekyll-search.min.js

mermaid:
js: https://cdn.jsdelivr.net/npm/mermaid@10.8.0/dist/mermaid.min.js
js: https://cdn.jsdelivr.net/npm/mermaid@10.9.0/dist/mermaid.min.js

dayjs:
js:
common: https://cdn.jsdelivr.net/npm/[email protected].10/dayjs.min.js
locale: https://cdn.jsdelivr.net/npm/[email protected].10/locale/:LOCALE.min.js
relativeTime: https://cdn.jsdelivr.net/npm/[email protected].10/plugin/relativeTime.min.js
localizedFormat: https://cdn.jsdelivr.net/npm/[email protected].10/plugin/localizedFormat.min.js
common: https://cdn.jsdelivr.net/npm/[email protected].11/dayjs.min.js
locale: https://cdn.jsdelivr.net/npm/[email protected].11/locale/:LOCALE.min.js
relativeTime: https://cdn.jsdelivr.net/npm/[email protected].11/plugin/relativeTime.min.js
localizedFormat: https://cdn.jsdelivr.net/npm/[email protected].11/plugin/localizedFormat.min.js

glightbox:
css: https://cdn.jsdelivr.net/npm/[email protected]/dist/css/glightbox.min.css
Expand Down
2 changes: 1 addition & 1 deletion _includes/embed/audio.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

{% unless src contains '://' %}
{%- capture src -%}
{% include media-url.html src=src %}
{% include media-url.html src=src subpath=page.media_subpath %}
{%- endcapture -%}
{% endunless %}

Expand Down
2 changes: 1 addition & 1 deletion _includes/embed/video.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

{% unless video_url contains '://' %}
{%- capture video_url -%}
{% include media-url.html src=video_url %}
{% include media-url.html src=video_url subpath=page.media_subpath %}
{%- endcapture -%}
{% endunless %}

Expand Down
3 changes: 2 additions & 1 deletion _includes/pageviews/goatcounter.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
fetch(url)
.then((response) => response.json())
.then((data) => {
pv.innerText = new Intl.NumberFormat().format(data.count);
const count = data.count.replace(/\s/g, '');
pv.innerText = new Intl.NumberFormat().format(count);
})
.catch((error) => {
pv.innerText = '1';
Expand Down
Loading

0 comments on commit 39e4338

Please sign in to comment.