fix: resolve padding issue for code blocks with filenames but without lang highlight (#297)

* fix: resolve padding issue for code blocks with filenames but without lang highlighting

* chore: run `npm run build:css`

* chore: update `node_modules/caniuse-lite`

assets/css/compiled/main.css

@@ -1701,6 +1701,12 @@ video {
   margin-top: 0.5rem;
   margin-bottom: 0.5rem;
 }
+/* This CSS rule targets the first nested unordered (ul) or ordered (ol) list 
+     inside the list item (li) of any parent ul or ol. 
+     The rule sets the top margin of the selected list to zero. */
+.content :where(ul, ol) > li > :where(ul, ol):not(:where([class~=not-prose],[class~=not-prose] *)) {
+  margin-top: 0px;
+}
 .content :where(kbd):not(:where([class~=not-prose],[class~=not-prose] *)) {
   overflow-wrap: break-word;
   border-radius: 0.375rem;
@@ -1798,6 +1804,7 @@ article details > summary::before {
     height: 1.2em;
     width: 1.2em;
     vertical-align: -4px;
+    padding: 0 0.6em;
   }
 /* Code syntax highlight */
 /* Light theme for syntax highlight */
@@ -2179,6 +2186,10 @@ article details > summary::before {
   --tw-text-opacity: 1;
   color: rgb(229 231 235 / var(--tw-text-opacity));
 }
+.code-block .filename + pre:not(.lntable pre) {
+    /* Override padding for code blocks with filename but no highlight */
+    padding-top: 3rem;
+  }
 .code-block pre:not(.lntable pre) {
   margin-bottom: 1rem;
   border-radius: 0.75rem;

assets/css/highlight.css

@@ -12,6 +12,11 @@
   .filename {
     @apply absolute top-0 z-[1] w-full truncate rounded-t-xl bg-primary-700/5 py-2 px-4 text-xs text-gray-700 dark:bg-primary-300/10 dark:text-gray-200;
   }
+
+  .filename + pre:not(.lntable pre) {
+    /* Override padding for code blocks with filename but no highlight */
+    @apply pt-12;
+  }
 }
 
 .code-block pre:not(.lntable pre) {

assets/css/typography.css

@@ -57,6 +57,12 @@
       @apply my-2;
     }
   }
+  /* This CSS rule targets the first nested unordered (ul) or ordered (ol) list 
+     inside the list item (li) of any parent ul or ol. 
+     The rule sets the top margin of the selected list to zero. */
+  :where(ul, ol) > li > :where(ul, ol):not(:where([class~=not-prose],[class~=not-prose] *)) {
+    @apply mt-0;
+  }
   :where(kbd):not(:where([class~=not-prose],[class~=not-prose] *)) {
     @apply border-black border-opacity-[0.04] bg-opacity-[0.03] bg-black break-words rounded-md border py-0.5 px-[.25em] text-[.9em] dark:border-white/10 dark:bg-white/10;
   }
@@ -109,5 +115,6 @@ article details > summary {
     height: 1.2em;
     width: 1.2em;
     vertical-align: -4px;
+    padding: 0 0.6em;
   }
 }

data/icons.yaml

@@ -14,6 +14,11 @@ codeberg: >
     <path d="M11.955.49A12 12 0 0 0 0 12.49a12 12 0 0 0 1.832 6.373L11.838 5.928a.187.14 0 0 1 .324 0l10.006 12.935A12 12 0 0 0 24 12.49a12 12 0 0 0-12-12 12 12 0 0 0-.045 0zm.375 6.467 4.416 16.553a12 12 0 0 0 5.137-4.213z"/>
   </svg>
 
+gitlab: >
+  <svg fill="currentColor" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+    <path d="m23.6 9.593l-.033-.086L20.3.98a.851.851 0 0 0-.336-.405a.875.875 0 0 0-1 .054a.875.875 0 0 0-.29.44L16.47 7.818H7.537L5.333 1.07a.857.857 0 0 0-.29-.441a.875.875 0 0 0-1-.054a.859.859 0 0 0-.336.405L.433 9.502l-.032.086a6.066 6.066 0 0 0 2.012 7.01l.01.009l.03.021l4.977 3.727l2.462 1.863l1.5 1.132a1.009 1.009 0 0 0 1.22 0l1.499-1.132l2.461-1.863l5.006-3.75l.013-.01a6.068 6.068 0 0 0 2.01-7.002"/>
+  </svg>
+  
 hextra: <svg viewBox="0 0 180 180" xmlns="http://www.w3.org/2000/svg" fill="currentColor"><path fill-rule="evenodd" clip-rule="evenodd" d="m 105.50024,22.224647 c -9.59169,-5.537563 -21.40871,-5.537563 -31.000093,0 L 39.054693,42.689119 C 29.463353,48.226675 23.55484,58.460531 23.55484,69.535642 v 40.928918 c 0,11.07542 5.908513,21.3092 15.499853,26.84652 l 35.445453,20.46446 c 9.591313,5.53732 21.408404,5.53732 31.000094,0 l 35.44507,-20.46446 c 9.59131,-5.53732 15.49985,-15.7711 15.49985,-26.84652 V 69.535642 c 0,-11.075111 -5.90854,-21.308967 -15.49985,-26.846523 z M 34.112797,85.737639 c -1.384445,2.397827 -1.384445,5.352099 0,7.749927 l 24.781554,42.922974 c 1.38437,2.39783 3.942853,3.87496 6.711592,3.87496 h 49.563107 c 2.76905,0 5.3273,-1.47713 6.71144,-3.87496 l 24.78194,-42.922974 c 1.38414,-2.397828 1.38414,-5.3521 0,-7.749927 L 121.88049,42.814746 c -1.38414,-2.397828 -3.94239,-3.874964 -6.71144,-3.874964 H 65.605944 c -2.768739,0 -5.327223,1.477059 -6.711592,3.874964 z" style="stroke-width:0.774993" /></svg>
 
 hugo: <svg viewBox="0 0 370 391" xmlns="http://www.w3.org/2000/svg"><g clip-rule="evenodd" fill-rule="evenodd"><path d="m207.5 22.4 114.4 66.6c13.5 7.9 21.9 22.4 21.9 38v136.4c0 17.3-9.3 33.3-24.5 41.8l-113.5 63.9a49.06 49.06 0 0 1 -48.5-.2l-104.5-60.1c-16.4-9.5-26.6-27-26.6-45.9v-129.5c0-19.1 9.9-36.8 26.1-46.8l102.8-63.5c16-9.9 36.2-10.1 52.4-.7z" fill="#ff4088" stroke="#c9177e" stroke-width="27" /><path d="m105.6 298.2v-207.2h43.4v75.5h71.9v-75.5h43.5v207.2h-43.5v-90.6h-71.9v90.6z" fill="#fff" /></g></svg>

exampleSite/content/showcase/index.md

@@ -16,4 +16,5 @@ Open source projects powered by Hextra.
   {{< card link="https://getporter.org/" title="Porter" image="https://repository-images.githubusercontent.com/155893691/aa249c80-fcf3-11ea-93b0-30079e8d7de4" imageStyle="object-fit:cover; aspect-ratio:16/9;" >}}
   {{< card link="https://lutheranconfessions.org/" title="LutheranConfessions" image="https://github.com/imfing/hextra/assets/5097752/ad6625e4-88cd-4cad-b102-5399997d0359" imageStyle="object-fit:cover; aspect-ratio:16/9;" >}}
   {{< card link="https://github.com/imfing/hextra-starter-template/" title="Hextra Starter Template" image="https://user-images.githubusercontent.com/5097752/263551418-c403b9a9-a76c-47a6-8466-513d772ef0b7.jpg" imageStyle="object-fit:cover; aspect-ratio:16/9;" >}}
+  {{< card link="https://developers.clever-cloud.com/" title="Clever Cloud Documentation" image="https://cellar-c2.services.clever-cloud.com/documentation/doc-screenshot.png" imageStyle="object-fit:cover; aspect-ratio:16/9;" >}}
 {{< /cards >}}

i18n/cs.yaml

@@ -0,0 +1,14 @@
+backToTop: "Zpět nahoru"
+changeLanguage: "Změnit jazyk"
+changeTheme: "Změnit vzhled"
+copyCode: "Zkopírovat kód"
+copyright: "© 2023 Hextra Project."
+dark: "Tmavý"
+editThisPage: "Upravit tuto stránku na GitHubu →"
+lastUpdated: "Naposledy změněno"
+light: "Světlý"
+noResultsFound: "Nebylo nic nalezeno."
+onThisPage: "Na této stránce"
+poweredBy: "Powered by Hextra"
+readMore: "Přečíst víc →"
+searchPlaceholder: "Hledat..."

i18n/de.yaml

@@ -0,0 +1,14 @@
+backToTop: "Nach oben"
+changeLanguage: "Sprache ändern"
+changeTheme: "Darstellung ändern"
+copyCode: "Code kopieren"
+copyright: "© 2024 Hextra Project."
+dark: "Dunkel"
+editThisPage: "Diese Seite auf Github bearbeiten →"
+lastUpdated: "Zuletzt aktualisiert am"
+light: "Hell"
+noResultsFound: "Keine Ergebnisse gefunden."
+onThisPage: "Auf dieser Seite"
+poweredBy: "Unterstützt durch Hextra"
+readMore: "Mehr lesen →"
+searchPlaceholder: "Suchen..."

i18n/fa.yaml

@@ -0,0 +1,14 @@
+backToTop: "به بالا بروید"
+changeLanguage: "تغییر زبان"
+changeTheme: "تغییر تم"
+copyCode: "کپی کد"
+copyright: "© ۲۰۲۴ پروژه هگزترا."
+dark: "تیره"
+editThisPage: "ویرایش این صفحه در گیت‌هاب ←"
+lastUpdated: "آخرین به‌روزرسانی در"
+light: "روشن"
+noResultsFound: "هیچ نتیجه‌ای پیدا نشد."
+onThisPage: "در این صفحه"
+poweredBy: "طراحی شده توسط هگزترا"
+readMore: "ادامه مطلب ←"
+searchPlaceholder: "جستجو..."

layouts/partials/head.html

@@ -16,6 +16,12 @@
     {{ end -}}
   </title>
   <meta name="description" content="{{ partial "utils/page-description.html" . }}" />
+  
+  {{ with .Params.canonical }}
+    <link rel="canonical" href="{{ . }}" itemprop="url" />
+  {{ else }}
+    <link rel="canonical" href="{{ .Permalink }}" itemprop="url" />
+  {{ end }}
 
   {{ partial "opengraph.html" . }}
   {{ template "_internal/schema.html" . -}}

layouts/partials/toc.html

@@ -26,8 +26,18 @@
       <div class="{{ $borderClass }} sticky bottom-0 flex flex-col items-start gap-2 pb-8 dark:border-neutral-800 contrast-more:border-t contrast-more:border-neutral-400 contrast-more:shadow-none contrast-more:dark:border-neutral-400">
         {{- if site.Params.editURL.enable -}}
           {{- $editURL := site.Params.editURL.base | default "" -}}
-          {{- with .File -}}{{ $editURL = urls.JoinPath $editURL (replace .Path "\\" "/") }}{{- end -}}
-          {{- with .Params.editURL -}}{{ $editURL = . }}{{- end -}}
+          {{- with .Params.editURL -}}
+            {{/* if `editURL` is set in the front matter */}}
+            {{- $editURL = . -}}
+          {{- else -}}
+            {{- with .File -}}
+              {{/* `.FileInfo.Meta.SourceRoot` is a Hugo internal field, e.g. `/path/to/repo/content/en/` */}}
+              {{- $sourceDir := replace (strings.TrimPrefix .FileInfo.Meta.BaseDir .FileInfo.Meta.SourceRoot) "\\" "/" -}}
+              {{- $sourceDir = strings.TrimPrefix "/content" $sourceDir -}}
+              {{- $path := replace .Path "\\" "/" -}}
+              {{- $editURL = urls.JoinPath $editURL $sourceDir $path -}}
+            {{- end -}}
+          {{- end -}}
           <a class="text-xs font-medium text-gray-500 hover:text-gray-900 dark:text-gray-400 dark:hover:text-gray-100 contrast-more:text-gray-800 contrast-more:dark:text-gray-50" href="{{ $editURL }}" target="_blank" rel="noreferer">{{ $editThisPage }}</a>
         {{- end -}}
         {{/* Scroll To Top */}}

package-lock.json

@@ -308,9 +308,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001517",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001517.tgz",
-      "integrity": "sha512-Vdhm5S11DaFVLlyiKu4hiUTkpZu+y1KA/rZZqVQfOD5YdDT/eQKlkt7NaE0WGOFgX32diqt9MiP9CAiFeRklaA==",
+      "version": "1.0.30001587",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001587.tgz",
+      "integrity": "sha512-HMFNotUmLXn71BQxg8cijvqxnIAofforZOwGsxyXJ0qugTdspUF4sPSJ2vhgprHCB996tIDzEq1ubumPDV8ULA==",
       "dev": true,
       "funding": [
         {