🔖 Release v2.0.5

pull/155/head v2.0.5
James Panther 2022-02-20 14:42:07 +11:00
commit 480492a976
No known key found for this signature in database
GPG Key ID: D36F789E45745D17
19 changed files with 212 additions and 138 deletions

View File

@ -6,6 +6,24 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
## [Unreleased] ## [Unreleased]
## [2.0.5] - 2022-02-20
### Added
- Bengali translation ([#115](https://github.com/jpanther/congo/pull/115))
### Changed
- Upgrade to Tailwind v3.0.23 and Typography v0.5.2
- Upgrade to Mermaid v8.14.0
- Upgrade to Chart.js v3.7.1
### Fixed
- Updated date is displayed even when it is the same as published date
- Structured data on homepage unparsable by Google ([#113](https://github.com/jpanther/congo/issues/113))
- Underline styles not displaying correctly in some browsers ([#125](https://github.com/jpanther/congo/issues/125))
## [2.0.4] - 2022-02-09 ## [2.0.4] - 2022-02-09
### Changed ### Changed
@ -325,7 +343,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Advanced customisation using simple Tailwind colour definitions and styles - Advanced customisation using simple Tailwind colour definitions and styles
- Fully documented - Fully documented
[unreleased]: https://github.com/jpanther/congo/compare/v2.0.4...HEAD [unreleased]: https://github.com/jpanther/congo/compare/v2.0.5...HEAD
[2.0.5]: https://github.com/jpanther/congo/compare/v2.0.4...v2.0.5
[2.0.4]: https://github.com/jpanther/congo/compare/v2.0.3...v2.0.4 [2.0.4]: https://github.com/jpanther/congo/compare/v2.0.3...v2.0.4
[2.0.3]: https://github.com/jpanther/congo/compare/v2.0.2...v2.0.3 [2.0.3]: https://github.com/jpanther/congo/compare/v2.0.2...v2.0.3
[2.0.2]: https://github.com/jpanther/congo/compare/v2.0.1...v2.0.2 [2.0.2]: https://github.com/jpanther/congo/compare/v2.0.1...v2.0.2

View File

@ -1,6 +1,6 @@
/*! Congo v2.0.4 | MIT License | https://github.com/jpanther/congo */ /*! Congo v2.0.5 | MIT License | https://github.com/jpanther/congo */
/*! tailwindcss v3.0.19 | MIT License | https://tailwindcss.com */ /*! tailwindcss v3.0.23 | MIT License | https://tailwindcss.com */
/* /*
1. Prevent padding and border from affecting element width. (https://github.com/mozdevs/cssremedy/issues/4) 1. Prevent padding and border from affecting element width. (https://github.com/mozdevs/cssremedy/issues/4)
@ -481,7 +481,7 @@ Ensure the default browser behavior of the `hidden` attribute.
margin-bottom: 1.2em; margin-bottom: 1.2em;
} }
.prose a { .prose :where(a):not(:where([class~="not-prose"] *)) {
color: var(--tw-prose-links); color: var(--tw-prose-links);
text-decoration: underline; text-decoration: underline;
font-weight: 500; font-weight: 500;
@ -489,10 +489,10 @@ Ensure the default browser behavior of the `hidden` attribute.
text-decoration-color: rgb(var(--color-primary-300)); text-decoration-color: rgb(var(--color-primary-300));
} }
:where(.prose a:hover):not(:where([class~="not-prose"] *)) { .prose :where(a):not(:where([class~="not-prose"] *)):hover {
color: rgb(var(--color-neutral)) !important; color: rgb(var(--color-neutral));
text-decoration: none !important; text-decoration: none;
background-color: rgb(var(--color-primary-600)) !important; background-color: rgb(var(--color-primary-600));
border-radius: 0.09rem; border-radius: 0.09rem;
} }
@ -2156,6 +2156,16 @@ body a, body button {
text-decoration-line: none !important; text-decoration-line: none !important;
} }
.decoration-primary-500 {
-webkit-text-decoration-color: rgb(var(--color-primary-500));
text-decoration-color: rgb(var(--color-primary-500));
}
.decoration-neutral-300 {
-webkit-text-decoration-color: rgb(var(--color-neutral-300));
text-decoration-color: rgb(var(--color-neutral-300));
}
.opacity-0 { .opacity-0 {
opacity: 0; opacity: 0;
} }
@ -2238,16 +2248,6 @@ body a, body button {
text-decoration-line: underline; text-decoration-line: underline;
} }
.hover\:decoration-primary-500:hover {
-webkit-text-decoration-color: rgb(var(--color-primary-500));
text-decoration-color: rgb(var(--color-primary-500));
}
.hover\:decoration-neutral-300:hover {
-webkit-text-decoration-color: rgb(var(--color-neutral-300));
text-decoration-color: rgb(var(--color-neutral-300));
}
.hover\:decoration-primary-400:hover { .hover\:decoration-primary-400:hover {
-webkit-text-decoration-color: rgb(var(--color-primary-400)); -webkit-text-decoration-color: rgb(var(--color-primary-400));
text-decoration-color: rgb(var(--color-primary-400)); text-decoration-color: rgb(var(--color-primary-400));

View File

@ -1,4 +1,4 @@
/*! Congo v2.0.4 | MIT License | https://github.com/jpanther/congo */ /*! Congo v2.0.5 | MIT License | https://github.com/jpanther/congo */
@tailwind base; @tailwind base;
@tailwind components; @tailwind components;

File diff suppressed because one or more lines are too long

2
assets/lib/mermaid/mermaid.min.js vendored 100644 → 100755

File diff suppressed because one or more lines are too long

View File

@ -50,6 +50,7 @@ The theme currently supports the following languages by default:
| Language | Code | | Language | Code |
| ---------------------------- | ------- | | ---------------------------- | ------- |
| :gb: English | `en` | | :gb: English | `en` |
| :bangladesh: Bengali | `bn` |
| :cn: Chinese | `zh` | | :cn: Chinese | `zh` |
| :fr: French | `fr` | | :fr: French | `fr` |
| :de: German | `de` | | :de: German | `de` |

View File

@ -27,10 +27,15 @@ To enable Fathom Analytics support, simply provide your Fathom site code in the
Google Analytics support is provided through the internal Hugo partial. Simply provide the `googleAnalytics` key in the `config/_default/config.toml` file and the script will be added automatically. Google Analytics support is provided through the internal Hugo partial. Simply provide the `googleAnalytics` key in the `config/_default/config.toml` file and the script will be added automatically.
Both version 3 (analytics.js) and version 4 (gtag.js) are supported, based on the configuration value provided:
```toml ```toml
# config/_default/config.toml # config/_default/config.toml
# version 3
googleAnalytics = "UA-PROPERTY_ID" googleAnalytics = "UA-PROPERTY_ID"
# version 4
googleAnalytics = "G-MEASUREMENT_ID"
``` ```
### Custom analytics providers ### Custom analytics providers

View File

@ -26,9 +26,9 @@ Implementing this new version has also removed some Tailwind plugin dependencies
A highly requested feature, Congo is now multilingual! If you publish your content in multiple languages, the site will be built with all the translations available. A highly requested feature, Congo is now multilingual! If you publish your content in multiple languages, the site will be built with all the translations available.
<div class="text-2xl text-center" style="font-size: 2.8rem">:flag-au: :de: :fr: :es: :cn: :brazil: :tr:</div> <div class="text-2xl text-center" style="font-size: 2.8rem">:gb: :de: :fr: :es: :cn: :brazil: :tr: :bangladesh:</div>
Thanks to submissions from the community, Congo has already been translated into [seven languages](https://github.com/jpanther/congo/tree/dev/i18n) with more to be added over time. By the way, [pull requests](https://github.com/jpanther/congo/pulls) for new languages are always welcome! Thanks to submissions from the community, Congo has already been translated into [eight languages](https://github.com/jpanther/congo/tree/dev/i18n) with more to be added over time. By the way, [pull requests](https://github.com/jpanther/congo/pulls) for new languages are always welcome!
## RTL language support ## RTL language support

55
i18n/bn.yaml 100644
View File

@ -0,0 +1,55 @@
article:
anchor_label: "Anchor"
date: "{{ .Date }}"
date_updated: "সর্বশেষ সম্পাদনার তারিখ: {{ .Date }}"
draft: "খসড়া"
edit_title: "সম্পাদনা করুন"
reading_time:
one: "{{ .Count }} মিনিট"
other: "{{ .Count }} মিনিট"
reading_time_title: "পড়ার সময়"
table_of_contents: "বিষয়সূচী"
word_count:
one: "{{ .Count }} টি শব্দ"
other: "{{ .Count }} টি শব্দ"
author:
byline_title: "লেখক"
code:
copy: "কপি করুন"
copied: "কপি হয়ে গেছে"
error:
404_title: "পেজটি খুঁজে পাওয়া যায়নি :confused:"
404_error: "Error 404"
404_description: "মনে হচ্ছে, আপনার অনুরোধ করা পেজটি খুঁজে পাওয়া যায়নি।"
footer:
dark_appearance: "ডার্ক মোডে স্যুইচ করুন"
light_appearance: "লাইট মোডে স্যুইচ করুন"
powered_by: "{{ .Hugo }} এবং {{ .Congo }} দ্বারা চালিত"
list:
externalurl_title: "অন্য ওয়েবসাইটের লিংক"
no_articles: "এখানে তালিকাভুক্ত করার মতো আপাতত কিছুই নেই।"
nav:
scroll_to_top_title: "পেজের উপরের দিকে যান"
skip_to_main: "মূল বিষয়ে যান"
search:
open_button_title: "খুঁজুন (/)"
close_button_title: "বন্ধ করুন (Esc)"
input_placeholder: "খুঁজুন"
sharing:
email: "ইমেল করুন"
facebook: "ফেসবুকে শেয়ার করুন"
linkedin: "লিংকডইনে শেয়ার করুন"
pinterest: "পিন্টারেস্টে পিন করুন"
reddit: "রেড্ডিটে জমা দিন"
twitter: "ট্যুইট করুন"
shortcode:
recent_articles: "সাম্প্রতিক"

View File

@ -17,7 +17,7 @@
<article class="w-full px-2 my-3 overflow-hidden sm:w-1/2 md:w-1/3 lg:w-1/4 xl:w-1/5"> <article class="w-full px-2 my-3 overflow-hidden sm:w-1/2 md:w-1/3 lg:w-1/4 xl:w-1/5">
<h2 class="flex items-center"> <h2 class="flex items-center">
<a <a
class="text-xl font-medium hover:underline hover:decoration-primary-500 hover:underline-offset-2" class="text-xl font-medium hover:underline decoration-primary-500 hover:underline-offset-2"
href="{{ .Page.RelPermalink }}" href="{{ .Page.RelPermalink }}"
>{{ .Page.Title }}</a >{{ .Page.Title }}</a
> >

View File

@ -2,7 +2,7 @@
<h3 class="flex items-center mt-6 text-xl font-semibold"> <h3 class="flex items-center mt-6 text-xl font-semibold">
{{ with .Params.externalUrl }} {{ with .Params.externalUrl }}
<a <a
class="hover:underline hover:decoration-primary-500 hover:underline-offset-2 text-neutral-800 dark:text-neutral" class="decoration-primary-500 hover:underline hover:underline-offset-2 text-neutral-800 dark:text-neutral"
href="{{ . }}" href="{{ . }}"
target="_blank" target="_blank"
rel="external" rel="external"
@ -16,7 +16,7 @@
</span> </span>
{{ else }} {{ else }}
<a <a
class="hover:underline hover:decoration-primary-500 hover:underline-offset-2 text-neutral-800 dark:text-neutral" class="decoration-primary-500 hover:underline hover:underline-offset-2 text-neutral-800 dark:text-neutral"
href="{{ .RelPermalink }}" href="{{ .RelPermalink }}"
>{{ .Title | emojify }}</a >{{ .Title | emojify }}</a
> >

View File

@ -16,7 +16,7 @@
{{ $meta.Add "partials" (slice (partial "meta/date.html" .Date)) }} {{ $meta.Add "partials" (slice (partial "meta/date.html" .Date)) }}
{{ end }} {{ end }}
{{ if .Params.showDateUpdated | default (.Site.Params.article.showDateUpdated | default false) }} {{ if and (.Params.showDateUpdated | default (.Site.Params.article.showDateUpdated | default false)) (ne .Date .Lastmod) }}
{{ $meta.Add "partials" (slice (partial "meta/date-updated.html" .Lastmod)) }} {{ $meta.Add "partials" (slice (partial "meta/date-updated.html" .Lastmod)) }}
{{ end }} {{ end }}

View File

@ -9,7 +9,7 @@
{{ end }} {{ end }}
<li class="inline {{ if or (eq .p1 .p2) (.p1.IsHome) }}hidden{{ end }}"> <li class="inline {{ if or (eq .p1 .p2) (.p1.IsHome) }}hidden{{ end }}">
<a <a
class="hover:underline hover:decoration-neutral-300 dark:underline-neutral-600" class="hover:underline decoration-neutral-300 dark:underline-neutral-600"
href="{{ .p1.RelPermalink }}" href="{{ .p1.RelPermalink }}"
>{{ if .p1.Title }} >{{ if .p1.Title }}
{{- .p1.Title -}} {{- .p1.Title -}}

View File

@ -6,7 +6,7 @@
{{ range .Site.Menus.footer }} {{ range .Site.Menus.footer }}
<li class="mb-1 sm:mb-0 sm:mr-7 sm:last:mr-0"> <li class="mb-1 sm:mb-0 sm:mr-7 sm:last:mr-0">
<a <a
class="hover:underline hover:decoration-primary-500 hover:decoration-2 hover:underline-offset-2" class="decoration-primary-500 hover:underline hover:decoration-2 hover:underline-offset-2"
href="{{ .URL }}" href="{{ .URL }}"
title="{{ .Title }}" title="{{ .Title }}"
>{{ .Name | markdownify | emojify }}</a >{{ .Name | markdownify | emojify }}</a

View File

@ -18,7 +18,7 @@
{{ end }} {{ end }}
{{ else }} {{ else }}
<a <a
class="hover:underline hover:decoration-primary-500 hover:decoration-2 hover:underline-offset-2" class="decoration-primary-500 hover:underline hover:decoration-2 hover:underline-offset-2"
rel="me" rel="me"
href="{{ "/" | relLangURL }}" href="{{ "/" | relLangURL }}"
>{{ .Site.Title | markdownify | emojify }}</a >{{ .Site.Title | markdownify | emojify }}</a
@ -35,7 +35,7 @@
class="mb-1 ltr:text-right rtl:text-left sm:mb-0 ltr:sm:mr-7 ltr:sm:last:mr-0 rtl:sm:ml-7 rtl:sm:last:ml-0" class="mb-1 ltr:text-right rtl:text-left sm:mb-0 ltr:sm:mr-7 ltr:sm:last:mr-0 rtl:sm:ml-7 rtl:sm:last:ml-0"
> >
<a <a
class="hover:underline hover:decoration-primary-500 hover:decoration-2 hover:underline-offset-2" class="decoration-primary-500 hover:underline hover:decoration-2 hover:underline-offset-2"
href="{{ .URL }}" href="{{ .URL }}"
title="{{ .Title }}" title="{{ .Title }}"
>{{ .Name | markdownify | emojify }}</a >{{ .Name | markdownify | emojify }}</a

View File

@ -8,11 +8,11 @@
{{ with .Site.Params.description }}"description": "{{ . | safeJS }}",{{ end }} {{ with .Site.Params.description }}"description": "{{ . | safeJS }}",{{ end }}
{{ with .Site.LanguageCode }}"inLanguage": "{{ . }}",{{ end }} {{ with .Site.LanguageCode }}"inLanguage": "{{ . }}",{{ end }}
"url": "{{ (site.GetPage "/").Permalink | safeURL }}", "url": "{{ (site.GetPage "/").Permalink | safeURL }}",
{{ with .Site.Params.keywords }}"keywords": {{ . }},{{ end }}
"publisher" : { "publisher" : {
"@type": "Person", "@type": "Person",
"name": "{{ .Site.Author.name | safeJS }}", "name": "{{ .Site.Author.name | safeJS }}"
}, }
{{ with .Site.Params.keywords }}"keywords": {{ . }},{{ end }}
} }
</script> </script>
{{ else if .IsPage }} {{ else if .IsPage }}

182
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "hugo-congo-theme", "name": "hugo-congo-theme",
"version": "2.0.3", "version": "2.0.4",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "hugo-congo-theme", "name": "hugo-congo-theme",
"version": "2.0.3", "version": "2.0.4",
"hasInstallScript": true, "hasInstallScript": true,
"license": "MIT", "license": "MIT",
"devDependencies": { "devDependencies": {
@ -161,9 +161,9 @@
} }
}, },
"node_modules/@tailwindcss/typography": { "node_modules/@tailwindcss/typography": {
"version": "0.5.1", "version": "0.5.2",
"resolved": "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.1.tgz", "resolved": "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.2.tgz",
"integrity": "sha512-AmSzZSgLhHKlILKduU+PKBTHL6c+al82syZlRid1xgmlWwXagLigO+O++B4C0scpMfzW//f/3YCRcwwEHWoU3w==", "integrity": "sha512-coq8DBABRPFcVhVIk6IbKyyHUt7YTEC/C992tatFB+yEx5WGBQrCgsSFjxHUr8AWXphWckadVJbominEduYBqw==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"lodash.castarray": "^4.4.0", "lodash.castarray": "^4.4.0",
@ -312,16 +312,16 @@
} }
}, },
"node_modules/browserslist": { "node_modules/browserslist": {
"version": "4.19.1", "version": "4.19.3",
"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.19.1.tgz", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.19.3.tgz",
"integrity": "sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==", "integrity": "sha512-XK3X4xtKJ+Txj8G5c30B4gsm71s69lqXlkYui4s6EkKxuv49qjYlY6oVd+IFJ73d4YymtM3+djvvt/R/iJwwDg==",
"dev": true, "dev": true,
"peer": true, "peer": true,
"dependencies": { "dependencies": {
"caniuse-lite": "^1.0.30001286", "caniuse-lite": "^1.0.30001312",
"electron-to-chromium": "^1.4.17", "electron-to-chromium": "^1.4.71",
"escalade": "^3.1.1", "escalade": "^3.1.1",
"node-releases": "^2.0.1", "node-releases": "^2.0.2",
"picocolors": "^1.0.0" "picocolors": "^1.0.0"
}, },
"bin": { "bin": {
@ -354,9 +354,9 @@
} }
}, },
"node_modules/caniuse-lite": { "node_modules/caniuse-lite": {
"version": "1.0.30001309", "version": "1.0.30001312",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001309.tgz", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001312.tgz",
"integrity": "sha512-Pl8vfigmBXXq+/yUz1jUwULeq9xhMJznzdc/xwl4WclDAuebcTHVefpz8lE/bMI+UN7TOkSSe7B7RnZd6+dzjA==", "integrity": "sha512-Wiz1Psk2MEK0pX3rUzWaunLTZzqS2JYZFzNKqAiJGiuxIjRPLgV6+VDPOg6lQOUxmDwhTlh198JsTTi8Hzw6aQ==",
"dev": true, "dev": true,
"peer": true, "peer": true,
"funding": { "funding": {
@ -381,9 +381,9 @@
} }
}, },
"node_modules/chart.js": { "node_modules/chart.js": {
"version": "3.7.0", "version": "3.7.1",
"resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.7.0.tgz", "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.7.1.tgz",
"integrity": "sha512-31gVuqqKp3lDIFmzpKIrBeum4OpZsQjSIAqlOpgjosHDJZlULtvwLEZKtEhIAZc7JMPaHlYMys40Qy9Mf+1AAg==", "integrity": "sha512-8knRegQLFnPQAheZV8MjxIXc5gQEfDFD897BJgv/klO/vtIyFFmgMXrNfgrXpbTr/XbTturxRgxIXx/Y+ASJBA==",
"dev": true "dev": true
}, },
"node_modules/chokidar": { "node_modules/chokidar": {
@ -1288,15 +1288,15 @@
"dev": true "dev": true
}, },
"node_modules/dompurify": { "node_modules/dompurify": {
"version": "2.3.4", "version": "2.3.5",
"resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.3.4.tgz", "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.3.5.tgz",
"integrity": "sha512-6BVcgOAVFXjI0JTjEvZy901Rghm+7fDQOrNIcxB4+gdhj6Kwp6T9VBhBY/AbagKHJocRkDYGd6wvI+p4/10xtQ==", "integrity": "sha512-kD+f8qEaa42+mjdOpKeztu9Mfx5bv9gVLO6K9jRx4uGvh6Wv06Srn4jr1wPNY2OOUGGSKHNFN+A8MA3v0E0QAQ==",
"dev": true "dev": true
}, },
"node_modules/electron-to-chromium": { "node_modules/electron-to-chromium": {
"version": "1.4.66", "version": "1.4.71",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.66.tgz", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.71.tgz",
"integrity": "sha512-f1RXFMsvwufWLwYUxTiP7HmjprKXrqEWHiQkjAYa9DJeVIlZk5v8gBGcaV+FhtXLly6C1OTVzQY+2UQrACiLlg==", "integrity": "sha512-Hk61vXXKRb2cd3znPE9F+2pLWdIOmP7GjiTj45y6L3W/lO+hSnUSUhq+6lEaERWBdZOHbk2s3YV5c9xVl3boVw==",
"dev": true, "dev": true,
"peer": true "peer": true
}, },
@ -1684,16 +1684,16 @@
} }
}, },
"node_modules/mermaid": { "node_modules/mermaid": {
"version": "8.13.10", "version": "8.14.0",
"resolved": "https://registry.npmjs.org/mermaid/-/mermaid-8.13.10.tgz", "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-8.14.0.tgz",
"integrity": "sha512-2ANep359uML87+wiYaWSu83eg9Qc0xCLnNJdCh100m4v0orS3fp8SScsZLcDSElRGHi+1zuVJsEEVEWH05+COQ==", "integrity": "sha512-ITSHjwVaby1Li738sxhF48sLTxcNyUAoWfoqyztL1f7J6JOLpHOuQPNLBb6lxGPUA0u7xP9IRULgvod0dKu35A==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@braintree/sanitize-url": "^3.1.0", "@braintree/sanitize-url": "^3.1.0",
"d3": "^7.0.0", "d3": "^7.0.0",
"dagre": "^0.8.5", "dagre": "^0.8.5",
"dagre-d3": "^0.6.4", "dagre-d3": "^0.6.4",
"dompurify": "2.3.4", "dompurify": "2.3.5",
"graphlib": "^2.1.8", "graphlib": "^2.1.8",
"khroma": "^1.4.1", "khroma": "^1.4.1",
"moment-mini": "^2.24.0", "moment-mini": "^2.24.0",
@ -1714,9 +1714,9 @@
} }
}, },
"node_modules/minimatch": { "node_modules/minimatch": {
"version": "3.0.5", "version": "3.1.2",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
"integrity": "sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
@ -1738,11 +1738,10 @@
"dev": true "dev": true
}, },
"node_modules/nanoid": { "node_modules/nanoid": {
"version": "3.2.0", "version": "3.3.1",
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz",
"integrity": "sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==", "integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==",
"dev": true, "dev": true,
"peer": true,
"bin": { "bin": {
"nanoid": "bin/nanoid.cjs" "nanoid": "bin/nanoid.cjs"
}, },
@ -1760,9 +1759,9 @@
} }
}, },
"node_modules/node-releases": { "node_modules/node-releases": {
"version": "2.0.1", "version": "2.0.2",
"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz", "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.2.tgz",
"integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==", "integrity": "sha512-XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg==",
"dev": true, "dev": true,
"peer": true "peer": true
}, },
@ -1861,8 +1860,7 @@
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
"integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
"dev": true, "dev": true
"peer": true
}, },
"node_modules/picomatch": { "node_modules/picomatch": {
"version": "2.3.1", "version": "2.3.1",
@ -1881,7 +1879,6 @@
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.6.tgz", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.6.tgz",
"integrity": "sha512-OovjwIzs9Te46vlEx7+uXB0PLijpwjXGKXjVGGPIGubGpq7uh5Xgf6D6FiJ/SzJMBosHDp6a2hiXOS97iBXcaA==", "integrity": "sha512-OovjwIzs9Te46vlEx7+uXB0PLijpwjXGKXjVGGPIGubGpq7uh5Xgf6D6FiJ/SzJMBosHDp6a2hiXOS97iBXcaA==",
"dev": true, "dev": true,
"peer": true,
"dependencies": { "dependencies": {
"nanoid": "^3.2.0", "nanoid": "^3.2.0",
"picocolors": "^1.0.0", "picocolors": "^1.0.0",
@ -1915,9 +1912,9 @@
} }
}, },
"node_modules/postcss-load-config": { "node_modules/postcss-load-config": {
"version": "3.1.1", "version": "3.1.3",
"resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.1.tgz", "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.3.tgz",
"integrity": "sha512-c/9XYboIbSEUZpiD1UQD0IKiUe8n9WHYV7YFe7X7J+ZwCsEKkUJSFWjS9hBU1RR9THR7jMXst8sxiqP0jjo2mg==", "integrity": "sha512-5EYgaM9auHGtO//ljHH+v/aC/TQ5LHXtL7bQajNAUBKUVKiYE8rYpFms7+V26D9FncaGe2zwCoPQsFKb5zF/Hw==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"lilconfig": "^2.0.4", "lilconfig": "^2.0.4",
@ -2145,7 +2142,6 @@
"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
"integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
"dev": true, "dev": true,
"peer": true,
"engines": { "engines": {
"node": ">=0.10.0" "node": ">=0.10.0"
} }
@ -2181,9 +2177,9 @@
} }
}, },
"node_modules/tailwindcss": { "node_modules/tailwindcss": {
"version": "3.0.19", "version": "3.0.23",
"resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.19.tgz", "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.23.tgz",
"integrity": "sha512-rjsdfz/qZya5xQ0OVynEMETgWq1CacmftgMYeXXh6bRM5vxsNwRSbMJsCCIjq/w67om9VP/AFMolOwiE+5VKig==", "integrity": "sha512-+OZOV9ubyQ6oI2BXEhzw4HrqvgcARY38xv3zKcjnWtMIZstEsXdI9xftd1iB7+RbOnj2HOEzkA0OyB5BaSxPQA==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"arg": "^5.0.1", "arg": "^5.0.1",
@ -2199,6 +2195,7 @@
"is-glob": "^4.0.3", "is-glob": "^4.0.3",
"normalize-path": "^3.0.0", "normalize-path": "^3.0.0",
"object-hash": "^2.2.0", "object-hash": "^2.2.0",
"postcss": "^8.4.6",
"postcss-js": "^4.0.0", "postcss-js": "^4.0.0",
"postcss-load-config": "^3.1.0", "postcss-load-config": "^3.1.0",
"postcss-nested": "5.0.6", "postcss-nested": "5.0.6",
@ -2398,9 +2395,9 @@
} }
}, },
"@tailwindcss/typography": { "@tailwindcss/typography": {
"version": "0.5.1", "version": "0.5.2",
"resolved": "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.1.tgz", "resolved": "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.2.tgz",
"integrity": "sha512-AmSzZSgLhHKlILKduU+PKBTHL6c+al82syZlRid1xgmlWwXagLigO+O++B4C0scpMfzW//f/3YCRcwwEHWoU3w==", "integrity": "sha512-coq8DBABRPFcVhVIk6IbKyyHUt7YTEC/C992tatFB+yEx5WGBQrCgsSFjxHUr8AWXphWckadVJbominEduYBqw==",
"dev": true, "dev": true,
"requires": { "requires": {
"lodash.castarray": "^4.4.0", "lodash.castarray": "^4.4.0",
@ -2509,16 +2506,16 @@
} }
}, },
"browserslist": { "browserslist": {
"version": "4.19.1", "version": "4.19.3",
"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.19.1.tgz", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.19.3.tgz",
"integrity": "sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==", "integrity": "sha512-XK3X4xtKJ+Txj8G5c30B4gsm71s69lqXlkYui4s6EkKxuv49qjYlY6oVd+IFJ73d4YymtM3+djvvt/R/iJwwDg==",
"dev": true, "dev": true,
"peer": true, "peer": true,
"requires": { "requires": {
"caniuse-lite": "^1.0.30001286", "caniuse-lite": "^1.0.30001312",
"electron-to-chromium": "^1.4.17", "electron-to-chromium": "^1.4.71",
"escalade": "^3.1.1", "escalade": "^3.1.1",
"node-releases": "^2.0.1", "node-releases": "^2.0.2",
"picocolors": "^1.0.0" "picocolors": "^1.0.0"
} }
}, },
@ -2535,9 +2532,9 @@
"dev": true "dev": true
}, },
"caniuse-lite": { "caniuse-lite": {
"version": "1.0.30001309", "version": "1.0.30001312",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001309.tgz", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001312.tgz",
"integrity": "sha512-Pl8vfigmBXXq+/yUz1jUwULeq9xhMJznzdc/xwl4WclDAuebcTHVefpz8lE/bMI+UN7TOkSSe7B7RnZd6+dzjA==", "integrity": "sha512-Wiz1Psk2MEK0pX3rUzWaunLTZzqS2JYZFzNKqAiJGiuxIjRPLgV6+VDPOg6lQOUxmDwhTlh198JsTTi8Hzw6aQ==",
"dev": true, "dev": true,
"peer": true "peer": true
}, },
@ -2552,9 +2549,9 @@
} }
}, },
"chart.js": { "chart.js": {
"version": "3.7.0", "version": "3.7.1",
"resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.7.0.tgz", "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.7.1.tgz",
"integrity": "sha512-31gVuqqKp3lDIFmzpKIrBeum4OpZsQjSIAqlOpgjosHDJZlULtvwLEZKtEhIAZc7JMPaHlYMys40Qy9Mf+1AAg==", "integrity": "sha512-8knRegQLFnPQAheZV8MjxIXc5gQEfDFD897BJgv/klO/vtIyFFmgMXrNfgrXpbTr/XbTturxRgxIXx/Y+ASJBA==",
"dev": true "dev": true
}, },
"chokidar": { "chokidar": {
@ -3306,15 +3303,15 @@
"dev": true "dev": true
}, },
"dompurify": { "dompurify": {
"version": "2.3.4", "version": "2.3.5",
"resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.3.4.tgz", "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.3.5.tgz",
"integrity": "sha512-6BVcgOAVFXjI0JTjEvZy901Rghm+7fDQOrNIcxB4+gdhj6Kwp6T9VBhBY/AbagKHJocRkDYGd6wvI+p4/10xtQ==", "integrity": "sha512-kD+f8qEaa42+mjdOpKeztu9Mfx5bv9gVLO6K9jRx4uGvh6Wv06Srn4jr1wPNY2OOUGGSKHNFN+A8MA3v0E0QAQ==",
"dev": true "dev": true
}, },
"electron-to-chromium": { "electron-to-chromium": {
"version": "1.4.66", "version": "1.4.71",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.66.tgz", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.71.tgz",
"integrity": "sha512-f1RXFMsvwufWLwYUxTiP7HmjprKXrqEWHiQkjAYa9DJeVIlZk5v8gBGcaV+FhtXLly6C1OTVzQY+2UQrACiLlg==", "integrity": "sha512-Hk61vXXKRb2cd3znPE9F+2pLWdIOmP7GjiTj45y6L3W/lO+hSnUSUhq+6lEaERWBdZOHbk2s3YV5c9xVl3boVw==",
"dev": true, "dev": true,
"peer": true "peer": true
}, },
@ -3617,16 +3614,16 @@
"dev": true "dev": true
}, },
"mermaid": { "mermaid": {
"version": "8.13.10", "version": "8.14.0",
"resolved": "https://registry.npmjs.org/mermaid/-/mermaid-8.13.10.tgz", "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-8.14.0.tgz",
"integrity": "sha512-2ANep359uML87+wiYaWSu83eg9Qc0xCLnNJdCh100m4v0orS3fp8SScsZLcDSElRGHi+1zuVJsEEVEWH05+COQ==", "integrity": "sha512-ITSHjwVaby1Li738sxhF48sLTxcNyUAoWfoqyztL1f7J6JOLpHOuQPNLBb6lxGPUA0u7xP9IRULgvod0dKu35A==",
"dev": true, "dev": true,
"requires": { "requires": {
"@braintree/sanitize-url": "^3.1.0", "@braintree/sanitize-url": "^3.1.0",
"d3": "^7.0.0", "d3": "^7.0.0",
"dagre": "^0.8.5", "dagre": "^0.8.5",
"dagre-d3": "^0.6.4", "dagre-d3": "^0.6.4",
"dompurify": "2.3.4", "dompurify": "2.3.5",
"graphlib": "^2.1.8", "graphlib": "^2.1.8",
"khroma": "^1.4.1", "khroma": "^1.4.1",
"moment-mini": "^2.24.0", "moment-mini": "^2.24.0",
@ -3644,9 +3641,9 @@
} }
}, },
"minimatch": { "minimatch": {
"version": "3.0.5", "version": "3.1.2",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
"integrity": "sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
"dev": true, "dev": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
@ -3665,11 +3662,10 @@
"dev": true "dev": true
}, },
"nanoid": { "nanoid": {
"version": "3.2.0", "version": "3.3.1",
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz",
"integrity": "sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==", "integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==",
"dev": true, "dev": true
"peer": true
}, },
"ncp": { "ncp": {
"version": "2.0.0", "version": "2.0.0",
@ -3678,9 +3674,9 @@
"dev": true "dev": true
}, },
"node-releases": { "node-releases": {
"version": "2.0.1", "version": "2.0.2",
"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz", "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.2.tgz",
"integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==", "integrity": "sha512-XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg==",
"dev": true, "dev": true,
"peer": true "peer": true
}, },
@ -3755,8 +3751,7 @@
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
"integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
"dev": true, "dev": true
"peer": true
}, },
"picomatch": { "picomatch": {
"version": "2.3.1", "version": "2.3.1",
@ -3769,7 +3764,6 @@
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.6.tgz", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.6.tgz",
"integrity": "sha512-OovjwIzs9Te46vlEx7+uXB0PLijpwjXGKXjVGGPIGubGpq7uh5Xgf6D6FiJ/SzJMBosHDp6a2hiXOS97iBXcaA==", "integrity": "sha512-OovjwIzs9Te46vlEx7+uXB0PLijpwjXGKXjVGGPIGubGpq7uh5Xgf6D6FiJ/SzJMBosHDp6a2hiXOS97iBXcaA==",
"dev": true, "dev": true,
"peer": true,
"requires": { "requires": {
"nanoid": "^3.2.0", "nanoid": "^3.2.0",
"picocolors": "^1.0.0", "picocolors": "^1.0.0",
@ -3786,9 +3780,9 @@
} }
}, },
"postcss-load-config": { "postcss-load-config": {
"version": "3.1.1", "version": "3.1.3",
"resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.1.tgz", "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.3.tgz",
"integrity": "sha512-c/9XYboIbSEUZpiD1UQD0IKiUe8n9WHYV7YFe7X7J+ZwCsEKkUJSFWjS9hBU1RR9THR7jMXst8sxiqP0jjo2mg==", "integrity": "sha512-5EYgaM9auHGtO//ljHH+v/aC/TQ5LHXtL7bQajNAUBKUVKiYE8rYpFms7+V26D9FncaGe2zwCoPQsFKb5zF/Hw==",
"dev": true, "dev": true,
"requires": { "requires": {
"lilconfig": "^2.0.4", "lilconfig": "^2.0.4",
@ -3919,8 +3913,7 @@
"version": "1.0.2", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
"integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
"dev": true, "dev": true
"peer": true
}, },
"stylis": { "stylis": {
"version": "4.0.13", "version": "4.0.13",
@ -3944,9 +3937,9 @@
"dev": true "dev": true
}, },
"tailwindcss": { "tailwindcss": {
"version": "3.0.19", "version": "3.0.23",
"resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.19.tgz", "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.23.tgz",
"integrity": "sha512-rjsdfz/qZya5xQ0OVynEMETgWq1CacmftgMYeXXh6bRM5vxsNwRSbMJsCCIjq/w67om9VP/AFMolOwiE+5VKig==", "integrity": "sha512-+OZOV9ubyQ6oI2BXEhzw4HrqvgcARY38xv3zKcjnWtMIZstEsXdI9xftd1iB7+RbOnj2HOEzkA0OyB5BaSxPQA==",
"dev": true, "dev": true,
"requires": { "requires": {
"arg": "^5.0.1", "arg": "^5.0.1",
@ -3962,6 +3955,7 @@
"is-glob": "^4.0.3", "is-glob": "^4.0.3",
"normalize-path": "^3.0.0", "normalize-path": "^3.0.0",
"object-hash": "^2.2.0", "object-hash": "^2.2.0",
"postcss": "^8.4.6",
"postcss-js": "^4.0.0", "postcss-js": "^4.0.0",
"postcss-load-config": "^3.1.0", "postcss-load-config": "^3.1.0",
"postcss-nested": "5.0.6", "postcss-nested": "5.0.6",

View File

@ -1,6 +1,6 @@
{ {
"name": "hugo-congo-theme", "name": "hugo-congo-theme",
"version": "2.0.4", "version": "2.0.5",
"description": "Congo theme for Hugo", "description": "Congo theme for Hugo",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {
@ -29,15 +29,15 @@
}, },
"homepage": "https://github.com/jpanther/congo#readme", "homepage": "https://github.com/jpanther/congo#readme",
"devDependencies": { "devDependencies": {
"@tailwindcss/typography": "^0.5.0", "@tailwindcss/typography": "^0.5.2",
"chart.js": "^3.7.0", "chart.js": "^3.7.1",
"fuse.js": "^6.5.3", "fuse.js": "^6.5.3",
"katex": "^0.15.2", "katex": "^0.15.2",
"mermaid": "^8.13.10", "mermaid": "^8.14.0",
"prettier": "^2.3.2", "prettier": "^2.3.2",
"prettier-plugin-go-template": "^0.0.11", "prettier-plugin-go-template": "^0.0.11",
"rimraf": "^3.0.2", "rimraf": "^3.0.2",
"tailwindcss": "^3.0.17", "tailwindcss": "^3.0.23",
"vendor-copy": "^3.0.1" "vendor-copy": "^3.0.1"
}, },
"vendorCopy": [], "vendorCopy": [],

View File

@ -98,9 +98,9 @@ module.exports = {
textDecorationColor: theme("colors.primary.300"), textDecorationColor: theme("colors.primary.300"),
fontWeight: "500", fontWeight: "500",
"&:hover": { "&:hover": {
color: `${theme("colors.neutral.DEFAULT")} !important`, color: theme("colors.neutral.DEFAULT"),
textDecoration: "none !important", textDecoration: "none",
backgroundColor: `${theme("colors.primary.600")} !important`, backgroundColor: theme("colors.primary.600"),
borderRadius: "0.09rem", borderRadius: "0.09rem",
}, },
}, },