From 73e16a25a2b8a6175a68f42ceb727d0708ed825d Mon Sep 17 00:00:00 2001 From: James Panther <4462786+jpanther@users.noreply.github.com> Date: Thu, 18 Aug 2022 14:59:46 +1000 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20Standardise=20Tailwind=20CSS=20c?= =?UTF-8?q?lass=20order?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + layouts/_default/baseof.html | 10 +++++----- layouts/_default/list.html | 12 ++++++------ layouts/_default/single.html | 6 +++--- layouts/_default/taxonomy.html | 4 ++-- layouts/_default/term.html | 6 +++--- layouts/partials/article-link.html | 4 ++-- layouts/partials/article-meta.html | 2 +- layouts/partials/article-pagination.html | 8 ++++---- layouts/partials/author.html | 4 ++-- layouts/partials/badge.html | 2 +- layouts/partials/header/basic.html | 4 ++-- layouts/partials/header/hamburger.html | 6 +++--- layouts/partials/home/profile.html | 6 +++--- layouts/partials/pagination.html | 8 ++++---- layouts/partials/search.html | 8 ++++---- layouts/partials/sharing-links.html | 2 +- layouts/partials/toc.html | 6 +++--- layouts/shortcodes/alert.html | 2 +- layouts/shortcodes/button.html | 2 +- layouts/shortcodes/figure.html | 2 +- layouts/shortcodes/lead.html | 2 +- 22 files changed, 54 insertions(+), 53 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f63ec25..59d0ed9b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ### Added - Traditional Chinese (Taiwan) translation ([#262](https://github.com/jpanther/congo/pull/262)) +- Tailwind plugin for Prettier to standardise the order of CSS classes ([#268](https://github.com/jpanther/congo/pull/268)) ### Changed diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index b9a6a22d..7fc925a8 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -15,13 +15,13 @@ > {{- partial "head.html" . -}}
↓{{ i18n "nav.skip_to_main" }} @@ -37,11 +37,11 @@ {{ block "main" . }}{{ end }} {{ if and (.Site.Params.footer.showScrollToTop | default true) (gt .WordCount 200) }}
diff --git a/layouts/_default/list.html b/layouts/_default/list.html index d7d5fc6d..6b3e5a97 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -7,15 +7,15 @@

{{ .Title }}

{{ if $toc }} -
-
+
+
{{ partial "toc.html" . }}
@@ -28,10 +28,10 @@
{{ range (.Paginate (.Pages.GroupByDate "2006")).PageGroups }} {{ if $.Params.groupByYear | default ($.Site.Params.list.groupByYear | default true) }} -

+

{{ .Key }}

-
+
{{ end }} {{ range .Pages }} {{ partial "article-link.html" . }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 49deed79..21386381 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -11,10 +11,10 @@ {{ partial "article-meta.html" (dict "context" . "scope" "single") }}
-
+
{{ if and (.Params.showTableOfContents | default (.Site.Params.article.showTableOfContents | default false)) (in .TableOfContents " -
+
+
{{ partial "toc.html" . }}
diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html index 1247b3b8..da42e577 100644 --- a/layouts/_default/taxonomy.html +++ b/layouts/_default/taxonomy.html @@ -6,7 +6,7 @@

{{ .Title }}

{{ if .Content }} -
+
{{ .Content | emojify }}
@@ -17,7 +17,7 @@

{{ .Page.Title }} diff --git a/layouts/_default/term.html b/layouts/_default/term.html index 4208be48..32d7ad81 100644 --- a/layouts/_default/term.html +++ b/layouts/_default/term.html @@ -6,7 +6,7 @@

{{ .Title }}

{{ if .Content }} -
+
{{ .Content | emojify }}
@@ -15,10 +15,10 @@
{{ range (.Paginate (.Pages.GroupByDate "2006")).PageGroups }} {{ if $.Params.groupByYear | default ($.Site.Params.list.groupByYear | default true) }} -

+

{{ .Key }}

-
+
{{ end }} {{ range .Pages }} {{ partial "article-link.html" . }} diff --git a/layouts/partials/article-link.html b/layouts/partials/article-link.html index 152812d3..f34d4810 100644 --- a/layouts/partials/article-link.html +++ b/layouts/partials/article-link.html @@ -3,7 +3,7 @@ {{ with .Params.externalUrl }}
{{ else }} {{ .Title | emojify }} diff --git a/layouts/partials/article-meta.html b/layouts/partials/article-meta.html index af02db40..7984fa8e 100644 --- a/layouts/partials/article-meta.html +++ b/layouts/partials/article-meta.html @@ -53,7 +53,7 @@ {{ range $context.GetTerms $taxonomy }} {{ .LinkTitle }} {{ end }} diff --git a/layouts/partials/article-pagination.html b/layouts/partials/article-pagination.html index f5eae275..3853edbb 100644 --- a/layouts/partials/article-pagination.html +++ b/layouts/partials/article-pagination.html @@ -13,11 +13,11 @@ {{ if $prev }} ← → @@ -49,11 +49,11 @@ → ← diff --git a/layouts/partials/author.html b/layouts/partials/author.html index d8c502a1..be812abf 100644 --- a/layouts/partials/author.html +++ b/layouts/partials/author.html @@ -5,7 +5,7 @@ {{ if $authorImage }} {{ $authorImage := $authorImage.Fill "192x192" }} {{ $.Site.Author.name | default {{ with .Site.Author.name | markdownify | emojify }} -
+
{{ i18n "author.byline_title" | markdownify | emojify }}
diff --git a/layouts/partials/badge.html b/layouts/partials/badge.html index 8d422fd1..da80c6c3 100644 --- a/layouts/partials/badge.html +++ b/layouts/partials/badge.html @@ -1,6 +1,6 @@ {{ . }} diff --git a/layouts/partials/header/basic.html b/layouts/partials/header/basic.html index bb214f57..422a380c 100644 --- a/layouts/partials/header/basic.html +++ b/layouts/partials/header/basic.html @@ -1,4 +1,4 @@ -
+