🔀 Merge branch 'dev' into v2

pull/100/head
James Panther 2022-01-19 13:52:03 +11:00
commit b1a418d705
No known key found for this signature in database
GPG Key ID: D36F789E45745D17
14 changed files with 57 additions and 165 deletions

View File

@ -25,7 +25,7 @@ jobs:
- name: Build - name: Build
working-directory: ./exampleSite working-directory: ./exampleSite
run: hugo --minify --themesDir ../.. --baseURL https://jpanther.github.io/congo/ run: hugo --minify --themesDir ../.. --buildDrafts --baseURL https://jpanther.github.io/congo/
- name: Deploy - name: Deploy
uses: peaceiris/actions-gh-pages@v3 uses: peaceiris/actions-gh-pages@v3

139
.gitignore vendored
View File

@ -1,136 +1,11 @@
# Created by https://www.toptal.com/developers/gitignore/api/node,
# Edit at https://www.toptal.com/developers/gitignore?templates=node,
### Node ### ### Node ###
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
lerna-debug.log*
.pnpm-debug.log*
# Diagnostic reports (https://nodejs.org/api/report.html)
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
# Runtime data
pids
*.pid
*.seed
*.pid.lock
# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov
# Coverage directory used by tools like istanbul
coverage
*.lcov
# nyc test coverage
.nyc_output
# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
.grunt
# Bower dependency directory (https://bower.io/)
bower_components
# node-waf configuration
.lock-wscript
# Compiled binary addons (https://nodejs.org/api/addons.html)
build/Release
# Dependency directories # Dependency directories
node_modules/ node_modules/
jspm_packages/
# Snowpack dependency directory (https://snowpack.dev/)
web_modules/
# TypeScript cache
*.tsbuildinfo
# Optional npm cache directory
.npm
# Optional eslint cache
.eslintcache
# Microbundle cache
.rpt2_cache/
.rts2_cache_cjs/
.rts2_cache_es/
.rts2_cache_umd/
# Optional REPL history
.node_repl_history
# Output of 'npm pack'
*.tgz
# Yarn Integrity file
.yarn-integrity
# dotenv environment variables file
.env
.env.test
.env.production
# parcel-bundler cache (https://parceljs.org/)
.cache
.parcel-cache
# Next.js build output
.next
out
# Nuxt.js build / generate output
.nuxt
dist
# Gatsby files
.cache/
# Comment in the public line in if your project uses Gatsby and not Next.js
# https://nextjs.org/blog/next-9-1#public-directory-support
# public
# vuepress build output
.vuepress/dist
# Serverless directories
.serverless/
# FuseBox cache
.fusebox/
# DynamoDB Local files
.dynamodb/
# TernJS port file
.tern-port
# Stores VSCode versions used for testing VSCode extensions
.vscode-test
# yarn v2
.yarn/cache
.yarn/unplugged
.yarn/build-state.yml
.yarn/install-state.gz
.pnp.*
# End of https://www.toptal.com/developers/gitignore/api/node,
# Created by https://www.toptal.com/developers/gitignore/api/hugo
# Edit at https://www.toptal.com/developers/gitignore?templates=hugo
### Hugo ### ### Hugo ###
# Generated files by hugo # Generated files by hugo
/public/ **/public/
/resources/_gen/ **/resources/_gen/
# Executable may be added to repository # Executable may be added to repository
hugo.exe hugo.exe
@ -140,9 +15,9 @@ hugo.linux
# Temporary lock file while building # Temporary lock file while building
.hugo_build.lock .hugo_build.lock
# End of https://www.toptal.com/developers/gitignore/api/hugo ### Congo ###
# Lighthouse generated output
exampleSite/public/
exampleSite/resources/_gen/
TODO
.lighthouseci .lighthouseci
# Project specific files
TODO

View File

@ -25,11 +25,25 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- ⚠️ Overhauled `figure` shortcode which now resizes images - ⚠️ Overhauled `figure` shortcode which now resizes images
- ⚠️ Renamed parameter: `darkToggle` -> `showDarkToggle` - ⚠️ Renamed parameter: `darkToggle` -> `showDarkToggle`
- Upgrade to Tailwind v3.0.15 - Upgrade to Tailwind v3.0.15
- Upgrade to KaTeX v0.15.2
- Inline Javascript moved to external files - Inline Javascript moved to external files
- Improved JSON-LD structured data - Improved JSON-LD structured data
- Minor style and layout improvements - Minor style and layout improvements
## [1.6.3] - 2022-01-19
### Added
- Icon for Stack Overflow ([#82](https://github.com/jpanther/congo/pull/82))
### Changed
- Upgrade to Mermaid v8.13.9
- Upgrade to KaTeX v0.15.2
### Fixed
- Emoji characters in article titles not appearing on list pages and in HTML metadata ([#84](https://github.com/jpanther/congo/pull/84))
## [1.6.2] - 2022-01-07 ## [1.6.2] - 2022-01-07
### Changed ### Changed
@ -245,7 +259,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/v1.6.2...HEAD [unreleased]: https://github.com/jpanther/congo/compare/v1.6.3...HEAD
[1.6.3]: https://github.com/jpanther/congo/compare/v1.6.2...v1.6.3
[1.6.2]: https://github.com/jpanther/congo/compare/v1.6.1...v1.6.2 [1.6.2]: https://github.com/jpanther/congo/compare/v1.6.1...v1.6.2
[1.6.1]: https://github.com/jpanther/congo/compare/v1.6.0...v1.6.1 [1.6.1]: https://github.com/jpanther/congo/compare/v1.6.0...v1.6.1
[1.6.0]: https://github.com/jpanther/congo/compare/v1.5.3...v1.6.0 [1.6.0]: https://github.com/jpanther/congo/compare/v1.5.3...v1.6.0

View File

@ -1,4 +1,4 @@
/*! Congo v1.6.2 | MIT License | https://github.com/jpanther/congo */ /*! Congo v1.6.3 | MIT License | https://github.com/jpanther/congo */
/*! tailwindcss v3.0.15 | MIT License | https://tailwindcss.com */ /*! tailwindcss v3.0.15 | MIT License | https://tailwindcss.com */

View File

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

View File

@ -0,0 +1 @@
<svg aria-hidden="true" focusable="false" data-prefix="fab" data-icon="stack-overflow" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512" class="svg-inline--fa fa-stack-overflow fa-w-12 fa-5x"><path fill="currentColor" d="M290.7 311L95 269.7 86.8 309l195.7 41zm51-87L188.2 95.7l-25.5 30.8 153.5 128.3zm-31.2 39.7L129.2 179l-16.7 36.5L293.7 300zM262 32l-32 24 119.3 160.3 32-24zm20.5 328h-200v39.7h200zm39.7 80H42.7V320h-40v160h359.5V320h-40z" class=""></path></svg>

After

Width:  |  Height:  |  Size: 482 B

File diff suppressed because one or more lines are too long

View File

@ -1,8 +1,8 @@
--- ---
title: "Emoji" title: "Emoji :parachute:"
date: 2019-03-05 date: 2019-03-05
description: "Guide to Emoji usage in Congo" description: "Guide to Emoji usage in Congo"
summary: "📖🏞️🧗🏽🪂🐉🧙🏽‍♂️🧚🏽👸" summary: "📖🏞️🧗🏽🐉🧙🏽‍♂️🧚🏽👸"
tags: ["emoji", "sample"] tags: ["emoji", "sample"]
--- ---

View File

@ -48,6 +48,7 @@ The full list of built-in icons and their corresponding names can referenced bel
| slack | {{< icon slack >}} | | slack | {{< icon slack >}} |
| snapchat | {{< icon snapchat >}} | | snapchat | {{< icon snapchat >}} |
| soundcloud | {{< icon soundcloud >}} | | soundcloud | {{< icon soundcloud >}} |
| stackoverflow | {{< icon stackoverflow >}} |
| steam | {{< icon steam >}} | | steam | {{< icon steam >}} |
| sun | {{< icon sun >}} | | sun | {{< icon sun >}} |
| telegram | {{< icon telegram >}} | | telegram | {{< icon telegram >}} |

View File

@ -6,7 +6,7 @@
href="{{ . }}" href="{{ . }}"
target="_blank" target="_blank"
rel="external" rel="external"
>{{ $.Title }}</a >{{ $.Title | emojify }}</a
> >
<span <span
class="-mt-2 text-xs cursor-default text-neutral-400 dark:text-neutral-500" class="-mt-2 text-xs cursor-default text-neutral-400 dark:text-neutral-500"
@ -18,7 +18,7 @@
<a <a
class="hover:underline hover:decoration-primary-500 hover:underline-offset-2 text-neutral-800 dark:text-neutral" class="hover:underline hover:decoration-primary-500 hover:underline-offset-2 text-neutral-800 dark:text-neutral"
href="{{ .RelPermalink }}" href="{{ .RelPermalink }}"
>{{ .Title }}</a >{{ .Title | emojify }}</a
> >
{{ end }} {{ end }}
{{ if and .Draft .Site.Params.article.showDraftLabel }} {{ if and .Draft .Site.Params.article.showDraftLabel }}

View File

@ -7,11 +7,11 @@
<meta http-equiv="X-UA-Compatible" content="ie=edge" /> <meta http-equiv="X-UA-Compatible" content="ie=edge" />
{{/* Title */}} {{/* Title */}}
{{ if .IsHome -}} {{ if .IsHome -}}
<title>{{ .Site.Title }}</title> <title>{{ .Site.Title | emojify }}</title>
<meta name="title" content="{{ .Site.Title }}" /> <meta name="title" content="{{ .Site.Title | emojify }}" />
{{- else -}} {{- else -}}
<title>{{ .Title }} &middot; {{ .Site.Title }}</title> <title>{{ .Title | emojify }} &middot; {{ .Site.Title | emojify }}</title>
<meta name="title" content="{{ .Title }} &middot; {{ .Site.Title }}" /> <meta name="title" content="{{ .Title | emojify }} &middot; {{ .Site.Title | emojify }}" />
{{- end }} {{- end }}
{{/* Metadata */}} {{/* Metadata */}}
{{ with .Params.Description -}} {{ with .Params.Description -}}
@ -30,7 +30,7 @@
{{ end }} {{ end }}
<link rel="canonical" href="{{ .Permalink }}" /> <link rel="canonical" href="{{ .Permalink }}" />
{{ range .AlternativeOutputFormats -}} {{ range .AlternativeOutputFormats -}}
{{ printf `<link rel="%s" type="%s" href="%s" title="%s" />` .Rel .MediaType.Type .RelPermalink $.Site.Title | safeHTML }} {{ printf `<link rel="%s" type="%s" href="%s" title="%s" />` .Rel .MediaType.Type .RelPermalink ($.Site.Title | emojify) | safeHTML }}
{{ end -}} {{ end -}}
{{/* Asset bundles */}} {{/* Asset bundles */}}
{{ $assets := newScratch }} {{ $assets := newScratch }}

View File

@ -1,5 +1,5 @@
[build] [build]
command = "cd exampleSite && hugo --gc --minify -b $URL" command = "cd exampleSite && hugo --gc --minify -D -b $URL"
publish = "exampleSite/public" publish = "exampleSite/public"
[build.environment] [build.environment]
@ -8,17 +8,17 @@ HUGO_THEME = "repo"
TZ = "Australia/Melbourne" TZ = "Australia/Melbourne"
[context.production.environment] [context.production.environment]
HUGO_VERSION = "0.91.0" HUGO_VERSION = "0.92.0"
HUGO_ENV = "production" HUGO_ENV = "production"
[context.deploy-preview] [context.deploy-preview]
command = "cd exampleSite && hugo --gc --minify -b $DEPLOY_PRIME_URL" command = "cd exampleSite && hugo --gc --minify -D -b $DEPLOY_PRIME_URL"
[context.deploy-preview.environment] [context.deploy-preview.environment]
HUGO_VERSION = "0.91.0" HUGO_VERSION = "0.92.0"
[context.branch-deploy] [context.branch-deploy]
command = "cd exampleSite && hugo --gc --minify -b $DEPLOY_PRIME_URL" command = "cd exampleSite && hugo --gc --minify -D -b $DEPLOY_PRIME_URL"
[context.branch-deploy.environment] [context.branch-deploy.environment]
HUGO_VERSION = "0.91.0" HUGO_VERSION = "0.92.0"

20
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "hugo-congo-theme", "name": "hugo-congo-theme",
"version": "1.6.2", "version": "1.6.3",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "hugo-congo-theme", "name": "hugo-congo-theme",
"version": "1.6.2", "version": "1.6.3",
"hasInstallScript": true, "hasInstallScript": true,
"license": "MIT", "license": "MIT",
"devDependencies": { "devDependencies": {
@ -14,11 +14,11 @@
"chart.js": "^3.7.0", "chart.js": "^3.7.0",
"fuse.js": "^6.5.3", "fuse.js": "^6.5.3",
"katex": "^0.15.2", "katex": "^0.15.2",
"mermaid": "^8.13.8", "mermaid": "^8.13.9",
"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.13", "tailwindcss": "^3.0.15",
"vendor-copy": "^3.0.1" "vendor-copy": "^3.0.1"
} }
}, },
@ -1685,9 +1685,9 @@
} }
}, },
"node_modules/mermaid": { "node_modules/mermaid": {
"version": "8.13.8", "version": "8.13.9",
"resolved": "https://registry.npmjs.org/mermaid/-/mermaid-8.13.8.tgz", "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-8.13.9.tgz",
"integrity": "sha512-Z5v31rvo8P7BPTiGicdJl9BbzyUe9s5sXILK8sM1g7ijkagpfFjPtXZVsq5P1WlN8m/fUp2PPNXVF9SqeTM91w==", "integrity": "sha512-kMH676xEomSe/gzxMpDx91L+z9L+9iB3lvtPFA8aeOPRNNrfd3ZDvDCGFnuqQaJvPRCxs3Me2JDaVVNOZjojrg==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@braintree/sanitize-url": "^3.1.0", "@braintree/sanitize-url": "^3.1.0",
@ -3625,9 +3625,9 @@
"dev": true "dev": true
}, },
"mermaid": { "mermaid": {
"version": "8.13.8", "version": "8.13.9",
"resolved": "https://registry.npmjs.org/mermaid/-/mermaid-8.13.8.tgz", "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-8.13.9.tgz",
"integrity": "sha512-Z5v31rvo8P7BPTiGicdJl9BbzyUe9s5sXILK8sM1g7ijkagpfFjPtXZVsq5P1WlN8m/fUp2PPNXVF9SqeTM91w==", "integrity": "sha512-kMH676xEomSe/gzxMpDx91L+z9L+9iB3lvtPFA8aeOPRNNrfd3ZDvDCGFnuqQaJvPRCxs3Me2JDaVVNOZjojrg==",
"dev": true, "dev": true,
"requires": { "requires": {
"@braintree/sanitize-url": "^3.1.0", "@braintree/sanitize-url": "^3.1.0",

View File

@ -1,6 +1,6 @@
{ {
"name": "hugo-congo-theme", "name": "hugo-congo-theme",
"version": "1.6.2", "version": "1.6.3",
"description": "Congo theme for Hugo", "description": "Congo theme for Hugo",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {
@ -33,7 +33,7 @@
"chart.js": "^3.7.0", "chart.js": "^3.7.0",
"fuse.js": "^6.5.3", "fuse.js": "^6.5.3",
"katex": "^0.15.2", "katex": "^0.15.2",
"mermaid": "^8.13.8", "mermaid": "^8.13.9",
"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",