Merge pull request #381 from gethinode/develop

Fix spacing for external link icons
Merge branch 'main' into develop
2025-10-10 11:33:12 +00:00 · 2023-08-02 14:55:03 +02:00 · 2023-08-02 14:41:00 +02:00 · 2023-08-02 14:40:28 +02:00 · 2023-08-02 14:37:51 +02:00 · 2023-08-02 13:57:47 +02:00
9 changed files with 17 additions and 26 deletions
--- a/assets/scss/common/_icons.scss
+++ b/assets/scss/common/_icons.scss
@@ -23,19 +23,3 @@ $btn-toggle:                                    url("/icons/btn-toggle.svg") !de
 $btn-toggle-dark:                               url("/icons/btn-toggle-dark.svg") !default;

 // scss-docs-end icons
-
-.fa-wrapper {
-    container: wrapper / inline-size;
-}
-
-// define fallback size for browsers not supporting containers
-.fa-fluid {
-    font-size: 5rem;
-}
-
-// set size based on container width
-@container (min-width: 0) {
-    .fa-wrapper .fa-fluid {
-        font-size: 60cqi;
-    }
-}
--- a/go.mod
+++ b/go.mod
@@ -5,7 +5,7 @@ go 1.19
 require (
 	github.com/gethinode/mod-bootstrap v1.1.1 // indirect
 	github.com/gethinode/mod-flexsearch v1.1.4 // indirect
-	github.com/gethinode/mod-fontawesome v1.2.2 // indirect
+	github.com/gethinode/mod-fontawesome v1.2.3 // indirect
 	github.com/gethinode/mod-katex v1.0.2 // indirect
 	github.com/gethinode/mod-leaflet v0.3.3 // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -26,6 +26,8 @@ github.com/gethinode/mod-fontawesome v1.2.1 h1:k7z5ZRsNxCohZjlZm8jVAzmTPk17c6xMY
 github.com/gethinode/mod-fontawesome v1.2.1/go.mod h1:Ki1qkWEOiF0hQpCgWeZRw+HkpL6nd1DxKFptU0O2feI=
 github.com/gethinode/mod-fontawesome v1.2.2 h1:rA9EtuE/LeFQmKSA7ampfUknxsR1mu7hpi4wpA89gX8=
 github.com/gethinode/mod-fontawesome v1.2.2/go.mod h1:Ki1qkWEOiF0hQpCgWeZRw+HkpL6nd1DxKFptU0O2feI=
+github.com/gethinode/mod-fontawesome v1.2.3 h1:RHWd+E72+m29xaC45m/3CF35C201jehw0dcozVBdPrI=
+github.com/gethinode/mod-fontawesome v1.2.3/go.mod h1:Ki1qkWEOiF0hQpCgWeZRw+HkpL6nd1DxKFptU0O2feI=
 github.com/gethinode/mod-katex v1.0.0 h1:me/3dIIZBkfk1mRIFt8QiAGYwYDoSG5bc2hHRtIutFc=
 github.com/gethinode/mod-katex v1.0.0/go.mod h1:byAfpI3wuqNJIooTGVEGc1cjBhhCy4+CcK1H6495MYg=
 github.com/gethinode/mod-katex v1.0.1 h1:809QUztxmKgMNchU+v03iMO7Ma+ISc3ZzhXYauc21rs=
--- a/layouts/partials/assets/button.html
+++ b/layouts/partials/assets/button.html
@@ -133,7 +133,7 @@

    {{- if and $title $cue -}}
        {{ $suffix := partial "assets/icon.html" (dict "icon" "fas up-right-from-square fa-2xs") }}
-        {{- $title = printf "%s %s" $title $suffix | safeHTML -}}
+        {{- $title = printf "%s&nbsp;%s" $title $suffix | safeHTML -}}
    {{- end -}}
 {{- end -}}

--- a/layouts/partials/assets/navbar-item.html
+++ b/layouts/partials/assets/navbar-item.html
@@ -52,9 +52,14 @@
    {{ if $isIcon }}aria-label="{{ $menu.Name }}"{{ end }}
    data-nav="main" data-nav-main="{{ $mainNav }}"{{ with $childNav }} data-nav-child="{{ . }}"{{ end }} 
    href="{{ $menuURL }}{{ $params | safeHTMLAttr }}"{{ with $externalHref }} {{ . | safeHTMLAttr }}{{ end }} {{ $button | safeHTMLAttr }}>
-    
-    {{- with $menu.Pre }}{{ . }}{{ end -}}
+    {{- with $menu.Pre }}
+        {{ if hasPrefix . "<i" }}
+            {{ . | safeHTML }}
+        {{ else }}
+            {{ partial "assets/icon.html" (dict "icon" . )}}
+        {{ end }}
+    {{ end -}}
    <span {{ if $isActive }} class="active"{{ end }}>{{ if not $isIcon }}{{ $menu.Name }}{{ end }}</span>
    {{- with $menu.Post }}{{ . }}{{ end -}}
-    {{- if not $isIcon }} {{ $suffix }}{{ end -}}
+    {{- if not $isIcon }}&nbsp;{{ $suffix }}{{ end -}}
 </a>
--- a/layouts/partials/footer/social.html
+++ b/layouts/partials/footer/social.html
@@ -13,7 +13,7 @@
                        {{ .Pre | safeHTML }}
                    {{ else }}
                        {{ partial "assets/icon.html" (dict "icon" (printf "%s fa-2x" .Pre) )}}
-                    {{ end}}
+                    {{ end }}
                </a>
            {{ end -}}
        </div>
--- a/layouts/partials/utilities/link.html
+++ b/layouts/partials/utilities/link.html
@@ -34,7 +34,7 @@

    {{- if $cue -}}
        {{ $suffix := partial "assets/icon.html" (dict "icon" "fas up-right-from-square fa-2xs") }}
-        {{- $text = printf "%s %s" $text $suffix | safeHTML -}}
+        {{- $text = printf "%s&nbsp;%s" $text $suffix | safeHTML -}}
    {{- end -}}
 {{ else }}
    {{ $destination = relLangURL $destination }}
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "@gethinode/hinode",
-  "version": "0.17.0",
+  "version": "0.17.2",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "@gethinode/hinode",
-      "version": "0.17.0",
+      "version": "0.17.2",
      "license": "MIT",
      "devDependencies": {
        "@fortawesome/fontawesome-free": "^6.4.0",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@gethinode/hinode",
-  "version": "0.17.0",
+  "version": "0.17.2",
  "description": "Hinode is a clean documentation and blog theme for Hugo, an open-source static site generator",
  "keywords": [
    "hugo",
Author	SHA1	Message	Date
Mark Dumay	c4d8507638	Merge pull request #381 from gethinode/develop Fix spacing for external link icons	2023-08-02 14:55:03 +02:00
Mark Dumay	44d5cfa4de	Merge branch 'main' into develop	2023-08-02 14:41:00 +02:00
mark	5aa3cfb80f	Bump package version	2023-08-02 14:40:28 +02:00
mark	22b83dbcf9	Fix spacing for external link icons	2023-08-02 14:37:51 +02:00
Mark Dumay	0a88ae04b9	Merge pull request #380 from gethinode/develop Refine icon support	2023-08-02 13:57:47 +02:00
Mark Dumay	bf068977a6	Merge branch 'main' into develop	2023-08-02 13:51:20 +02:00
mark	5dfc99efa0	Bump package version	2023-08-02 13:50:16 +02:00
mark	84f09f0dcb	Bump dependencies	2023-08-02 13:49:51 +02:00
mark	65d9635f61	Shift fa-fluid to mod-fontawesome	2023-08-02 13:49:39 +02:00
mark	452bd92029	Adjust layout	2023-08-02 13:33:20 +02:00
mark	87fc26e289	Support shorthand notation for menu icons	2023-08-02 13:33:11 +02:00