Add more icons metadata (#27)

trimble-oss · Jan 13, 2023 · efdd4ff · efdd4ff
1 parent 44b4c69
commit efdd4ff
Show file tree

Hide file tree

Showing 22 changed files with 224 additions and 8,939 deletions.
diff --git a/.npmrc b/.npmrc
@@ -1 +1,2 @@
+lockfileVersion = "3"
 registry = 'https://registry.npmjs.org/'
diff --git a/build/logic/svgo.config.js b/build/logic/svgo.config.js
@@ -18,6 +18,7 @@ module.exports = {
             keepRoleAttr: true,
           },
           removeViewBox: false,
+          sortAttrs: true,
         },
       },
     },

diff --git a/config.yml b/config.yml
@@ -28,6 +28,8 @@ module:
       target:           assets
     - source:           docs/content
       target:           content
+    - source:           docs/content-pages
+      target:           content
     - source:           docs/data
       target:           data
     - source:           docs/layouts

diff --git a/docs/content-pages/404.md b/docs/content-pages/404.md
@@ -0,0 +1,7 @@
+---
+title: "404"
+layout: "404"
+url: "/404/"
+---
+
+<h1 class="display-1 text-center mx-auto py-5 my-5">404</h1>
diff --git a/docs/content-pages/stats.md b/docs/content-pages/stats.md
@@ -0,0 +1,10 @@
+---
+title: "Stats"
+layout: "stats"
+url: "/stats/"
+hidden: true
+private: true
+---
+
+<h1 class="display-1 text-center mx-auto py-3 mt-5">Stats</h1>
+
diff --git a/docs/layouts/_default/404.html b/docs/layouts/_default/404.html
@@ -1,16 +1,5 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    {{ partial "head" . }}
-  </head>
-  <body class="d-flex flex-column min-vh-100">
-    {{ partialCached "skippy" . }}
-    {{ partialCached "navbar" . }}
+{{ define "main" }}
 
-    <main class="my-auto p-5" id="content">
-      {{ .Content }}
-    </main>
+{{ .Content }}
 
-    {{- partialCached "scripts" . .IsHome }}
-  </body>
-</html>
+{{ end }}
diff --git a/docs/layouts/_default/home.html b/docs/layouts/_default/home.html
@@ -15,7 +15,7 @@
     <div class="row">
 
       <div class="col-12 col-md-6">
-        <div class="card border">
+        <div class="card card-home border mb-3 mx-auto" style="width:330px">
           <div class="card-header border-0 text-center">
             {{ partialCached "home-icons-card-outline" . }}
           </div>
@@ -27,7 +27,7 @@
         </div>
       </div>
       <div class="col-12 col-md-6">
-        <div class="card border">
+        <div class="card card-home border mb-3" style="width:330px">
           <div class="card-header border-0 text-center">
             {{ partialCached "home-icons-card-solid" . }}
           </div>

diff --git a/docs/layouts/_default/stats.html b/docs/layouts/_default/stats.html
@@ -0,0 +1,39 @@
+{{ define "main" }}
+
+{{ .Content }}
+
+<div class="col-12 col-sm-11 col-md-10 col-lg-9 col-xl-8 mx-auto mt-3">
+  <table class="table table-bordered border mx-auto w-75 mt-3">
+    <thead class="bg-light">
+      <tr>
+        <th scope="col" class="w-50">Icon Sets</th>
+        <th scope="col">Number of Icons</th>
+      </tr>
+    <tbody>
+      <tr>
+        <td>Modus Outline</td>
+        <td>{{ len (where .Site.RegularPages "Section" "=" "modus-outline") }}</td>
+      </tr>
+      <tr>
+        <td>Modus Solid</td>
+        <td>{{ len (where .Site.RegularPages "Section" "=" "modus-solid") }}</td>
+      </tr>
+      <tr>
+        <td class="font-weight-bold">Total:</td>
+        <td class="font-weight-bold">{{ len (where .Site.RegularPages "Section" "!=" "") }}</td>
+      </tr>
+    </tbody>
+  </table>
+</div>
+
+<div class="text-center py-2">
+  Site built with:
+  <a href="https://github.com/gohugoio/hugo/releases" target="_blank" rel="noopener" class="text-dark">
+    Hugo v{{ hugo.Version }}</a>
+</div>
+
+<div class="text-center py-2">
+  Build date: {{ now.Format "2006-01-02 15:04:05" }}
+</div>
+
+{{ end }}
diff --git a/docs/layouts/modus-outline/single.html b/docs/layouts/modus-outline/single.html
@@ -11,15 +11,15 @@
 
 <div class="row align-items-md-center">
   <div class="col-md-6 col-lg-8">
-    <h1>{{- .Title -}}</h1>
+    <h1 class="display-3">{{- .Title -}}</h1>
 
     {{ if or .Params.tags .Params.categories -}}
     <ul class="list-unstyled mb-3 mb-md-0">
       {{ with .Params.tags }}<li><strong>Tags:</strong> {{ delimit . ", " }}</li>{{ end }}
       {{ with .Params.categories }}<li><strong>Category:</strong>
-	     <a href="/modus-outline/?filter={{ delimit . ", " | lower }}">{{ delimit . ", " }}</a>
-	   </li>
-	   {{ end }}
+      <a href="/modus-outline/?filter={{ delimit . ", " | lower }}">{{ delimit . ", " }}</a>
+      </li>
+      {{ end }}
     </ul>
     {{- end }}
   </div>

diff --git a/docs/layouts/modus-solid/single.html b/docs/layouts/modus-solid/single.html
@@ -9,7 +9,7 @@
 
 <div class="row align-items-md-center">
   <div class="col-md-6 col-lg-8">
-    <h1>{{- .Title -}}</h1>
+    <h1 class="display-3">{{- .Title -}}</h1>
 
     {{ if or .Params.tags .Params.categories -}}
     <ul class="list-unstyled mb-3 mb-md-0">

diff --git a/docs/layouts/partials/head.html b/docs/layouts/partials/head.html
@@ -4,21 +4,27 @@
   {{ .Site.Params.description | markdownify }}{{ else }}{{ .Title | markdownify }} ·
   {{ .Site.Title | markdownify }}{{ end }}</title>
 <meta name="description" content="{{- .Page.Params.description | default .Site.Params.description | markdownify -}}">
+
 <meta name="generator" content="Hugo {{ hugo.Version }}">
 
 <link rel="canonical" href="{{ .Permalink }}">
 
-<link rel="icon" type="image/x-icon" href="/favicon.ico">
-
 <meta name="color-scheme" content="light dark">
 {{ $themeToggle := resources.Get "js/theme-toggle.js" }}
 {{ $themeToggleJS := slice $themeToggle | resources.Concat "js/theme-toggle.js" | resources.Minify }}
 <script src="{{ $themeToggleJS.RelPermalink }}"></script>
 
 {{ if eq .Layout "home" }}
-<link rel="icon" type="image/svg+xml" href="/favicon.svg">
-{{- else -}}
+<link rel="icon" type="image/x-icon" href="/favicon.ico">
 <link rel="icon" type="image/svg+xml" href="/favicon.svg">
 {{- end }}
 
 {{ partialCached "stylesheet" . }}
+
+{{ if or .Params.tags .Params.categories -}}
+{{ if in (.RelPermalink) "modus-outline" }}
+<link rel="icon" type="image/svg+xml" href="/modus-outline/svg/{{- .Title | lower | urlize -}}.svg">
+{{ else if in (.RelPermalink) "modus-solid" }}
+<link rel="icon" type="image/svg+xml" href="/modus-solid/svg/{{- .Title | lower | urlize -}}.svg">
+{{ end }}
+{{ end }}
diff --git a/docs/layouts/partials/home-icons-card-outline.html b/docs/layouts/partials/home-icons-card-outline.html
@@ -1,84 +1,84 @@
 <svg class="modus-icon m-2" width="24" height="24" fill="currentColor">
-  <use xlink:href="/common-outline/sprites/modus-icons.svg#add" />
+  <use xlink:href="/modus-outline/sprites/modus-icons.svg#camera" />
 </svg>
 <svg class="modus-icon m-2" width="24" height="24" fill="currentColor">
-  <use xlink:href="/common-outline/sprites/modus-icons.svg#reply" />
+  <use xlink:href="/modus-outline/sprites/modus-icons.svg#keyboard" />
 </svg>
 <svg class="modus-icon m-2" width="24" height="24" fill="currentColor">
-  <use xlink:href="/common-outline/sprites/modus-icons.svg#audio" />
+  <use xlink:href="/modus-outline/sprites/modus-icons.svg#home" />
 </svg>
 <svg class="modus-icon m-2" width="24" height="24" fill="currentColor">
-  <use xlink:href="/common-outline/sprites/modus-icons.svg#solid" />
+  <use xlink:href="/modus-outline/sprites/modus-icons.svg#moon" />
 </svg>
 <svg class="modus-icon m-2" width="24" height="24" fill="currentColor">
-  <use xlink:href="/common-outline/sprites/modus-icons.svg#cancel" />
+  <use xlink:href="/modus-outline/sprites/modus-icons.svg#pen" />
 </svg>
 <svg class="modus-icon m-2" width="24" height="24" fill="currentColor">
-  <use xlink:href="/common-outline/sprites/modus-icons.svg#chat" />
+  <use xlink:href="/modus-outline/sprites/modus-icons.svg#chat" />
 </svg>
 <svg class="modus-icon m-2" width="24" height="24" fill="currentColor">
-  <use xlink:href="/common-outline/sprites/modus-icons.svg#battery" />
+  <use xlink:href="/modus-outline/sprites/modus-icons.svg#ruler" />
 </svg>
 <svg class="modus-icon m-2" width="24" height="24" fill="currentColor">
-  <use xlink:href="/common-outline/sprites/modus-icons.svg#calendar" />
+  <use xlink:href="/modus-outline/sprites/modus-icons.svg#cloud" />
 </svg>
 <svg class="modus-icon m-2" width="24" height="24" fill="currentColor">
-  <use xlink:href="/common-outline/sprites/modus-icons.svg#arrowup" />
+  <use xlink:href="/modus-outline/sprites/modus-icons.svg#calendar" />
 </svg>
 <svg class="modus-icon m-2" width="24" height="24" fill="currentColor">
-  <use xlink:href="/common-outline/sprites/modus-icons.svg#security" />
+  <use xlink:href="/modus-outline/sprites/modus-icons.svg#pulse" />
 </svg>
 <svg class="modus-icon m-2" width="24" height="24" fill="currentColor">
-  <use xlink:href="/common-outline/sprites/modus-icons.svg#cursor" />
+  <use xlink:href="/modus-outline/sprites/modus-icons.svg#cursor" />
 </svg>
 <svg class="modus-icon m-2" width="24" height="24" fill="currentColor">
-  <use xlink:href="/common-outline/sprites/modus-icons.svg#desktop" />
+  <use xlink:href="/modus-outline/sprites/modus-icons.svg#shovel" />
 </svg>
 <svg class="modus-icon m-2" width="24" height="24" fill="currentColor">
-  <use xlink:href="/common-outline/sprites/modus-icons.svg#billing" />
+  <use xlink:href="/modus-outline/sprites/modus-icons.svg#sun" />
 </svg>
 <svg class="modus-icon m-2" width="24" height="24" fill="currentColor">
-  <use xlink:href="/common-outline/sprites/modus-icons.svg#target" />
+  <use xlink:href="/modus-outline/sprites/modus-icons.svg#contrast" />
 </svg>
 <svg class="modus-icon m-2" width="24" height="24" fill="currentColor">
-  <use xlink:href="/common-outline/sprites/modus-icons.svg#attachment" />
+  <use xlink:href="/modus-outline/sprites/modus-icons.svg#file" />
 </svg>
 <svg class="modus-icon m-2" width="24" height="24" fill="currentColor">
-  <use xlink:href="/common-outline/sprites/modus-icons.svg#copy" />
+  <use xlink:href="/modus-outline/sprites/modus-icons.svg#edit" />
 </svg>
 <svg class="modus-icon m-2" width="24" height="24" fill="currentColor">
-  <use xlink:href="/common-outline/sprites/modus-icons.svg#browse" />
+  <use xlink:href="/modus-outline/sprites/modus-icons.svg#alert" />
 </svg>
 <svg class="modus-icon m-2" width="24" height="24" fill="currentColor">
-  <use xlink:href="/common-outline/sprites/modus-icons.svg#sortaz" />
+  <use xlink:href="/modus-outline/sprites/modus-icons.svg#calculate" />
 </svg>
 <svg class="modus-icon m-2" width="24" height="24" fill="currentColor">
-  <use xlink:href="/common-outline/sprites/modus-icons.svg#move" />
+  <use xlink:href="/modus-outline/sprites/modus-icons.svg#move" />
 </svg>
 <svg class="modus-icon m-2" width="24" height="24" fill="currentColor">
-  <use xlink:href="/common-outline/sprites/modus-icons.svg#cloud" />
+  <use xlink:href="/modus-outline/sprites/modus-icons.svg#hail-heavy" />
 </svg>
 <svg class="modus-icon m-2" width="24" height="24" fill="currentColor">
-  <use xlink:href="/common-outline/sprites/modus-icons.svg#comment" />
+  <use xlink:href="/modus-outline/sprites/modus-icons.svg#comment" />
 </svg>
 <svg class="modus-icon m-2" width="24" height="24" fill="currentColor">
-  <use xlink:href="/common-outline/sprites/modus-icons.svg#clock" />
+  <use xlink:href="/modus-outline/sprites/modus-icons.svg#compass" />
 </svg>
 <svg class="modus-icon m-2" width="24" height="24" fill="currentColor">
-  <use xlink:href="/common-outline/sprites/modus-icons.svg#thumbsup" />
+  <use xlink:href="/modus-outline/sprites/modus-icons.svg#thumbs-up" />
 </svg>
 <svg class="modus-icon m-2" width="24" height="24" fill="currentColor">
-  <use xlink:href="/common-outline/sprites/modus-icons.svg#billing" />
+  <use xlink:href="/modus-outline/sprites/modus-icons.svg#map" />
 </svg>
 <svg class="modus-icon m-2" width="24" height="24" fill="currentColor">
-  <use xlink:href="/common-outline/sprites/modus-icons.svg#package" />
+  <use xlink:href="/modus-outline/sprites/modus-icons.svg#menu-circle" />
 </svg>
 <svg class="modus-icon m-2" width="24" height="24" fill="currentColor">
-  <use xlink:href="/common-outline/sprites/modus-icons.svg#circle" />
+  <use xlink:href="/modus-outline/sprites/modus-icons.svg#scissors" />
 </svg>
 <svg class="modus-icon m-2" width="24" height="24" fill="currentColor">
-  <use xlink:href="/common-outline/sprites/modus-icons.svg#copy" />
+  <use xlink:href="/modus-outline/sprites/modus-icons.svg#video" />
 </svg>
 <svg class="modus-icon m-2" width="24" height="24" fill="currentColor">
-  <use xlink:href="/common-outline/sprites/modus-icons.svg#phone" />
+  <use xlink:href="/modus-outline/sprites/modus-icons.svg#volume-mute" />
 </svg>
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		lockfileVersion = "3"
		registry = 'https://registry.npmjs.org/'
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,6 +18,7 @@ module.exports = { @@
                 keepRoleAttr: true,
               },
               removeViewBox: false,
+              sortAttrs: true,
             },
           },
         },
@@ Expand Down @@