Compare commits

..

No commits in common. "e58f3544afd147ac47f5849d5cc7ebf3961ef3a9" and "d88f6c49be3ef0965e3860efdfd5863c5fc7e2a8" have entirely different histories.

9 changed files with 84 additions and 77 deletions

View File

@ -10,7 +10,6 @@ body:
Before proceeding, please ensure the issue you're reporting is:
- not caused by local customisations in your project
- reproducible using the latest stable release of the theme
- not due to the local Hugo cache being out of date (run `hugo mod clean` to clear the cache)
- not already covered by an open issue ([check open issues](https://github.com/jpanther/congo/issues))
- not a general question or feature request (use [GitHub Discussions](https://github.com/jpanther/congo/discussions) instead)
@ -25,8 +24,8 @@ body:
id: theme-version
attributes:
label: Theme version
description: What version of Congo are you using? An easy way to check the version of the code running in your environment is by verifying the theme version comment at the top of the `main.css` file in the built output of your site.
placeholder: eg. v2.7.1
description: What version of the theme are you using? If you have not tested this issue with the latest theme release, please do so before submitting a bug report.
placeholder: eg. v2.6.0
validations:
required: true
- type: input
@ -34,7 +33,7 @@ body:
attributes:
label: Hugo version
description: What version of Hugo are you using? Please provide the output of the `hugo version` command.
placeholder: eg. hugo v0.119.0+extended darwin/arm64
placeholder: eg. hugo v0.114.0+extended darwin/arm64
validations:
required: true
- type: dropdown

View File

@ -1,11 +1,9 @@
{
"plugins": ["prettier-plugin-go-template"],
"goTemplateBracketSpacing": true,
"htmlWhitespaceSensitivity": "css",
"printWidth": 100,
"singleQuote": false,
"tabWidth": 2,
"useTabs": false,
"trailingComma": "es5",
"overrides": [
{

View File

@ -6,14 +6,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
## [Unreleased]
### Changed
- Upgrade to Tailwind v3.3.4 ([#681](https://github.com/jpanther/congo/pull/681))
### Fixed
- Extra whitespace added after links ([#679](https://github.com/jpanther/congo/issues/679))
## [2.7.1] - 2023-10-24
### Changed

View File

@ -1,6 +1,6 @@
/*! Congo v2.7.1 | MIT License | https://github.com/jpanther/congo */
/*! tailwindcss v3.3.4 | MIT License | https://tailwindcss.com */
/*! tailwindcss v3.3.3 | MIT License | https://tailwindcss.com */
/*
1. Prevent padding and border from affecting element width. (https://github.com/mozdevs/cssremedy/issues/4)
@ -1140,7 +1140,8 @@ body:has(#menu-controller:checked) {
}
.toc ul ul {
padding-inline-start: 1rem;
-webkit-padding-start: 1rem;
padding-inline-start: 1rem;
}
.toc a {
@ -1847,7 +1848,8 @@ body:has(#menu-controller:checked) {
}
.-ms-5 {
margin-inline-start: -1.25rem;
-webkit-margin-start: -1.25rem;
margin-inline-start: -1.25rem;
}
.-mt-3 {
@ -1883,15 +1885,18 @@ body:has(#menu-controller:checked) {
}
.me-14 {
margin-inline-end: 3.5rem;
-webkit-margin-end: 3.5rem;
margin-inline-end: 3.5rem;
}
.me-2 {
margin-inline-end: 0.5rem;
-webkit-margin-end: 0.5rem;
margin-inline-end: 0.5rem;
}
.me-4 {
margin-inline-end: 1rem;
-webkit-margin-end: 1rem;
margin-inline-end: 1rem;
}
.ml-2 {
@ -1903,11 +1908,13 @@ body:has(#menu-controller:checked) {
}
.ms-1 {
margin-inline-start: 0.25rem;
-webkit-margin-start: 0.25rem;
margin-inline-start: 0.25rem;
}
.ms-2 {
margin-inline-start: 0.5rem;
-webkit-margin-start: 0.5rem;
margin-inline-start: 0.5rem;
}
.mt-0 {
@ -2356,31 +2363,38 @@ body:has(#menu-controller:checked) {
}
.pe-10 {
padding-inline-end: 2.5rem;
-webkit-padding-end: 2.5rem;
padding-inline-end: 2.5rem;
}
.pe-2 {
padding-inline-end: 0.5rem;
-webkit-padding-end: 0.5rem;
padding-inline-end: 0.5rem;
}
.pe-3 {
padding-inline-end: 0.75rem;
-webkit-padding-end: 0.75rem;
padding-inline-end: 0.75rem;
}
.pe-4 {
padding-inline-end: 1rem;
-webkit-padding-end: 1rem;
padding-inline-end: 1rem;
}
.pe-5 {
padding-inline-end: 1.25rem;
-webkit-padding-end: 1.25rem;
padding-inline-end: 1.25rem;
}
.ps-2 {
padding-inline-start: 0.5rem;
-webkit-padding-start: 0.5rem;
padding-inline-start: 0.5rem;
}
.ps-5 {
padding-inline-start: 1.25rem;
-webkit-padding-start: 1.25rem;
padding-inline-start: 1.25rem;
}
.pt-3 {
@ -2965,7 +2979,8 @@ body:has(#menu-controller:checked) {
}
.sm\:me-7 {
margin-inline-end: 1.75rem;
-webkit-margin-end: 1.75rem;
margin-inline-end: 1.75rem;
}
.sm\:flex {
@ -3015,7 +3030,8 @@ body:has(#menu-controller:checked) {
}
.sm\:pe-6 {
padding-inline-end: 1.5rem;
-webkit-padding-end: 1.5rem;
padding-inline-end: 1.5rem;
}
.sm\:pt-10 {
@ -3028,11 +3044,13 @@ body:has(#menu-controller:checked) {
}
.sm\:last\:me-0:last-child {
margin-inline-end: 0px;
-webkit-margin-end: 0px;
margin-inline-end: 0px;
}
.sm\:last\:me-0\.5:last-child {
margin-inline-end: 0.125rem;
-webkit-margin-end: 0.125rem;
margin-inline-end: 0.125rem;
}
}
@ -3090,7 +3108,8 @@ body:has(#menu-controller:checked) {
}
.lg\:ps-8 {
padding-inline-start: 2rem;
-webkit-padding-start: 2rem;
padding-inline-start: 2rem;
}
}

View File

@ -1 +1 @@
<h{{ .Level }} id="{{ .Anchor | safeURL }}" class="relative group">{{ .Text | safeHTML }} {{ if .Page.Params.showHeadingAnchors | default (.Page.Site.Params.article.showHeadingAnchors | default true) }}<span class="absolute top-0 w-6 transition-opacity opacity-0 -start-6 not-prose group-hover:opacity-100"><a class="group-hover:text-primary-300 dark:group-hover:text-neutral-700" style="text-decoration-line: none !important;" href="#{{ .Anchor | safeURL }}" aria-label="{{ i18n "article.anchor_label" }}">#</a></span>{{ end }}</h{{ .Level }}>
<h{{ .Level }} id="{{ .Anchor | safeURL }}" class="relative group">{{ .Text | safeHTML }} {{ if .Page.Params.showHeadingAnchors | default (.Page.Site.Params.article.showHeadingAnchors | default true) }}<span class="absolute top-0 w-6 transition-opacity opacity-0 -start-6 not-prose group-hover:opacity-100"><a class="group-hover:text-primary-300 dark:group-hover:text-neutral-700" style="text-decoration-line: none !important;" href="#{{ .Anchor | safeURL }}" aria-label="{{ i18n "article.anchor_label" }}">#</a></span>{{ end }}</h{{ .Level }}>

View File

@ -61,4 +61,4 @@
{{ with $caption }}<figcaption class="text-center">{{ . | markdownify }}</figcaption>{{ end }}
</figure>
{{ end }}
{{ end }}
{{ end }}

View File

@ -1,11 +1,10 @@
{{ $link := .Destination }}
{{ $isRemote := strings.HasPrefix $link "http" }}
{{- if not $isRemote }}
{{ $url := urls.Parse .Destination }}
{{ if $url.Path }}
{{ $fragment := "" }}
{{- with $url.Fragment }}{{ $fragment = printf "#%s" . }}{{ end -}}
{{- with .Page.GetPage $url.Path }}{{ $link = printf "%s%s" .RelPermalink $fragment }}{{ end -}}
{{ end }}
{{ end -}}
<a href="{{ $link | safeURL }}"{{ with .Title }} title="{{ . }}"{{ end }}{{ if $isRemote }} target="_blank" rel="noreferrer"{{ end }}>{{- .Text | safeHTML -}}</a>
{{- if not $isRemote -}}
{{ $url := urls.Parse .Destination }}
{{- if $url.Path -}}
{{ $fragment := "" }}
{{- with $url.Fragment }}{{ $fragment = printf "#%s" . }}{{ end -}}
{{- with .Page.GetPage $url.Path }}{{ $link = printf "%s%s" .RelPermalink $fragment }}{{ end }}{{ end -}}
{{- end -}}
<a href="{{ $link | safeURL }}"{{ with .Title}} title="{{ . }}"{{ end }}{{ if $isRemote }} target="_blank" rel="noreferrer"{{ end }}>{{ .Text | safeHTML }}</a>

62
package-lock.json generated
View File

@ -1,12 +1,12 @@
{
"name": "hugo-congo-theme",
"version": "2.7.1",
"version": "2.6.1",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "hugo-congo-theme",
"version": "2.7.1",
"version": "2.6.1",
"hasInstallScript": true,
"license": "MIT",
"devDependencies": {
@ -19,7 +19,7 @@
"prettier-plugin-go-template": "^0.0.15",
"prettier-plugin-tailwindcss": "^0.5.6",
"rimraf": "^5.0.5",
"tailwindcss": "^3.3.4",
"tailwindcss": "^3.3.3",
"vendor-copy": "^3.0.1"
},
"funding": {
@ -1067,9 +1067,9 @@
"dev": true
},
"node_modules/fast-glob": {
"version": "3.3.1",
"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz",
"integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==",
"version": "3.2.12",
"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
"integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
"dev": true,
"dependencies": {
"@nodelib/fs.stat": "^2.0.2",
@ -1095,9 +1095,9 @@
}
},
"node_modules/fastq": {
"version": "1.15.0",
"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
"integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
"version": "1.13.0",
"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
"integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
"dev": true,
"dependencies": {
"reusify": "^1.0.4"
@ -1343,9 +1343,9 @@
}
},
"node_modules/jiti": {
"version": "1.20.0",
"resolved": "https://registry.npmjs.org/jiti/-/jiti-1.20.0.tgz",
"integrity": "sha512-3TV69ZbrvV6U5DfQimop50jE9Dl6J8O1ja1dvBbMba/sZ3YBEQqJ2VZRoQPVnhlzjNtU1vaXRZVrVjU4qtm8yA==",
"version": "1.18.2",
"resolved": "https://registry.npmjs.org/jiti/-/jiti-1.18.2.tgz",
"integrity": "sha512-QAdOptna2NYiSSpv0O/BwoHBSmz4YhpzJHyi+fnMRTXFjp7B8i/YG5Z8IfusxB1ufjcD2Sre1F3R+nX3fvy7gg==",
"dev": true,
"bin": {
"jiti": "bin/jiti.js"
@ -2782,9 +2782,9 @@
}
},
"node_modules/tailwindcss": {
"version": "3.3.4",
"resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.4.tgz",
"integrity": "sha512-JXZNOkggUAc9T5E7nCrimoXHcSf9h3NWFe5sh36CGD/3M5TRLuQeFnQoDsit2uVTqgoOZHLx5rTykLUu16vsMQ==",
"version": "3.3.3",
"resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.3.tgz",
"integrity": "sha512-A0KgSkef7eE4Mf+nKJ83i75TMyq8HqY3qmFIJSWy8bNt0v1lG7jUcpGpoTFxAwYcWOphcTBLPPJg+bDfhDf52w==",
"dev": true,
"dependencies": {
"@alloc/quick-lru": "^5.2.0",
@ -2792,10 +2792,10 @@
"chokidar": "^3.5.3",
"didyoumean": "^1.2.2",
"dlv": "^1.1.3",
"fast-glob": "^3.3.0",
"fast-glob": "^3.2.12",
"glob-parent": "^6.0.2",
"is-glob": "^4.0.3",
"jiti": "^1.19.1",
"jiti": "^1.18.2",
"lilconfig": "^2.1.0",
"micromatch": "^4.0.5",
"normalize-path": "^3.0.0",
@ -3899,9 +3899,9 @@
"dev": true
},
"fast-glob": {
"version": "3.3.1",
"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz",
"integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==",
"version": "3.2.12",
"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
"integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
"dev": true,
"requires": {
"@nodelib/fs.stat": "^2.0.2",
@ -3923,9 +3923,9 @@
}
},
"fastq": {
"version": "1.15.0",
"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
"integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
"version": "1.13.0",
"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
"integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
"dev": true,
"requires": {
"reusify": "^1.0.4"
@ -4105,9 +4105,9 @@
}
},
"jiti": {
"version": "1.20.0",
"resolved": "https://registry.npmjs.org/jiti/-/jiti-1.20.0.tgz",
"integrity": "sha512-3TV69ZbrvV6U5DfQimop50jE9Dl6J8O1ja1dvBbMba/sZ3YBEQqJ2VZRoQPVnhlzjNtU1vaXRZVrVjU4qtm8yA==",
"version": "1.18.2",
"resolved": "https://registry.npmjs.org/jiti/-/jiti-1.18.2.tgz",
"integrity": "sha512-QAdOptna2NYiSSpv0O/BwoHBSmz4YhpzJHyi+fnMRTXFjp7B8i/YG5Z8IfusxB1ufjcD2Sre1F3R+nX3fvy7gg==",
"dev": true
},
"katex": {
@ -4979,9 +4979,9 @@
"dev": true
},
"tailwindcss": {
"version": "3.3.4",
"resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.4.tgz",
"integrity": "sha512-JXZNOkggUAc9T5E7nCrimoXHcSf9h3NWFe5sh36CGD/3M5TRLuQeFnQoDsit2uVTqgoOZHLx5rTykLUu16vsMQ==",
"version": "3.3.3",
"resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.3.tgz",
"integrity": "sha512-A0KgSkef7eE4Mf+nKJ83i75TMyq8HqY3qmFIJSWy8bNt0v1lG7jUcpGpoTFxAwYcWOphcTBLPPJg+bDfhDf52w==",
"dev": true,
"requires": {
"@alloc/quick-lru": "^5.2.0",
@ -4989,10 +4989,10 @@
"chokidar": "^3.5.3",
"didyoumean": "^1.2.2",
"dlv": "^1.1.3",
"fast-glob": "^3.3.0",
"fast-glob": "^3.2.12",
"glob-parent": "^6.0.2",
"is-glob": "^4.0.3",
"jiti": "^1.19.1",
"jiti": "^1.18.2",
"lilconfig": "^2.1.0",
"micromatch": "^4.0.5",
"normalize-path": "^3.0.0",

View File

@ -38,7 +38,7 @@
"prettier-plugin-go-template": "^0.0.15",
"prettier-plugin-tailwindcss": "^0.5.6",
"rimraf": "^5.0.5",
"tailwindcss": "^3.3.4",
"tailwindcss": "^3.3.3",
"vendor-copy": "^3.0.1"
},
"vendorCopy": [],