Merge branch 'main' into BreadcrumbsInDefaultSingle

Author: imfing

assets/css/compiled/main.css

@@ -10,11 +10,11 @@
   user-select: none;
 }
 
-.hextra-card:hover svg {
+.hextra-card:hover .hextra-card-icon svg {
   color: currentColor;
 }
 
-.hextra-card svg {
+.hextra-card .hextra-card-icon svg {
   width: 1.5rem;
   color: #00000033;
   transition: color 0.3s ease;
@@ -25,11 +25,11 @@
   position: relative;
 }
 
-.dark .hextra-card svg {
+.dark .hextra-card .hextra-card-icon svg {
   color: #ffffff66;
 }
 
-.dark .hextra-card:hover svg {
+.dark .hextra-card:hover .hextra-card-icon svg {
   color: currentColor;
 }
 

assets/css/components/cards.css

@@ -60,6 +60,10 @@
       @apply hx:my-2;
     }
   }
+  /* Task lists - hide list markers for lists containing checkboxes */
+  :where(ul):not(:where([class~=not-prose],[class~=not-prose] *)):has(li input[type="checkbox"]) {
+    @apply hx:list-none;
+  }
   /* 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. */

assets/css/typography.css

@@ -155,6 +155,18 @@ Hugo از [Markdown](https://en.wikipedia.org/wiki/Markdown) برای قالب
   - پنیر
 ```
 
+#### لیست وظایف
+
+- [x] نوشتن مستندات
+- [ ] بازبینی کد
+- [ ] استقرار تغییرات
+
+```markdown {filename=Markdown}
+- [x] نوشتن مستندات
+- [ ] بازبینی کد
+- [ ] استقرار تغییرات
+```
+
 ### تصاویر
 
 ![منظره](https://picsum.photos/800/600)

exampleSite/content/docs/guide/markdown.fa.md

@@ -155,6 +155,18 @@ Hugo はテキストの書式設定やリスト作成などに [Markdown](https:
   - チーズ
 ```
 
+#### タスクリスト
+
+- [x] ドキュメント作成
+- [ ] コードレビュー
+- [ ] 変更のデプロイ
+
+```markdown {filename=Markdown}
+- [x] ドキュメント作成
+- [ ] コードレビュー
+- [ ] 変更のデプロイ
+```
+
 ### 画像
 
 ![風景](https://picsum.photos/800/600)

exampleSite/content/docs/guide/markdown.ja.md

@@ -155,6 +155,18 @@ Tables aren't part of the core Markdown spec, but Hugo supports them out-of-the-
   - Cheese
 ```
 
+#### Task list
+
+- [x] Write documentation
+- [ ] Review code
+- [ ] Deploy changes
+
+```markdown {filename=Markdown}
+- [x] Write documentation
+- [ ] Review code
+- [ ] Deploy changes
+```
+
 ### Images
 
 ![landscape](https://picsum.photos/800/600)

exampleSite/content/docs/guide/markdown.md

@@ -155,6 +155,18 @@ Hugo 支持使用 [Markdown](https://en.wikipedia.org/wiki/Markdown) 语法来
   - 奶酪
 ```
 
+#### 任务列表
+
+- [x] 编写文档
+- [ ] 代码审查
+- [ ] 部署更改
+
+```markdown {filename=Markdown}
+- [x] 编写文档
+- [ ] 代码审查
+- [ ] 部署更改
+```
+
 ### 图片
 
 ![风景](https://picsum.photos/800/600)

exampleSite/content/docs/guide/markdown.zh-cn.md

@@ -37,14 +37,12 @@ linkTitle: Cards
 
 ## Card Parameters
 
-| Parameter  | Description                                                                           |
-|------------|---------------------------------------------------------------------------------------|
-| `link`     | URL (internal or external).                                                           |
-| `title`    | Title heading for the card.                                                           |
-| `subtitle` | Subtitle heading (supports Markdown).                                                 |
-| `icon`     | Name of the icon. See [icons]({{% relRef "icon" %}}) for more information.            |
-| `tag`      | Text in tag.                                                                          |
-| `tagColor` | Color of the tag. See [badges]({{% relRef "others/#badges" %}}) for more information. |
+| Parameter   | Description                                                                            |
+|-------------|----------------------------------------------------------------------------------------|
+| `link`      | URL (internal or external).                                                            |
+| `title`     | Title heading for the card.                                                            |
+| `subtitle`  | Subtitle heading (supports Markdown).                                                  |
+| `icon`      | Name of the icon. See [icons]({{% relRef "icon" %}}) for more information.             |
 
 ## Image Card
 
@@ -72,21 +70,30 @@ For more on Hugo's built in image processing commands, methods, and options see
 
 Card supports adding tags which could be useful to show extra status information.
 
+| Parameter   | Description                                                                            |
+|-------------|----------------------------------------------------------------------------------------|
+| `tag`       | Text in tag.                                                                           |
+| `tagColor`  | Color of the tag. See [badges]({{% relRef "others/#badges" %}}) for more information.  |
+| `tagIcon`   | Icon of the tag. See [badges]({{% relRef "others/#badges" %}}) for more information.   |
+| `tagBorder` | Border of the tag. See [badges]({{% relRef "others/#badges" %}}) for more information. |
+
 {{< cards >}}
   {{< card link="../callout" title="Card with default tag" tag="tag text" >}}
   {{< card link="../callout" title="Card with red tag" tag="tag text" tagColor="red" >}}
   {{< card link="../callout" title="Card with blue tag" tag="tag text" tagColor="blue" >}}
-  {{< card link="../callout" title="Card with yellow tag" tag="tag text" tagColor="yellow" >}}
-  {{< card link="/" title="Image Card" image="images/space.jpg" subtitle="Internet Image" tag="tag text" tagColor="red" >}}
+  {{< card link="../callout" title="Card with yellow tag" tag="tag text" tagColor="yellow" tagIcon="sparkles" tagBorder=false >}}
+  {{< card link="/" title="Image Card" image="/images/card-image-unprocessed.jpg" subtitle="Image" tag="tag text" tagColor="green" >}}
+  {{< card link="/" title="Image Card" image="images/space.jpg" subtitle="Image" tag="tag text" tagColor="purple" tagIcon="sparkles" tagBorder=false >}}
 {{< /cards >}}
 
 ```
 {{</* cards */>}}
   {{</* card link="../callout" title="Card with default tag color" tag="tag text" */>}}
   {{</* card link="../callout" title="Card with red tag" tag="tag text" tagColor="red" */>}}
   {{</* card link="../callout" title="Card with blue tag" tag="tag text" tagColor="blue" */>}}
-  {{</* card link="../callout" title="Card with yellow tag" tag="tag text" tagColor="yellow" */>}}
-  {{</* card link="/" title="Image Card" image="images/space.jpg" subtitle="Internet Image" tag="tag text" tagColor="red" */>}}
+  {{</* card link="../callout" title="Card with yellow tag" tag="tag text" tagColor="yellow" tagIcon="sparkles" tagBorder=false */>}}
+  {{</* card link="/" title="Image Card" image="/images/card-image-unprocessed.jpg" subtitle="Image" tag="tag text" tagColor="green" */>}}
+  {{</* card link="/" title="Image Card" image="images/space.jpg" subtitle="Image" tag="tag text" tagColor="purple" tagIcon="sparkles" tagBorder=false */>}}
 {{</* /cards */>}}
 ```
 

exampleSite/content/docs/guide/shortcodes/cards.md

@@ -8,6 +8,8 @@
 {{- $imageStyle := .imageStyle -}}
 {{- $tag := .tag -}}
 {{- $tagColor := .tagColor | default .tagType | default "" -}}{{- /* Compatibility with previous parameter. */ -}}
+{{- $tagBorder := not (eq .tagBorder false) | default true }}
+{{- $tagIcon := .tagIcon -}}
 
 {{ $linkClass := "hx:hover:border-gray-300 hx:bg-transparent hx:shadow-xs hx:dark:border-neutral-800 hx:hover:bg-slate-50 hx:hover:shadow-md hx:dark:hover:border-neutral-700 hx:dark:hover:bg-neutral-900" }}
 {{- with $image -}}
@@ -57,7 +59,8 @@
       "content" $tag
       "color" $tagColor
       "class" "hextra-card-tag"
-      "border" true
+      "border" $tagBorder
+      "icon" $tagIcon
       )
     -}}
   {{- end -}}

layouts/_partials/shortcodes/card.html

@@ -25,6 +25,8 @@
 {{- $imageStyle := .Get "imageStyle" -}}
 {{- $tag := .Get "tag" -}}
 {{- $tagColor := .Get "tagColor" | default (.Get "tagType") | default "" -}}{{- /* Compatibility with previous parameter. */ -}}
+{{- $tagBorder := not (eq (.Get "tagBorder") false) | default true }}
+{{- $tagIcon := .Get "tagIcon" | default "" -}}
 
 {{/* Image processing options */}}
 {{- $method := .Get "method" | default "Resize" | humanize -}}
@@ -61,5 +63,7 @@
   "imageStyle"  $imageStyle
   "tag"         $tag
   "tagType"     $tagColor
+  "tagBorder"   $tagBorder
+  "tagIcon"     $tagIcon
   )
 -}}