Skip to content

Commit

Permalink
Merge branch 'dev' into fix/772/set-to-top-elem-on-scrollable-height
Browse files Browse the repository at this point in the history
  • Loading branch information
Jh123x authored May 7, 2024
2 parents 86416cb + bc416af commit fce82b4
Show file tree
Hide file tree
Showing 43 changed files with 82 additions and 34 deletions.
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
/assets/lib/

/layouts/_default/_markup/*.html
/layouts/partials/picture.html
/layouts/shortcodes/figure.html
/layouts/shortcodes/screenshot.html

Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Umami Analytics support ([#832](https://github.com/jpanther/congo/pull/832))
- Theme parameter to set a default HTML theme colour ([#849](https://github.com/jpanther/congo/pull/849))
- New icon for `bluesky` ([#851](https://github.com/jpanther/congo/pull/851))
- Support for article sharing to Threads ([#869](https://github.com/jpanther/congo/issues/869))

### Changed

Expand All @@ -20,6 +21,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

- Featured images overlap page title when article metadata hidden ([#827](https://github.com/jpanther/congo/issues/827))
- Inconsistent picture rendering between `figure` shortcode and Markdown render hook ([#828](https://github.com/jpanther/congo/issues/828))
- Animated GIF files are static when `enableImageWebp` is enabled ([#866](https://github.com/jpanther/congo/issues/866))
- Next article pagination link animation is inverted ([#870](https://github.com/jpanther/congo/issues/870))

## [2.8.2] - 2024-04-17

Expand Down
5 changes: 5 additions & 0 deletions assets/css/compiled/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -2786,6 +2786,11 @@ code {
visibility: visible;
}

.group:hover .group-hover\:-translate-x-\[-2px\] {
--tw-translate-x: 2px;
transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
}

.group:hover .group-hover\:-translate-x-\[2px\] {
--tw-translate-x: -2px;
transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
Expand Down
1 change: 1 addition & 0 deletions config/_default/languages.en.toml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ title = "Congo"
# { stack-overflow = "https://stackoverflow.com/users/userid/username" },
# { steam = "https://steamcommunity.com/profiles/userid" },
# { telegram = "https://t.me/username" },
# { threads = "https://threads.net/@username" },
# { tiktok = "https://tiktok.com/@username" },
# { tumblr = "https://username.tumblr.com" },
# { twitch = "https://twitch.tv/username" },
Expand Down
4 changes: 2 additions & 2 deletions config/_default/params.toml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ fingerprintAlgorithm = "sha256"
showTaxonomies = false
showWordCount = false
showComments = false
# sharingLinks = ["facebook", "x-twitter", "mastodon", "pinterest", "reddit", "linkedin", "email", "telegram", "line", "weibo"]
# sharingLinks = ["facebook", "x-twitter", "mastodon", "pinterest", "reddit", "linkedin", "email", "threads", "telegram", "line", "weibo"]

[list]
showBreadcrumbs = false
Expand All @@ -78,7 +78,7 @@ fingerprintAlgorithm = "sha256"
# script = ""

#[umamiAnalytics]
# site = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
# site = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
# region = "eu" # can be either "eu" or "us"

[verification]
Expand Down
5 changes: 5 additions & 0 deletions data/sharing.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,11 @@
"title": "sharing.x-twitter",
"url": "https://x.com/intent/tweet/?url=%s&text=%s"
},
"threads": {
"icon": "threads",
"title": "sharing.threads",
"url": "https://www.threads.net/intent/post?text=%s %s"
},
"telegram": {
"icon": "telegram",
"title": "sharing.telegram",
Expand Down
2 changes: 1 addition & 1 deletion exampleSite/config/_default/params.toml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ fingerprintAlgorithm = "sha256"
showTaxonomies = false
showWordCount = false
showComments = false
# sharingLinks = ["facebook", "twitter", "mastodon", "pinterest", "reddit", "linkedin", "email", "telegram", "line", "weibo"]
# sharingLinks = ["facebook", "x-twitter", "mastodon", "pinterest", "reddit", "linkedin", "email", "threads", "telegram", "line", "weibo"]

[list]
showBreadcrumbs = true
Expand Down
2 changes: 1 addition & 1 deletion exampleSite/content/docs/configuration/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ Many of the article defaults here can be overridden on a per article basis by sp
|`article.showTaxonomies`|`false`|Whether or not the taxonomies related to this article are displayed.|
|`article.showWordCount`|`false`|Whether or not article word counts are displayed.|
|`article.showComments`|`false`|Whether or not the [comments partial]({{< ref "partials#comments" >}}) is included after the article footer.|
|`article.sharingLinks`|_Not set_|An array of sharing links to display at the end of each article. Valid options include `facebook`, `x-twitter`, `mastodon`, `pinterest`, `reddit`, `linkedin`, `email`, `telegram` and `line`. When not provided, or set to `false`, no links will be displayed.|
|`article.sharingLinks`|_Not set_|An array of sharing links to display at the end of each article. Valid options include `facebook`, `x-twitter`, `mastodon`, `pinterest`, `reddit`, `linkedin`, `email`, `threads`, `telegram` and `line`. When not provided, or set to `false`, no links will be displayed.|
|`list.showBreadcrumbs`|`false`|Whether or not breadcrumbs are displayed in the header on list pages.|
|`list.showTableOfContents`|`false`|Whether or not the table of contents is displayed on list pages.|
|`list.showTaxonomies`|`false`|Whether or not the taxonomies related to this article are displayed on list pages.|
Expand Down
2 changes: 2 additions & 0 deletions exampleSite/content/users/index.es.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,5 +75,7 @@ La lista a continuación es solo un puñado de sitios web creados con el tema Co
| [techwolf12.nl](https://techwolf12.nl) | Personal Site and Tech Blog |
| [kylecapehart.com](https://kylecapehart.com/) | Personal Site and Blog |
| [hosni.info](https://hosni.info/) | Personal site and Tech Blog |
| [mattstrayer.com](https://www.mattstrayer.com/) | Personal Site and Blog |
| [noamlerner.com](https://www.noamlerner.com/) | Personal blog (English/Hebrew) |

**¿Usuaria de congo?** Para agregar tu sitio a esta lista, [haz un pull request](https://github.com/jpanther/congo/blob/dev/exampleSite/content/users/index.md).
2 changes: 2 additions & 0 deletions exampleSite/content/users/index.ja.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,5 +75,7 @@ Congoを使用して構築された実際のウェブサイト。
| [techwolf12.nl](https://techwolf12.nl) | Personal Site and Tech Blog |
| [kylecapehart.com](https://kylecapehart.com/) | Personal Site and Blog |
| [hosni.info](https://hosni.info/) | Personal site and Tech Blog |
| [mattstrayer.com](https://www.mattstrayer.com/) | Personal Site and Blog |
| [noamlerner.com](https://www.noamlerner.com/) | Personal blog (English/Hebrew) |

**Congoを使っていますか?** あなたのウェブサイトを加えるために[Pull Request](https://github.com/jpanther/congo/blob/dev/exampleSite/content/users/index.md)を投げてください。
1 change: 1 addition & 0 deletions i18n/ar.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ sharing:
pinterest: "تثبيت على بينتريست"
reddit: "نشر على ريديت"
twitter: "تغريد على تويتر"
# threads: "Post on Threads"
telegram: "شارك على تيليجرام"
line: "شارك على لاين"
# weibo: "Share on Weibo"
Expand Down
1 change: 1 addition & 0 deletions i18n/bg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ sharing:
reddit: "Публикуване в Reddit"
twitter: "Туит в Twitter"
telegram: "Споделете в Telegram"
# threads: "Post on Threads"
line: "Споделете в LINE"
weibo: "Споделете в Weibo"
# x-twitter: "Post on X"
Expand Down
1 change: 1 addition & 0 deletions i18n/bn.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ sharing:
pinterest: "পিন্টারেস্টে পিন করুন"
reddit: "রেড্ডিটে জমা দিন"
twitter: "ট্যুইট করুন"
# threads: "Post on Threads"
telegram: "টেলিগ্রামে শেয়ার করুন"
line: "লাইনে শেয়ার করুন"
# weibo: "Share on Weibo"
Expand Down
1 change: 1 addition & 0 deletions i18n/cs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ sharing:
pinterest: "Pin na Pinterest"
reddit: "Odeslat na Reddit"
twitter: "Tweet na Twitter"
# threads: "Post on Threads"
telegram: "Sdílejte na Telegram"
line: "Sdílejte na LINE"
weibo: "Sdílejte na Weibo"
Expand Down
1 change: 1 addition & 0 deletions i18n/de.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ sharing:
pinterest: "Auf Pinterest pinnen"
reddit: "An Reddit senden"
twitter: "Auf Twitter teilen"
# threads: "Post on Threads"
telegram: "Auf Telegram teilen"
line: "Auf LINE teilen"
weibo: "Auf Weibo teilen"
Expand Down
1 change: 1 addition & 0 deletions i18n/en.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ sharing:
pinterest: "Pin on Pinterest"
reddit: "Submit to Reddit"
twitter: "Tweet on Twitter"
threads: "Post on Threads"
telegram: "Share on Telegram"
line: "Share on LINE"
weibo: "Share on Weibo"
Expand Down
1 change: 1 addition & 0 deletions i18n/es.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ sharing:
pinterest: "Pinear en Pinterest"
reddit: "Publicar en Reddit"
twitter: "Tuitear en Twitter"
# threads: "Post on Threads"
telegram: "Compartir en Telegram"
line: "Compartir en LINE"
weibo: "Compartir en Weibo"
Expand Down
1 change: 1 addition & 0 deletions i18n/fi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ sharing:
pinterest: "Kiinnitä Pinterestiin"
reddit: "Lähetä Reddittiin"
twitter: "Twiittaa Twitterissä"
# threads: "Post on Threads"
telegram: "Jaa Telegramissa"
line: "Jaa LINEssä"
weibo: "Jaa Weibossä"
Expand Down
1 change: 1 addition & 0 deletions i18n/fr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ sharing:
pinterest: "Poster sur Pinterest"
reddit: "Poster sur Reddit"
twitter: "Tweeter"
# threads: "Post on Threads"
telegram: "Partager sur Telegram"
line: "Partager sur LINE"
weibo: "Partager sur Weibo"
Expand Down
1 change: 1 addition & 0 deletions i18n/he.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ sharing:
pinterest: "שיתוף בפינטרסט"
reddit: "שליחה לרדיט"
twitter: "ציוץ בטוויטר"
# threads: "Post on Threads"
telegram: "שיתוף בטלגרם"
line: "שיתוף בליין"
# weibo: "Share on Weibo"
Expand Down
1 change: 1 addition & 0 deletions i18n/hu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ sharing:
pinterest: "Megosztás a Pinteresten"
reddit: "Megosztás a Redditen"
twitter: "Megosztás a Twitteren"
# threads: "Post on Threads"
telegram: "Megosztás a Telegramon"
line: "Megosztás a LINE-on"
weibo: "Megosztás a Weibo-on"
Expand Down
1 change: 1 addition & 0 deletions i18n/id.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ sharing:
pinterest: "Pin di Pinterest"
reddit: "Kirim ke Reddit"
twitter: "Tweet di Twitter"
# threads: "Post on Threads"
telegram: "Bagikan ke Telegram"
line: "Bagikan ke LINE"
weibo: "Bagikan ke Weibo"
Expand Down
1 change: 1 addition & 0 deletions i18n/it.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ sharing:
pinterest: "Pinna su Pinterest"
reddit: "Invia a Reddit"
twitter: "Tweetta su Twitter"
# threads: "Post on Threads"
telegram: "Condividi su Telegram"
line: "Condividi su LINE"
weibo: "Condividi su Weibo"
Expand Down
1 change: 1 addition & 0 deletions i18n/ja.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ sharing:
pinterest: "Pinterestでピンする"
reddit: "Redditに投稿する"
twitter: "Twitterに投稿する"
# threads: "Post on Threads"
telegram: "Telegramでシェアする"
line: "LINEでシェアする"
weibo: "Weiboでシェアする"
Expand Down
1 change: 1 addition & 0 deletions i18n/ko.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ sharing:
pinterest: "Pinterest에 핀하기"
reddit: "Reddit에 게시하기"
twitter: "Twitter에 트윗하기"
# threads: "Post on Threads"
telegram: "Telegram에 공유하기"
line: "LINE에 공유하기"
weibo: "Weibo에 공유하기"
Expand Down
1 change: 1 addition & 0 deletions i18n/nl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ sharing:
pinterest: "Pin op Pinterest"
reddit: "Verzend naar Reddit"
twitter: "Tweet op Twitter"
# threads: "Post on Threads"
telegram: "Deel op Telegram"
line: "Deel op LINE"
weibo: "Deel op Weibo"
Expand Down
1 change: 1 addition & 0 deletions i18n/pl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ sharing:
pinterest: "Udostępnij na Pinterest"
reddit: "Udostępnij na Reddit"
twitter: "Udostępnij na Twitter"
# threads: "Post on Threads"
telegram: "Udostępnij na Telegram"
line: "Udostępnij na LINE"
weibo: "Udostępnij na Weibo"
Expand Down
1 change: 1 addition & 0 deletions i18n/pt-BR.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ sharing:
pinterest: "Pin no Pinterest"
reddit: "Postar no Reddit"
twitter: "Tweet no Twitter"
# threads: "Post on Threads"
telegram: "Compartilhar pelo Telegram"
line: "Compartilhar pelo LINE"
weibo: "Compartilhar pelo weibo"
Expand Down
1 change: 1 addition & 0 deletions i18n/pt-PT.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ sharing:
pinterest: "Partilhar no Pinterest"
reddit: "Partilhar no Reddit"
twitter: "Partilhar no Twitter"
# threads: "Post on Threads"
telegram: "Partilhar pelo Telegram"
line: "Partilhar pelo LINE"
weibo: "Partilhar pelo Weibo"
Expand Down
1 change: 1 addition & 0 deletions i18n/ro.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ sharing:
pinterest: "Pune pe Pinterest"
reddit: "Postează pe Reddit"
twitter: "Scrie pe Twitter"
# threads: "Post on Threads"
telegram: "Trimite pe Telegram"
line: "Trimite pe LINE"
weibo: "Trimite pe Weibo"
Expand Down
1 change: 1 addition & 0 deletions i18n/ru.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ sharing:
pinterest: "Поделиться на Pinterest"
reddit: "Опубликовать на Reddit"
twitter: "Опубликовать на Twitter"
# threads: "Post on Threads"
telegram: "Поделиться на Telegram"
line: "Поделиться на LINE"
weibo: "Поделиться на Weibo"
Expand Down
1 change: 1 addition & 0 deletions i18n/sk.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ sharing:
pinterest: "Pin na Pinterest"
reddit: "Odoslať na Reddit"
twitter: "Tweet na Twitteri"
# threads: "Post on Threads"
telegram: "Zdieľaj na Telegram"
line: "Zdieľaj na LINE"
weibo: "Zdieľaj na Weibo"
Expand Down
1 change: 1 addition & 0 deletions i18n/sv.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ sharing:
pinterest: "Fäst på Pinterest"
reddit: "Publicera på Reddit"
twitter: "Twittra på Twitter"
# threads: "Post on Threads"
telegram: "Dela på Telegram"
line: "Dela på LINE"
weibo: "Dela på Weibo"
Expand Down
1 change: 1 addition & 0 deletions i18n/ta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ sharing:
pinterest: "Pinterest இல் பின் செய்யவும்"
reddit: "Reddit க்கு சமர்ப்பிக்கவும்"
twitter: "Twitter இல் ட்வீட் செய்யுங்கள்"
# threads: "Post on Threads"
telegram: "Telegram இல் பகிரவும்"
line: "LINE இல் பகிரவும்"
weibo: "Weibo இல் பகிரவும்"
Expand Down
1 change: 1 addition & 0 deletions i18n/tr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ sharing:
pinterest: "Pinterest'te pinle"
reddit: "Reddit'te gönder"
twitter: "Twitter'da Tweetle"
# threads: "Post on Threads"
telegram: "Telegram'da paylaş"
line: "LINE'da paylaş"
weibo: "Weibo'da paylaş"
Expand Down
1 change: 1 addition & 0 deletions i18n/uk.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ sharing:
pinterest: "Зберегти на Pinterest"
reddit: "Опублікувати на Reddit"
twitter: "Поширити на Twitter"
# threads: "Post on Threads"
telegram: "Поширити на Telegram"
line: "Поширити на LINE"
weibo: "Поширити на Weibo"
Expand Down
1 change: 1 addition & 0 deletions i18n/vi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ sharing:
pinterest: "Pin lên Pinterest"
reddit: "Gửi lên Reddit"
twitter: "Tweet lên Twitter"
# threads: "Post on Threads"
telegram: "Chia sẻ lên Telegram"
line: "Chia sẻ lên LINE"
weibo: "Chia sẻ lên Weibo"
Expand Down
1 change: 1 addition & 0 deletions i18n/zh-CN.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ sharing:
pinterest: "钉到 Pinterest"
reddit: "提交到 Reddit"
twitter: "分享到 Twitter"
# threads: "Post on Threads"
telegram: "分享到 Telegram"
line: "分享到 LINE"
weibo: "分享到 微博"
Expand Down
1 change: 1 addition & 0 deletions i18n/zh-TW.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ sharing:
pinterest: "釘到 Pinterest"
reddit: "發送到 Reddit"
twitter: "推到 Twitter"
# threads: "Post on Threads"
telegram: "分享到 Telegram"
line: "分享到 LINE"
weibo: "分享到 微博"
Expand Down
2 changes: 1 addition & 1 deletion layouts/partials/article-pagination.html
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
</span>
</span>
<span
class="ms-2 text-neutral-700 transition-transform group-hover:-translate-x-[2px] group-hover:text-primary-600 dark:text-neutral dark:group-hover:text-primary-400"
class="ms-2 text-neutral-700 transition-transform group-hover:-translate-x-[-2px] group-hover:text-primary-600 dark:text-neutral dark:group-hover:text-primary-400"
><span class="ltr:inline rtl:hidden">&rarr;</span
><span class="ltr:hidden rtl:inline">&larr;</span></span
>
Expand Down
4 changes: 2 additions & 2 deletions layouts/partials/picture.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
{{ end }}
{{ end }}
{{ if (eq "" $width $height) }}
{{ warnf "Can't detect width and height for SVG %s" .RelPermalink }}
{{ warnf "[CONGO] Can't detect width and height for SVG %s" .RelPermalink }}
{{/* do not use lazy without dimensions */}}
{{ $lazy = false }}
{{ end }}
Expand Down Expand Up @@ -53,7 +53,7 @@
{{ $width = div .Width 2 }}
{{ $height = div .Height 2 }}
{{ end }}
{{ if $webp }}
{{ if and $webp (ne .MediaType.SubType "gif") }}
<source
{{ if lt .Width 660 }}
{{ with .Resize (printf "%dx%d webp" .Width .Height) }}
Expand Down
Loading

0 comments on commit fce82b4

Please sign in to comment.