Merge pull request #237 from gethinode/develop

Tables
Fix linting issues
2025-10-07 18:14:28 +00:00 · 2023-04-28 09:23:19 +02:00 · 2023-04-28 09:18:51 +02:00 · 2023-04-28 09:07:52 +02:00 · 2023-04-28 09:00:12 +02:00 · 2023-04-27 17:46:13 +02:00
10 changed files with 40 additions and 30 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -11,7 +11,7 @@ jobs:
  build:
    strategy:
      matrix:
-        os: [macos-latest-xl, windows-latest, ubuntu-latest]
+        os: [macos-latest, windows-latest, ubuntu-latest]
        node-version: [14.x, 16.x, 18.x]
        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/

--- a/assets/scss/components/_toc.scss
+++ b/assets/scss/components/_toc.scss
@@ -30,20 +30,12 @@

 .toc nav li {
    margin-bottom: 0.25rem;
-
-    &:hover {
-        color: var(--bs-primary);
-    }
 }

 .toc nav a {
    color: inherit;
-}

-.toc-panel nav a {
-    &.active,
-    &:hover,
-    &:focus {
+    &:hover {
        color: var(--bs-primary);
    }
 }
--- a/config/_default/config.toml
+++ b/config/_default/config.toml
@@ -6,6 +6,7 @@ enableGitInfo = true
 # toml-docs-end main

 # additional settings
+googleAnalytics = "G-T85PPZ36GN"
 baseURL = "https://demo.gethinode.com/"
 canonifyURLs = false
 enableEmoji = true
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -10,7 +10,7 @@

    <body>
        {{- if site.Params.main.enableDarkMode -}}
-            {{- partial "footer/scripts.html" (dict "filename" "js/critical.bundle.js" "match" "js/critical/**.js" "page" .) -}}
+            {{- partial "footer/scripts.html" (dict "filename" "js/critical.bundle.js" "match" "js/critical/**.js" "header" true "page" .) -}}
        {{- end -}}
        <div class="d-flex flex-column min-vh-100{{ if and .IsHome .Site.Params.home.style }} {{ .Site.Params.home.style }}{{ end }}">
            <div class="{{ if .Site.Params.navigation.fixed }}mb-4{{ end }}">
@@ -57,6 +57,6 @@
            {{- partial "footer/footer.html" . -}}
        {{ end -}}

-        {{- partialCached "footer/scripts.html" (dict "page" .) }}
+        {{- partialCached "footer/scripts.html" (dict "header" false "page" .) }}
    </body>
 </html>
--- a/layouts/partials/footer/scripts.html
+++ b/layouts/partials/footer/scripts.html
@@ -1,6 +1,7 @@
 {{ $filename := .filename | default "js/main.bundle.js" -}}
 {{ $match := .match | default "{js/*.js,js/vendor/**.js}" }}
 {{ $page := .page }}
+{{ $header := .header }}

 {{ $files := slice -}}
 {{ range $index, $file := resources.Match $match -}}
@@ -11,8 +12,8 @@
    {{ $bundle := $files | resources.Concat $filename -}}
    {{ $js := $bundle | resources.ExecuteAsTemplate $filename $page -}}

-    {{- if (not .Site.IsServer) -}}
-        {{- $pc := .Site.Config.Privacy.GoogleAnalytics -}}
+    {{- if and (not site.IsServer) $header -}}
+        {{- $pc := site.Config.Privacy.GoogleAnalytics -}}
        {{- if and (not $pc.Disable) (hasPrefix site.GoogleAnalytics "G-") }}
            <script async src="https://www.googletagmanager.com/gtag/js?id={{ site.GoogleAnalytics }}"></script>
        {{- end }}
--- a/layouts/partials/head/twitter_cards.html
+++ b/layouts/partials/head/twitter_cards.html
@@ -1,7 +1,7 @@
 <!-- Copied from doks -->
 <meta name="twitter:card" content="summary_large_image">
-<meta name="twitter:site" content="{{ .Site.Params.twitterSite }}">
-<meta name="twitter:creator" content="{{ .Site.Params.twitterCreator }}">
+{{ with .Site.Params.twitterSite }}<meta name="twitter:site" content="{{ . }}">{{ end }}
+{{ with .Site.Params.twitterCreator }}<meta name="twitter:creator" content="{{ . }}">{{ end }}
 <meta name="twitter:title" content="{{ $.Scratch.Get "title" }}">
 <meta name="twitter:description" content="{{ $.Scratch.Get "description" }}">
 <meta name="twitter:image" content="{{ $.Scratch.Get "thumbnail" }}">
--- a/layouts/shortcodes/table.html
+++ b/layouts/shortcodes/table.html
@@ -1,9 +1,21 @@
-{{ $input := .Inner | markdownify }}
-{{ $input = replace $input "style=\"text-align:left\"" "class=\"text-start\"" }}
-{{ $input = replace $input "style=\"text-align:center\"" "class=\"text-center\"" }}
-{{ $input = replace $input "style=\"text-align:right\"" "class=\"text-end\"" }}
-{{ $class := .Get 0 | default "" }}
-{{ $old := "<table>" }}
-{{ $new := printf "<table class=\"table %s\">" $class }}
-{{ $input := replace $input $old $new }}
-{{ $input | safeHTML }}
+{{- $responsiveVals := slice "table-responsive" "table-responsive-none" "table-responsive-sm" "table-responsive-md" "table-responsive-lg" "table-responsive-xl" "table-responsive-xxl" -}}
+{{- $responsive := intersect .Params $responsiveVals -}}
+{{- $main := complement $responsive .Params -}}
+
+{{- if in $responsive "table-responsive-none" -}}
+    {{- $responsive = "" -}}
+{{- else if not $responsive -}}
+    {{ $responsive = (slice "table-responsive") -}}
+{{- end -}}
+
+{{- $input := .Inner | markdownify }}
+{{- $input = replace $input "style=\"text-align:left\"" "class=\"text-start\"" -}}
+{{- $input = replace $input "style=\"text-align:center\"" "class=\"text-center\"" -}}
+{{- $input = replace $input "style=\"text-align:right\"" "class=\"text-end\"" -}}
+{{- $class := delimit $main " " -}}
+{{- $old := "<table>" -}}
+{{- $new := printf "<table class=\"table %s\">" $class -}}
+{{ $input := replace $input $old $new -}}
+{{- with $responsive }}<div class="{{ delimit . " " }}">{{ end -}}
+{{ $input | safeHTML }}
+{{- with $responsive }}</div>{{ end -}}
--- a/netlify.toml
+++ b/netlify.toml
@@ -24,15 +24,19 @@
        X-XSS-Protection = "1; mode=block"
        Content-Security-Policy = """\
            default-src 'self'; \
+            child-src 'self' app.netlify.com; \
            script-src 'self' \
+                app.netlify.com netlify-cdp-loader.netlify.app \
                https://utteranc.es/client.js https://*.google-analytics.com https://*.googletagmanager.com; \
-            style-src 'self' https://utteranc.es https://fonts.googleapis.com https://www.youtube.com; \
+            style-src 'self' \
+                netlify.app https://utteranc.es https://fonts.googleapis.com https://www.youtube.com; \
            object-src 'none'; \
            base-uri 'self'; \
            connect-src 'self'
                https://*.google-analytics.com https://*.analytics.google.com https://*.googletagmanager.com; \
            font-src 'self' https://fonts.gstatic.com; \
-            frame-src 'self' https://utteranc.es https://www.youtube-nocookie.com https://www.youtube.com; \
+            frame-src 'self' https://utteranc.es https://www.youtube-nocookie.com https://www.youtube.com \
+                app.netlify.com; \
            img-src 'self' https://i.vimeocdn.com https://i.ytimg.com https://*.google-analytics.com https://*.googletagmanager.com; \
            manifest-src 'self'; \
            media-src 'self' \
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "@gethinode/hinode",
-  "version": "0.12.3",
+  "version": "0.12.6",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "@gethinode/hinode",
-      "version": "0.12.3",
+      "version": "0.12.6",
      "license": "MIT",
      "devDependencies": {
        "@fortawesome/fontawesome-free": "^6.4.0",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@gethinode/hinode",
-  "version": "0.12.3",
+  "version": "0.12.6",
  "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	9795e04a9b	Merge pull request #237 from gethinode/develop Tables	2023-04-28 09:23:19 +02:00
mark	6381cb3519	Fix linting issues	2023-04-28 09:18:51 +02:00
mark	01927f22b6	Bump package release	2023-04-28 09:07:52 +02:00
mark	da75210771	Add responsive behavior for tables	2023-04-28 09:00:12 +02:00
mark	b47bf99744	Fix highlight of nav items	2023-04-27 17:46:13 +02:00
Mark Dumay	2a4ba34c51	Merge pull request #236 from gethinode/develop Add Google Analytics for demo site	2023-04-27 15:00:26 +02:00
mark	fc07cec664	Use cross-domain linking	2023-04-27 14:55:08 +02:00
Mark Dumay	538a1d2de3	Merge branch 'main' into develop	2023-04-27 14:46:22 +02:00
mark	6dda374b73	Add Google Analytics for demo site	2023-04-27 14:45:36 +02:00
Mark Dumay	e53a333ebf	Merge pull request #235 from gethinode/develop Fixes	2023-04-27 12:58:45 +02:00
Mark Dumay	5ed8c28bee	Merge branch 'main' into develop	2023-04-27 12:36:22 +02:00
mark	fa47b7d93e	Bump release	2023-04-27 12:35:51 +02:00
mark	f1693c8cf0	Refine Netlify CSP headers	2023-04-27 12:34:56 +02:00
mark	740fd91038	Remove empty parameters	2023-04-27 11:44:45 +02:00
mark	9a0dba5ee4	Fix loading tag manager script twice	2023-04-27 11:44:25 +02:00
Mark Dumay	e4b7b252b3	Revert back to macos-latest	2023-04-27 08:29:00 +02:00
Mark Dumay	569562cf24	Merge pull request #234 from gethinode/develop Server	2023-04-27 08:28:27 +02:00
Mark Dumay	60b53f2fa9	Merge branch 'main' into develop	2023-04-27 08:17:46 +02:00
mark	3e5f23cf89	Bump release version	2023-04-27 08:17:07 +02:00
mark	c7b16cf2f4	Fix Hugo server detection	2023-04-27 08:16:21 +02:00
Mark Dumay	9dd7bf64e1	Merge pull request #233 from gethinode/main Sync	2023-04-27 08:00:32 +02:00