Merge 8e2de6c6dc into c8f648d5c2

🔀 Merge pull request #763 from jpanther/dependabot/npm_and_yarn/prettier-plugin-tailwindcss-0.5.10
📌 Bump prettier-plugin-tailwindcss from 0.5.9 to 0.5.10
2023-12-31 19:33:42 +01:00 · 2023-12-29 11:05:10 +11:00 · 2023-12-28 22:35:07 +00:00 · 2023-12-28 09:09:56 +11:00 · 2023-12-28 09:08:01 +11:00 · 2023-12-28 09:03:15 +11:00
13 changed files with 39 additions and 27 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Ability to share articles to Telegram and Line ([#719](https://github.com/jpanther/congo/pull/719))
 - New icons for `line`, `google-scholar`, `mendeley` and `weibo` ([#719](https://github.com/jpanther/congo/pull/719), [#755](https://github.com/jpanther/congo/pull/755), [#756](https://github.com/jpanther/congo/pull/756))
 - Weibo sharing links ([#756](https://github.com/jpanther/congo/pull/756))
+- Support for Tailwind '950' colour variants ([#751](https://github.com/jpanther/congo/pull/751))
 - Table of contents will now scroll if taller than the browser height ([#733](https://github.com/jpanther/congo/pull/733))
 - Korean translation ([#731](https://github.com/jpanther/congo/pull/731))

--- a/assets/css/schemes/avocado.css
+++ b/assets/css/schemes/avocado.css
@ -12,6 +12,7 @@
  --color-neutral-700: 68, 64, 60;
  --color-neutral-800: 41, 37, 36;
  --color-neutral-900: 28, 25, 23;
+  --color-neutral-950: 12, 10, 9;
  /* Lime */
  --color-primary-50: 247, 254, 231;
  --color-primary-100: 236, 252, 203;
@ -23,6 +24,7 @@
  --color-primary-700: 77, 124, 15;
  --color-primary-800: 63, 98, 18;
  --color-primary-900: 54, 83, 20;
+  --color-primary-950: 26, 46, 5;
  /* Emerald */
  --color-secondary-50: 236, 253, 245;
  --color-secondary-100: 209, 250, 229;
@ -34,4 +36,5 @@
  --color-secondary-700: 4, 120, 87;
  --color-secondary-800: 6, 95, 70;
  --color-secondary-900: 6, 78, 59;
+  --color-secondary-950: 2, 44, 34;
 }
--- a/assets/css/schemes/cherry.css
+++ b/assets/css/schemes/cherry.css
@ -12,6 +12,7 @@
  --color-neutral-700: 64, 64, 64;
  --color-neutral-800: 38, 38, 38;
  --color-neutral-900: 23, 23, 23;
+  --color-neutral-950: 10, 10, 10;
  /* Rose */
  --color-primary-50: 255, 241, 242;
  --color-primary-100: 255, 228, 230;
@ -23,6 +24,7 @@
  --color-primary-700: 190, 18, 60;
  --color-primary-800: 159, 18, 57;
  --color-primary-900: 136, 19, 55;
+  --color-primary-950: 76, 5, 25;
  /* Green */
  --color-secondary-50: 240, 253, 244;
  --color-secondary-100: 220, 252, 231;
@ -34,4 +36,5 @@
  --color-secondary-700: 21, 128, 61;
  --color-secondary-800: 22, 101, 52;
  --color-secondary-900: 20, 83, 45;
+  --color-secondary-950: 5, 46, 22;
 }
--- a/assets/css/schemes/congo.css
+++ b/assets/css/schemes/congo.css
@ -12,6 +12,7 @@
  --color-neutral-700: 63, 63, 70;
  --color-neutral-800: 39, 39, 42;
  --color-neutral-900: 24, 24, 27;
+  --color-neutral-950: 3, 7, 18;
  /* Violet */
  --color-primary-50: 245, 243, 255;
  --color-primary-100: 237, 233, 254;
@ -23,6 +24,7 @@
  --color-primary-700: 109, 40, 217;
  --color-primary-800: 91, 33, 182;
  --color-primary-900: 76, 29, 149;
+  --color-primary-950: 46, 16, 101;
  /* Fuchsia */
  --color-secondary-50: 253, 244, 255;
  --color-secondary-100: 250, 232, 255;
@ -34,4 +36,5 @@
  --color-secondary-700: 162, 28, 175;
  --color-secondary-800: 134, 25, 143;
  --color-secondary-900: 112, 26, 117;
+  --color-secondary-950: 74, 4, 78;
 }
--- a/assets/css/schemes/fire.css
+++ b/assets/css/schemes/fire.css
@ -12,6 +12,7 @@
  --color-neutral-700: 68, 64, 60;
  --color-neutral-800: 41, 37, 36;
  --color-neutral-900: 28, 25, 23;
+  --color-neutral-950: 12, 10, 9;
  /* Orange */
  --color-primary-50: 255, 247, 237;
  --color-primary-100: 255, 237, 213;
@ -23,6 +24,7 @@
  --color-primary-700: 194, 65, 12;
  --color-primary-800: 154, 52, 18;
  --color-primary-900: 124, 45, 18;
+  --color-primary-950: 69, 10, 10;
  /* Rose */
  --color-secondary-50: 255, 241, 242;
  --color-secondary-100: 255, 228, 230;
@ -34,4 +36,5 @@
  --color-secondary-700: 190, 18, 60;
  --color-secondary-800: 159, 18, 57;
  --color-secondary-900: 136, 19, 55;
+  --color-secondary-950: 76, 5, 25;
 }
--- a/assets/css/schemes/ocean.css
+++ b/assets/css/schemes/ocean.css
@ -12,6 +12,7 @@
  --color-neutral-700: 51, 65, 85;
  --color-neutral-800: 30, 41, 59;
  --color-neutral-900: 15, 23, 42;
+  --color-neutral-950: 2, 6, 23;
  /* Blue */
  --color-primary-50: 239, 246, 255;
  --color-primary-100: 219, 234, 254;
@ -23,6 +24,7 @@
  --color-primary-700: 29, 78, 216;
  --color-primary-800: 30, 64, 175;
  --color-primary-900: 30, 58, 138;
+  --color-primary-950: 23, 37, 8;
  /* Cyan */
  --color-secondary-50: 236, 254, 255;
  --color-secondary-100: 207, 250, 254;
@ -34,4 +36,5 @@
  --color-secondary-700: 14, 116, 144;
  --color-secondary-800: 21, 94, 117;
  --color-secondary-900: 22, 78, 99;
+  --color-secondary-950: 8, 51, 69;
 }
--- a/assets/css/schemes/sapphire.css
+++ b/assets/css/schemes/sapphire.css
@ -12,6 +12,7 @@
  --color-neutral-700: 51, 65, 85;
  --color-neutral-800: 30, 41, 59;
  --color-neutral-900: 15, 23, 42;
+  --color-neutral-950: 10, 10, 10;
  /* Indigo */
  --color-primary-50: 238, 242, 255;
  --color-primary-100: 224, 231, 255;
@ -23,6 +24,7 @@
  --color-primary-700: 67, 56, 202;
  --color-primary-800: 55, 48, 163;
  --color-primary-900: 49, 46, 129;
+  --color-primary-950: 30, 27, 75;
  /* Pink */
  --color-secondary-50: 253, 242, 248;
  --color-secondary-100: 252, 231, 243;
@ -34,4 +36,5 @@
  --color-secondary-700: 190, 24, 93;
  --color-secondary-800: 157, 23, 77;
  --color-secondary-900: 131, 24, 67;
+  --color-secondary-950: 80, 7, 36;
 }
--- a/assets/css/schemes/slate.css
+++ b/assets/css/schemes/slate.css
@ -12,6 +12,7 @@
  --color-neutral-700: 55, 65, 81;
  --color-neutral-800: 31, 41, 55;
  --color-neutral-900: 17, 24, 39;
+  --color-neutral-950: 17, 24, 39;
  /* Slate */
  --color-primary-50: 248, 250, 252;
  --color-primary-100: 241, 245, 249;
@ -23,6 +24,7 @@
  --color-primary-700: 51, 65, 85;
  --color-primary-800: 30, 41, 59;
  --color-primary-900: 15, 23, 42;
+  --color-primary-950: 2, 6, 23;
  /* Gray */
  --color-secondary-50: 249, 250, 251;
  --color-secondary-100: 243, 244, 246;
@ -34,4 +36,5 @@
  --color-secondary-700: 55, 65, 81;
  --color-secondary-800: 31, 41, 55;
  --color-secondary-900: 17, 24, 39;
+  --color-secondary-950: 10, 10, 10;
 }
--- a/exampleSite/content/users/index.md
+++ b/exampleSite/content/users/index.md
@ -65,5 +65,6 @@ The list below is just a handful of the websites that are built using the Congo
 | [kom.al](https://kom.al)                                               | Personal Site                   |
 | [andrea.mortaro.it](https://andrea.mortaro.it)                         | Personal Site and Blog          |
 | [yoganath.me](https://yoganath.me)                                     | Personal Site and Blog          |
+| [josh-v.com](https://josh-v.com)                                       | Personal Site and Tech blog     |

 **Congo user?** To add your site to this list, [submit a pull request](https://github.com/jpanther/congo/blob/dev/exampleSite/content/users/index.md).
--- a/layouts/partials/author.html
+++ b/layouts/partials/author.html
@ -1,19 +1,12 @@
 {{ if .Params.showAuthor | default (.Site.Params.article.showAuthor | default true) }}
  <div class="flex">
+    {{ $lazy := .Params.enableImageLazyLoading|default  .Site.Params.enableImageLazyLoading | default true }}
+    {{ $altText := ($.Site.Language.Params.Author.name | default "Author") }}
    {{ with .Site.Language.Params.Author.image }}
      {{ $authorImage := resources.Get . }}
      {{ if $authorImage }}
-        {{ $authorImage := $authorImage.Fill "192x192 Center" }}
-        <img
-          class="!mb-0 !mt-0 me-4 h-24 w-24 rounded-full"
-          width="96"
-          height="96"
-          alt="{{ $.Site.Language.Params.Author.name | default "Author" }}"
-          src="{{ $authorImage.RelPermalink }}"
-          {{ if $.Site.Params.enableImageLazyLoading | default true }}
-            loading="lazy"
-          {{ end }}
-        />
+        {{ $imgClass := "!mb-0 !mt-0 me-4 w-24 h-auto rounded-full" }}
+        {{ partial "picture.html" (dict "img" $authorImage "alt" $altText "class" $imgClass "lazy" $lazy  ) }}
      {{ end }}
    {{ end }}
    <div class="place-self-center">
--- a/layouts/partials/home/profile.html
+++ b/layouts/partials/home/profile.html
@ -4,17 +4,13 @@
  {{ end }} flex flex-col items-center justify-center text-center"
 >
  <header class="mb-3 flex flex-col items-center">
+    {{ $lazy := .Params.enableImageLazyLoading | default .Site.Params.enableImageLazyLoading | default true }}
+    {{ $altText := ($.Site.Language.Params.Author.name | default "Author") }}
    {{ with .Site.Language.Params.Author.image }}
      {{ $authorImage := resources.Get . }}
      {{ if $authorImage }}
-        {{ $authorImage := $authorImage.Fill "288x288 Center" }}
-        <img
-          class="mb-2 h-36 w-36 rounded-full"
-          width="144"
-          height="144"
-          alt="{{ $.Site.Language.Params.Author.name | default "Author" }}"
-          src="{{ $authorImage.RelPermalink }}"
-        />
+        {{ $imgClass := "mb-2 h-auto w-36 rounded-full" }}
+        {{ partial "picture.html" (dict "img" $authorImage "alt" $altText "class" $imgClass "lazy" $lazy) }}
      {{ end }}
    {{ end }}
    <h1 class="text-4xl font-extrabold">
--- a/package-lock.json
+++ b/package-lock.json
@ -17,7 +17,7 @@
        "mermaid": "^10.6.1",
        "prettier": "^3.1.1",
        "prettier-plugin-go-template": "^0.0.15",
-        "prettier-plugin-tailwindcss": "^0.5.9",
+        "prettier-plugin-tailwindcss": "^0.5.10",
        "quicklink": "^2.3.0",
        "rimraf": "^5.0.5",
        "tailwindcss": "^3.4.0",
@ -2363,9 +2363,9 @@
      }
    },
    "node_modules/prettier-plugin-tailwindcss": {
-      "version": "0.5.9",
-      "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.5.9.tgz",
-      "integrity": "sha512-9x3t1s2Cjbut2QiP+O0mDqV3gLXTe2CgRlQDgucopVkUdw26sQi53p/q4qvGxMLBDfk/dcTV57Aa/zYwz9l8Ew==",
+      "version": "0.5.10",
+      "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.5.10.tgz",
+      "integrity": "sha512-9UGSejqFxGG6brYjFfTYlJ8zs4L/lvZg1AngFfaC5Fs1otSskASv5IWKmjPu5MlABQUtTKtMArKyYr/hWpXSUg==",
      "dev": true,
      "engines": {
        "node": ">=14.21.3"
@ -4860,9 +4860,9 @@
      }
    },
    "prettier-plugin-tailwindcss": {
-      "version": "0.5.9",
-      "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.5.9.tgz",
-      "integrity": "sha512-9x3t1s2Cjbut2QiP+O0mDqV3gLXTe2CgRlQDgucopVkUdw26sQi53p/q4qvGxMLBDfk/dcTV57Aa/zYwz9l8Ew==",
+      "version": "0.5.10",
+      "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.5.10.tgz",
+      "integrity": "sha512-9UGSejqFxGG6brYjFfTYlJ8zs4L/lvZg1AngFfaC5Fs1otSskASv5IWKmjPu5MlABQUtTKtMArKyYr/hWpXSUg==",
      "dev": true,
      "requires": {}
    },
--- a/package.json
+++ b/package.json
@ -36,7 +36,7 @@
    "mermaid": "^10.6.1",
    "prettier": "^3.1.1",
    "prettier-plugin-go-template": "^0.0.15",
-    "prettier-plugin-tailwindcss": "^0.5.9",
+    "prettier-plugin-tailwindcss": "^0.5.10",
    "quicklink": "^2.3.0",
    "rimraf": "^5.0.5",
    "tailwindcss": "^3.4.0",
Author	SHA1	Message	Date
Wolf Noble	b479c93882	Merge `8e2de6c6dc` into `c8f648d5c2`	2023-12-31 19:33:42 +01:00
James Panther	c8f648d5c2	🔀 Merge pull request #763 from jpanther/dependabot/npm_and_yarn/prettier-plugin-tailwindcss-0.5.10 📌 Bump prettier-plugin-tailwindcss from 0.5.9 to 0.5.10	2023-12-29 11:05:10 +11:00
dependabot[bot]	28ba29ed4a	📌 Bump prettier-plugin-tailwindcss from 0.5.9 to 0.5.10 Bumps [prettier-plugin-tailwindcss](https://github.com/tailwindlabs/prettier-plugin-tailwindcss) from 0.5.9 to 0.5.10. - [Release notes](https://github.com/tailwindlabs/prettier-plugin-tailwindcss/releases) - [Changelog](https://github.com/tailwindlabs/prettier-plugin-tailwindcss/blob/main/CHANGELOG.md) - [Commits](https://github.com/tailwindlabs/prettier-plugin-tailwindcss/compare/v0.5.9...v0.5.10) --- updated-dependencies: - dependency-name: prettier-plugin-tailwindcss dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-12-28 22:35:07 +00:00
James Panther	99ec58e91e	📝 Update changelog	2023-12-28 09:09:56 +11:00
James Panther	e876aa07c7	🔀 Merge pull request #751 from wolfspyre/twcss33_950Vals 💄 update CSS Schemas to include TW3.3+ 950 color variants	2023-12-28 09:08:01 +11:00
James Panther	332324f264	🔀 Merge pull request #762 from jvanderaa/add_jv_site 📝 Adds personal site to users example	2023-12-28 09:03:15 +11:00
Josh VanDeraa	d94a3d9707	Updates to include josh-v.com.	2023-12-27 08:18:38 -06:00
Wolf Noble	4c600e8065	🎨 adjust css files per prettier	2023-12-25 14:27:14 -06:00
Wolf Noble	68ac9dd321	💄 update CSS Schemas to include TW3.3+ 950 color variants	2023-12-23 10:00:12 +11:00
Wolf Noble	8e2de6c6dc	Update author.html remove superfluous log element	2023-12-07 20:18:51 -06:00
Wolf Noble	a1a6d6f468	Update author.html remove superfluous warning	2023-12-06 17:06:39 -06:00
Wolf Noble	92658f1b88	✨ 💄 ♻️ 🚸 render author image with picture partial	2023-12-05 15:41:43 -06:00