Merge remote-tracking branch 'upstream/master'

xuhdev · xuhdev · commit a419f50786c5 · 2026-01-25T21:33:17.000-08:00
diff --git a/LICENSE b/LICENSE
@@ -1,8 +1,8 @@
 MIT License
 
 Copyright (c) 2020 nanxiaobei and adityatelange
-Copyright (c) 2021-2025 adityatelange
-Copyright (c) 2024-2025 8 Hobbies, LLC
+Copyright (c) 2021-2026 adityatelange
+Copyright (c) 2024-2026 8 Hobbies, LLC
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/assets/css/common/header.css b/assets/css/common/header.css
@@ -41,12 +41,11 @@ button#theme-toggle {
     margin: auto 4px;
 }
 
-body.dark #moon {
-    vertical-align: middle;
+[data-theme="dark"] #moon {
     display: none;
 }
 
-body:not(.dark) #sun {
+[data-theme="light"] #sun {
     display: none;
 }
 
diff --git a/assets/css/common/post-single.css b/assets/css/common/post-single.css
@@ -268,7 +268,7 @@
     padding: 0.4em;
 }
 
-.dark .toc {
+[data-theme="dark"] .toc {
     background: var(--entry);
 }
 
diff --git a/assets/css/core/license.css b/assets/css/core/license.css
@@ -2,6 +2,6 @@
   KamiMod
   License: MIT https://github.com/8hobbies/KamiMod/blob/master/LICENSE
   Copyright (c) 2020 nanxiaobei and adityatelange
-  Copyright (c) 2021-2025 adityatelange
-  Copyright (c) 2024-2025 8 Hobbies, LLC
+  Copyright (c) 2021-2026 adityatelange
+  Copyright (c) 2024-2026 8 Hobbies, LLC
 */
diff --git a/assets/css/core/theme-vars.css b/assets/css/core/theme-vars.css
@@ -15,9 +15,10 @@
     --code-block-bg: rgb(28, 29, 33);
     --code-bg: rgb(245, 245, 245);
     --border: rgb(238, 238, 238);
+    color-scheme: light;
 }
 
-.dark {
+:root[data-theme="dark"] {
     --theme: rgb(29, 30, 32);
     --entry: rgb(46, 46, 51);
     --primary: rgb(218, 218, 219);
@@ -27,12 +28,13 @@
     --code-block-bg: rgb(46, 46, 51);
     --code-bg: rgb(55, 56, 62);
     --border: rgb(51, 51, 51);
+    color-scheme: dark;
 }
 
 .list {
     background: var(--code-bg);
 }
 
-.dark.list {
+[data-theme="dark"] .list {
     background: var(--theme);
 }
diff --git a/assets/css/includes/scroll-bar.css b/assets/css/includes/scroll-bar.css
@@ -3,17 +3,13 @@
     background: 0 0;
 }
 
-.list:not(.dark)::-webkit-scrollbar-track {
-    background: var(--code-bg);
-}
-
 ::-webkit-scrollbar-thumb {
     background: var(--tertiary);
     border: 5px solid var(--theme);
     border-radius: var(--radius);
 }
 
-.list:not(.dark)::-webkit-scrollbar-thumb {
+[data-theme="light"] .list::-webkit-scrollbar-thumb {
     border: 5px solid var(--code-bg);
 }
 
diff --git a/assets/js/license.js b/assets/js/license.js
@@ -2,5 +2,5 @@
   PaperMod v8+
   License: MIT https://github.com/adityatelange/hugo-PaperMod/blob/master/LICENSE
   Copyright (c) 2020 nanxiaobei and adityatelange
-  Copyright (c) 2021-2025 adityatelange
+  Copyright (c) 2021-2026 adityatelange
 */
diff --git a/i18n/ca.yaml b/i18n/ca.yaml
@@ -6,8 +6,13 @@
 
 - id: read_time
   translation:
-    one : "1 min"
-    other: "{{ .Count }} min"
+    one : "1 minut"
+    other: "{{ .Count }} minuts"
+
+- id: words
+  translation:
+    one : "paraula"
+    other: "{{ .Count }} paraules"
 
 - id: toc
   translation: "Taula de Continguts"
@@ -17,3 +22,12 @@
 
 - id: home
   translation: "Inici"
+
+- id: edit_post
+  translation: "Editar"
+
+- id: code_copy
+  translation: "copiar"
+
+- id: code_copied
+  translation: "copiat!"
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
@@ -3,21 +3,25 @@
 {{- end -}}
 
 <!DOCTYPE html>
-<html lang="{{ site.Language }}" dir="{{ .Language.LanguageDirection | default "auto" }}">
+{{- $theme := site.Params.defaultTheme | default "auto" }}
+{{- if eq $theme "dark" }}
+<html lang="{{ site.Language }}" dir="{{ .Language.LanguageDirection | default "auto" }}" data-theme="dark">
+{{- else if eq $theme "light" }}
+<html lang="{{ site.Language }}" dir="{{ .Language.LanguageDirection | default "auto" }}" data-theme="light">
+{{- else }}
+<html lang="{{ site.Language }}" dir="{{ .Language.LanguageDirection | default "auto" }}" data-theme="auto">
+{{- end }}
 
 <head>
     {{- partial "head.html" . }}
 </head>
 
-<body class="
-{{- if (or (ne .Kind `page` ) (eq .Layout `archives`) (eq .Layout `search`)) -}}
-{{- print "list" -}}
-{{- end -}}
-{{- if eq site.Params.defaultTheme `dark` -}}
-{{- print " dark" }}
-{{- end -}}
-" id="top">
-    {{- partialCached "header.html" . .Page -}}
+{{- if (or (ne .Kind `page` ) (eq .Layout `archives`) (eq .Layout `search`)) }}
+<body class="list" id="top">
+{{- else }}
+<body id="top">
+{{- end }}
+    {{ partialCached "header.html" . .Page -}}
     <main class="main">
         {{- block "main" . }}{{ end }}
     </main>
diff --git a/layouts/_default/llms.txt b/layouts/_default/llms.txt
@@ -0,0 +1,41 @@
+{{- /* Recursive printer for sections */ -}}
+{{- define "llms_print_section" -}}
+{{- $section := .section -}}
+{{- $depth := .depth -}}
+{{- if or (gt (len $section.RegularPages) 0) (gt (len $section.Sections) 0) -}}
+{{- $hashes := strings.Repeat (add $depth 1) "#" }}
+
+{{ printf "%s %s" $hashes $section.Title }}
+
+{{- /* Pages in this section */ -}}
+{{- range $p := $section.RegularPages }}
+  {{- if and (not $p.Params.searchHidden) (ne $p.Layout `archives`) (ne $p.Layout `search`) }}
+- [{{ $p.Title }}]({{ $p.Permalink }})
+  {{- end -}}
+{{- end -}}
+
+{{- /* Recurse into subsections */ -}}
+{{- range $s := $section.Sections -}}
+{{- template "llms_print_section" (dict "section" $s "depth" (add $depth 1)) -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{- /* Main template starts here */ -}}
+# {{ site.Title }}
+
+{{- /* Pages not in any section */ -}}
+{{- $orphans := where site.RegularPages "Section" "" -}}
+{{ if gt (len $orphans) 0 }}
+
+{{- range $p := $orphans -}}
+  {{ if and (not $p.Params.searchHidden) (ne $p.Layout `archives`) (ne $p.Layout `search`) (not $p.IsHome) }}
+- [{{ $p.Title }}]({{ $p.Permalink }})
+  {{- end -}}
+{{- end -}}
+
+{{- end -}}
+
+{{- range site.Sections -}}
+{{- template "llms_print_section" (dict "section" . "depth" 1) -}}
+{{- end }}
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
@@ -33,9 +33,14 @@
 {{- partial "extend_footer.html" . }}
 
 <script>
-    let menu = document.getElementById('menu')
+    let menu = document.getElementById('menu');
     if (menu) {
-        menu.scrollLeft = localStorage.getItem("menu-scroll-position");
+        // Set the scroll position
+        const scrollPosition = localStorage.getItem("menu-scroll-position");
+        if (scrollPosition) {
+            menu.scrollLeft = parseInt(scrollPosition, 10);
+        }
+        
         menu.onscroll = function () {
             localStorage.setItem("menu-scroll-position", menu.scrollLeft);
         }
@@ -81,11 +86,12 @@
 {{- if (not site.Params.disableThemeToggle) }}
 <script>
     document.getElementById("theme-toggle").addEventListener("click", () => {
-        if (document.body.className.includes("dark")) {
-            document.body.classList.remove('dark');
+        const html = document.querySelector("html");
+        if (html.dataset.theme === "dark") {
+            html.dataset.theme = 'light';
             localStorage.setItem("pref-theme", 'light');
         } else {
-            document.body.classList.add('dark');
+            html.dataset.theme = 'dark';
             localStorage.setItem("pref-theme", 'dark');
         }
     })
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
@@ -129,25 +129,73 @@
                 --code-block-bg: rgb(46, 46, 51);
                 --code-bg: rgb(55, 56, 62);
                 --border: rgb(51, 51, 51);
+                color-scheme: dark;
             }
 
             .list {
                 background: var(--theme);
             }
 
-            .list:not(.dark)::-webkit-scrollbar-track {
-                background: 0 0;
+            .toc {
+                background: var(--entry);
             }
+        }
 
-            .list:not(.dark)::-webkit-scrollbar-thumb {
-                border-color: var(--theme);
+        @media (prefers-color-scheme: light) {
+            .list::-webkit-scrollbar-thumb {
+                border-color: var(--code-bg);
             }
         }
 
     </style>
     {{- end }}
 </noscript>
 
+{{- /* theme-toggle is enabled */}}
+{{- if (not site.Params.disableThemeToggle) }}
+{{- /* theme is light */}}
+{{- if (eq site.Params.defaultTheme "light") }}
+<script>
+    if (localStorage.getItem("pref-theme") === "dark") {
+        document.querySelector("html").dataset.theme = 'dark';
+    }
+
+</script>
+{{- /* theme is dark */}}
+{{- else if (eq site.Params.defaultTheme "dark") }}
+<script>
+    if (localStorage.getItem("pref-theme") === "light") {
+        document.querySelector("html").dataset.theme = 'light';
+    }
+
+</script>
+{{- else }}
+{{- /* theme is auto */}}
+<script>
+    if (localStorage.getItem("pref-theme") === "dark") {
+        document.querySelector("html").dataset.theme = 'dark';
+    } else if (localStorage.getItem("pref-theme") === "light") {
+       document.querySelector("html").dataset.theme = 'light';
+    } else if (window.matchMedia('(prefers-color-scheme: dark)').matches) {
+        document.querySelector("html").dataset.theme = 'dark';
+    } else {
+        document.querySelector("html").dataset.theme = 'light';
+    }
+
+</script>
+{{- end }}
+{{- /* theme-toggle is disabled and theme is auto */}}
+{{- else if (and (ne site.Params.defaultTheme "light") (ne site.Params.defaultTheme "dark"))}}
+<script>
+    if (window.matchMedia('(prefers-color-scheme: dark)').matches) {
+        document.querySelector("html").dataset.theme = 'dark';
+    } else {
+        document.querySelector("html").dataset.theme = 'light';
+    }
+
+</script>
+{{- end }}
+
 {{- partial "extend_head.html" . -}}
 
 {{- /* Misc */}}
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
@@ -1,44 +1,3 @@
-{{- /* theme-toggle is enabled */}}
-{{- if (not site.Params.disableThemeToggle) }}
-{{- /* theme is light */}}
-{{- if (eq site.Params.defaultTheme "light") }}
-<script>
-    if (localStorage.getItem("pref-theme") === "dark") {
-        document.body.classList.add('dark');
-    }
-
-</script>
-{{- /* theme is dark */}}
-{{- else if (eq site.Params.defaultTheme "dark") }}
-<script>
-    if (localStorage.getItem("pref-theme") === "light") {
-        document.body.classList.remove('dark')
-    }
-
-</script>
-{{- else }}
-{{- /* theme is auto */}}
-<script>
-    if (localStorage.getItem("pref-theme") === "dark") {
-        document.body.classList.add('dark');
-    } else if (localStorage.getItem("pref-theme") === "light") {
-        document.body.classList.remove('dark')
-    } else if (window.matchMedia('(prefers-color-scheme: dark)').matches) {
-        document.body.classList.add('dark');
-    }
-
-</script>
-{{- end }}
-{{- /* theme-toggle is disabled and theme is auto */}}
-{{- else if (and (ne site.Params.defaultTheme "light") (ne site.Params.defaultTheme "dark"))}}
-<script>
-    if (window.matchMedia('(prefers-color-scheme: dark)').matches) {
-        document.body.classList.add('dark');
-    }
-
-</script>
-{{- end }}
-
 <header class="header">
     <nav class="nav">
         <div class="logo">

Original file line number	Diff line number	Diff line change
`@@ -41,12 +41,11 @@ button#theme-toggle {`
`41`	`41`	`margin: auto 4px;`
`42`	`42`	`}`
`43`	`43`
`44`		`-body.dark #moon {`
`45`		`- vertical-align: middle;`
	`44`	`+[data-theme="dark"] #moon {`
`46`	`45`	`display: none;`
`47`	`46`	`}`
`48`	`47`
`49`		`-body:not(.dark) #sun {`
	`48`	`+[data-theme="light"] #sun {`
`50`	`49`	`display: none;`
`51`	`50`	`}`
`52`	`51`
Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,7 @@`
`268`	`268`	`padding: 0.4em;`
`269`	`269`	`}`
`270`	`270`
`271`		`-.dark .toc {`
	`271`	`+[data-theme="dark"] .toc {`
`272`	`272`	`background: var(--entry);`
`273`	`273`	`}`
`274`	`274`
Original file line number	Diff line number	Diff line change
`@@ -15,9 +15,10 @@`
`15`	`15`	`--code-block-bg: rgb(28, 29, 33);`
`16`	`16`	`--code-bg: rgb(245, 245, 245);`
`17`	`17`	`--border: rgb(238, 238, 238);`
	`18`	`+ color-scheme: light;`
`18`	`19`	`}`
`19`	`20`
`20`		`-.dark {`
	`21`	`+:root[data-theme="dark"] {`
`21`	`22`	`--theme: rgb(29, 30, 32);`
`22`	`23`	`--entry: rgb(46, 46, 51);`
`23`	`24`	`--primary: rgb(218, 218, 219);`
`@@ -27,12 +28,13 @@`
`27`	`28`	`--code-block-bg: rgb(46, 46, 51);`
`28`	`29`	`--code-bg: rgb(55, 56, 62);`
`29`	`30`	`--border: rgb(51, 51, 51);`
	`31`	`+ color-scheme: dark;`
`30`	`32`	`}`
`31`	`33`
`32`	`34`	`.list {`
`33`	`35`	`background: var(--code-bg);`
`34`	`36`	`}`
`35`	`37`
`36`		`-.dark.list {`
	`38`	`+[data-theme="dark"] .list {`
`37`	`39`	`background: var(--theme);`
`38`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,17 +3,13 @@`
`3`	`3`	`background: 0 0;`
`4`	`4`	`}`
`5`	`5`
`6`		`-.list:not(.dark)::-webkit-scrollbar-track {`
`7`		`- background: var(--code-bg);`
`8`		`-}`
`9`		`-`
`10`	`6`	`::-webkit-scrollbar-thumb {`
`11`	`7`	`background: var(--tertiary);`
`12`	`8`	`border: 5px solid var(--theme);`
`13`	`9`	`border-radius: var(--radius);`
`14`	`10`	`}`
`15`	`11`
`16`		`-.list:not(.dark)::-webkit-scrollbar-thumb {`
	`12`	`+[data-theme="light"] .list::-webkit-scrollbar-thumb {`
`17`	`13`	`border: 5px solid var(--code-bg);`
`18`	`14`	`}`
`19`	`15`