From 68ce84075ee527acf57bf1d45f248c9045fd6ea1 Mon Sep 17 00:00:00 2001 From: James Panther <4462786+jpanther@users.noreply.github.com> Date: Tue, 26 Dec 2023 11:56:32 +1100 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20Tailwind=20classes=20cleanup?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .prettierrc | 2 +- assets/css/compiled/main.css | 2 +- assets/css/main.css | 14 +++++----- layouts/404.html | 2 +- layouts/_default/baseof.html | 8 +++--- layouts/_default/list.html | 8 +++--- layouts/_default/simple.html | 2 +- layouts/_default/single.html | 11 ++++---- layouts/_default/taxonomy.html | 8 +++--- layouts/_default/term.html | 10 +++---- layouts/partials/article-link.html | 6 ++--- layouts/partials/article-meta.html | 2 +- layouts/partials/breadcrumbs.html | 6 ++--- layouts/partials/footer.html | 16 ++++++------ layouts/partials/header/basic.html | 16 ++++++------ layouts/partials/header/hamburger.html | 20 +++++++------- layouts/partials/header/hybrid.html | 36 +++++++++++++------------- layouts/partials/home/page.html | 2 +- layouts/partials/icon.html | 2 +- layouts/partials/logo.html | 1 + layouts/partials/pagination.html | 4 +-- layouts/partials/search.html | 16 ++++++------ layouts/partials/toc.html | 2 +- layouts/partials/translations.html | 12 ++++----- layouts/shortcodes/alert.html | 2 +- layouts/shortcodes/icon.html | 2 +- 26 files changed, 107 insertions(+), 105 deletions(-) diff --git a/.prettierrc b/.prettierrc index a617bfaf..7b975db1 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,5 +1,5 @@ { - "plugins": ["prettier-plugin-go-template"], + "plugins": ["prettier-plugin-go-template", "prettier-plugin-tailwindcss"], "goTemplateBracketSpacing": true, "htmlWhitespaceSensitivity": "css", "printWidth": 100, diff --git a/assets/css/compiled/main.css b/assets/css/compiled/main.css index ef827f27..0fae5498 100644 --- a/assets/css/compiled/main.css +++ b/assets/css/compiled/main.css @@ -1192,8 +1192,8 @@ body:has(#menu-controller:checked) { .copy-button { visibility: hidden; position: absolute; - top: 0px; right: 0px; + top: 0px; z-index: 10; width: 5rem; cursor: pointer; diff --git a/assets/css/main.css b/assets/css/main.css index ee3a0f89..030d214b 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -67,7 +67,7 @@ body:has(#menu-controller:checked) { .toc ul, .toc li { - @apply px-0 leading-snug list-none; + @apply list-none px-0 leading-snug; } .toc ul ul { @apply ps-4; @@ -90,7 +90,7 @@ body:has(#menu-controller:checked) { @apply visible; } .copy-button { - @apply absolute top-0 right-0 z-10 invisible w-20 py-1 font-mono text-sm cursor-pointer whitespace-nowrap rounded-bl-md rounded-tr-md bg-neutral-200 text-neutral-700 opacity-90 dark:bg-neutral-600 dark:text-neutral-200; + @apply invisible absolute right-0 top-0 z-10 w-20 cursor-pointer whitespace-nowrap rounded-bl-md rounded-tr-md bg-neutral-200 py-1 font-mono text-sm text-neutral-700 opacity-90 dark:bg-neutral-600 dark:text-neutral-200; } .copy-button:hover, .copy-button:focus, @@ -122,20 +122,20 @@ code { /* -- Chroma Highlight -- */ /* Background */ .chroma { - @apply py-3 rounded-md bg-neutral-50 text-neutral-700 dark:bg-neutral-700 dark:text-neutral-200; + @apply rounded-md bg-neutral-50 py-3 text-neutral-700 dark:bg-neutral-700 dark:text-neutral-200; } .chroma pre { - @apply p-0 m-0; + @apply m-0 p-0; } /* LineTable */ .chroma .lntable { - @apply block w-auto m-0 overflow-auto text-base; + @apply m-0 block w-auto overflow-auto text-base; } /* LineNumbersTable */ /* LineNumbers */ .chroma .lnt, .chroma .ln { - @apply px-2 mr-2 text-neutral-600 dark:text-neutral-300; + @apply mr-2 px-2 text-neutral-600 dark:text-neutral-300; } .chroma .lntd { @apply p-0 align-top; @@ -297,7 +297,7 @@ code { } /* CommentHashbang */ .chroma .ch { - @apply italic font-semibold text-neutral-500 dark:text-neutral-400; + @apply font-semibold italic text-neutral-500 dark:text-neutral-400; } /* GenericEmph */ .chroma .ge { diff --git a/layouts/404.html b/layouts/404.html index e73c98ce..131cdac9 100644 --- a/layouts/404.html +++ b/layouts/404.html @@ -1,6 +1,6 @@ {{ define "main" }}

{{ i18n "error.404_title" | emojify }}

-

+

{{ i18n "error.404_error" | emojify }}

diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index fef0cc92..4f492147 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -10,13 +10,13 @@ > {{- partial "head.html" . -}}
↓↓{{ i18n "nav.skip_to_main" }}
@@ -26,7 +26,7 @@ {{ else }} {{ partial "partials/header/basic.html" . }} {{ end }} -
+
{{ 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 079d1deb..b80fe917 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -20,7 +20,7 @@
{{ end }} -
+
{{ .Content | emojify }}
@@ -31,7 +31,7 @@

{{ .Key }}

-
+
{{ range .Pages }} {{ partial "article-link.html" . }} {{ end }} @@ -44,8 +44,8 @@ {{ partial "pagination.html" . }} {{ else }} -
-

+

+

{{ i18n "list.no_articles" | emojify }}

diff --git a/layouts/_default/simple.html b/layouts/_default/simple.html index cc884799..30e29ebe 100644 --- a/layouts/_default/simple.html +++ b/layouts/_default/simple.html @@ -8,7 +8,7 @@ {{ .Title | emojify }} -
+
{{ .Content | emojify }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 726dac87..2a4935d4 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -10,21 +10,22 @@

{{ .Title | emojify }}

-
+
{{ partial "article-meta.html" (dict "context" . "scope" "single") }}
+ ß {{ with $feature }}
{{ $altText := $.Params.featureAlt | default $.Params.coverAlt | default "" }} {{ $class := "mb-6 -mt-4 rounded-md" }} {{ partial "picture.html" (dict "img" . "alt" $altText "class" $class "lazy" false) }} {{ with $.Params.coverCaption }} -
{{ . | markdownify }}
+
{{ . | markdownify }}
{{ end }}
{{ end }} -
+
{{ if and (.Params.showTableOfContents | default (.Site.Params.article.showTableOfContents | default false)) (in .TableOfContents "
@@ -32,11 +33,11 @@
{{ end }} -
+
{{ .Content | emojify }}
-