From 2f8fb09557b111b928b53420fc985cf67372b906 Mon Sep 17 00:00:00 2001 From: Christian Oliff Date: Tue, 6 Feb 2024 16:35:31 +0900 Subject: [PATCH] Update Analytics Script (#367) --- .cspell.json | 4 +++ .ncurc.json | 10 ++++++- .nvmrc | 2 +- .prettierignore | 1 - CONTRIBUTING.md | 2 ++ app-components/preview/index.html | 2 +- app-components/src/index.html | 2 +- docs/layouts/_default/404.html | 2 +- docs/layouts/_default/baseof.html | 4 +-- docs/layouts/_default/font.html | 3 +- docs/layouts/_default/home.html | 4 +-- docs/layouts/modus-outlined/home.html | 4 +-- docs/layouts/modus-solid/home.html | 4 +-- docs/layouts/partials/analytics.html | 31 +++++++++++++-------- docs/layouts/transportation/home.html | 3 +- hugo.yml | 2 +- icons/modus-outlined/drivers.svg | 2 +- icons/modus-outlined/less-than-equal-to.svg | 2 +- icons/modus-solid/less-than-equal-to.svg | 2 +- 19 files changed, 55 insertions(+), 31 deletions(-) diff --git a/.cspell.json b/.cspell.json index b15bf485..b72f3951 100644 --- a/.cspell.json +++ b/.cspell.json @@ -21,6 +21,7 @@ "getenv", "horiz", "iframe", + "incab", "jquery", "labelledby", "liga", @@ -33,6 +34,7 @@ "noopener", "noscript", "npmjs", + "onclick", "paren", "pe-none", "picocolors", @@ -60,6 +62,7 @@ "trimbleinc", "twbs", "uncombine", + "uncompiled", "undock", "urlize", "versioner", @@ -73,6 +76,7 @@ ".cspell.json", "**/node_modules/**", "*.min.*", + "*.js", ".github/CODEOWNERS", "{coverage,.cache,.git,.vscode,.DS_Store,tests}/**/*", "app-components/preview/app-components.js" diff --git a/.ncurc.json b/.ncurc.json index 91e29051..89a28952 100644 --- a/.ncurc.json +++ b/.ncurc.json @@ -1,3 +1,11 @@ { - "reject": ["file-type", "mkdirp", "read-chunk", "svgicons2svgfont", "ttf2eot", "ttf2woff", "url-join"] + "reject": [ + "file-type", + "mkdirp", + "read-chunk", + "svgicons2svgfont", + "ttf2eot", + "ttf2woff", + "url-join" + ] } diff --git a/.nvmrc b/.nvmrc index b6a7d89c..cb406c60 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -16 +16.20.2 diff --git a/.prettierignore b/.prettierignore index 60c8a555..6a05bb2d 100644 --- a/.prettierignore +++ b/.prettierignore @@ -4,4 +4,3 @@ _modus-bootstrap-dark.scss hugo.yml package.json package-lock.json - diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 82fce611..765adc85 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,6 +4,8 @@ To get started, clone the repo, install dependencies, and run the build script. +You must use Node v16 to build the project. + ```shell git clone https://github.com/trimble-oss/modus-icons/ cd modus-icons diff --git a/app-components/preview/index.html b/app-components/preview/index.html index f1f5a954..13b26777 100644 --- a/app-components/preview/index.html +++ b/app-components/preview/index.html @@ -1,5 +1,5 @@ - + Site Search diff --git a/app-components/src/index.html b/app-components/src/index.html index 8e95dea0..849526d1 100644 --- a/app-components/src/index.html +++ b/app-components/src/index.html @@ -1,5 +1,5 @@ - + SiteSearch diff --git a/docs/layouts/_default/404.html b/docs/layouts/_default/404.html index b47208c5..ea731e24 100644 --- a/docs/layouts/_default/404.html +++ b/docs/layouts/_default/404.html @@ -3,6 +3,7 @@ {{ $external := resources.Get "js/app-components.js" }} {{ $appComponentsJs := slice $external | resources.Concat "js/app-components.js" | resources.Minify | resources.Fingerprint }} + {{- .Content -}} @@ -28,5 +29,4 @@

Looking for an icon? Use the search above!

- {{ end }} diff --git a/docs/layouts/_default/baseof.html b/docs/layouts/_default/baseof.html index 69cabbfc..0f354896 100644 --- a/docs/layouts/_default/baseof.html +++ b/docs/layouts/_default/baseof.html @@ -1,8 +1,9 @@ - + {{- partial "head" . }} + {{ partial "analytics" . }} @@ -16,7 +17,6 @@ {{ partialCached "footer" . }} {{ partialCached "scripts" . }} - {{ partial "analytics" . }} diff --git a/docs/layouts/_default/font.html b/docs/layouts/_default/font.html index 028c1338..9d55c29b 100644 --- a/docs/layouts/_default/font.html +++ b/docs/layouts/_default/font.html @@ -1,7 +1,8 @@ - + {{ partial "head" . }} + {{ partial "analytics" . }} {{ partialCached "skippy" . }} diff --git a/docs/layouts/_default/home.html b/docs/layouts/_default/home.html index a3949350..be356c55 100644 --- a/docs/layouts/_default/home.html +++ b/docs/layouts/_default/home.html @@ -1,7 +1,8 @@ - + {{ partial "head" . }} + {{ partial "analytics" . }} @@ -96,6 +97,5 @@

Modus Icons by Sector

{{- partialCached "footer" . }} {{- partialCached "scripts" . }} - {{ partial "analytics" . }} diff --git a/docs/layouts/modus-outlined/home.html b/docs/layouts/modus-outlined/home.html index 0c9770fc..ddfbbf4f 100644 --- a/docs/layouts/modus-outlined/home.html +++ b/docs/layouts/modus-outlined/home.html @@ -1,8 +1,9 @@ - + {{ partial "head" . }} + {{ partial "analytics" . }} @@ -18,7 +19,6 @@ {{- partialCached "footer" . }} {{- partialCached "scripts" . }} - {{ partial "analytics" . }} diff --git a/docs/layouts/modus-solid/home.html b/docs/layouts/modus-solid/home.html index e2f3320e..06566a1e 100644 --- a/docs/layouts/modus-solid/home.html +++ b/docs/layouts/modus-solid/home.html @@ -1,8 +1,9 @@ - + {{ partial "head" . }} + {{ partial "analytics" . }} @@ -18,7 +19,6 @@ {{- partialCached "footer" . }} {{- partialCached "scripts" . }} - {{ partial "analytics" . }} diff --git a/docs/layouts/partials/analytics.html b/docs/layouts/partials/analytics.html index d3ebcab0..ecf1c5e1 100644 --- a/docs/layouts/partials/analytics.html +++ b/docs/layouts/partials/analytics.html @@ -1,18 +1,27 @@ {{- if not .Site.IsServer -}} - + - + {{ end }} diff --git a/docs/layouts/transportation/home.html b/docs/layouts/transportation/home.html index d2910bce..8c2af944 100644 --- a/docs/layouts/transportation/home.html +++ b/docs/layouts/transportation/home.html @@ -1,8 +1,9 @@ - + {{ partial "head" . }} + {{ partial "analytics" . }} diff --git a/hugo.yml b/hugo.yml index 5ed98f43..2a7de490 100644 --- a/hugo.yml +++ b/hugo.yml @@ -1,4 +1,4 @@ -languageCode: "en" +languageCode: "en-US" title: "Modus Icons" baseURL: "https://modus-icons.trimble.com/" enableInlineShortcodes: true diff --git a/icons/modus-outlined/drivers.svg b/icons/modus-outlined/drivers.svg index 34dd0c7d..80d644e0 100644 --- a/icons/modus-outlined/drivers.svg +++ b/icons/modus-outlined/drivers.svg @@ -1,3 +1,3 @@ - + diff --git a/icons/modus-outlined/less-than-equal-to.svg b/icons/modus-outlined/less-than-equal-to.svg index 1192c1e4..7f326eca 100644 --- a/icons/modus-outlined/less-than-equal-to.svg +++ b/icons/modus-outlined/less-than-equal-to.svg @@ -1,3 +1,3 @@ - + diff --git a/icons/modus-solid/less-than-equal-to.svg b/icons/modus-solid/less-than-equal-to.svg index c7d77fc6..7f326eca 100644 --- a/icons/modus-solid/less-than-equal-to.svg +++ b/icons/modus-solid/less-than-equal-to.svg @@ -1,3 +1,3 @@ - +