Merge branch 'release-0.9.9'

thingsym · Jul 8, 2022 · 0709bf4 · 0709bf4
2 parents f281625 + c963a92
commit 0709bf4
Show file tree

Hide file tree

Showing 20 changed files with 22,441 additions and 4,676 deletions.
diff --git a/.github/demo_config.toml b/.github/demo_config.toml
@@ -17,7 +17,7 @@ enableMissingTranslationPlaceholders = false
     # Source Code repository section
     description = "put your description"
     github_repository = "https://github.com/thingsym/hugo-theme-techdoc"
-    version = "0.9.8"
+    version = "0.9.9"
 
     # Documentation repository section
     # documentation repository (set edit link to documentation repository)
@@ -44,7 +44,7 @@ enableMissingTranslationPlaceholders = false
 
     # Documentation Menu section
     # Menu style settings
-    menu_style = "open-menu" # "open-menu" or "slide-menu" or "" blank is as no sidebar
+    menu_style = "slide-menu" # "open-menu" or "slide-menu" or "" blank is as no sidebar
 
     # Date format
     dateformat = "" # default "2 Jan 2006"

diff --git a/README.md b/README.md
@@ -265,6 +265,19 @@ Small patches and bug reports can be submitted a issue tracker in Github. Forkin
 
 ## Changelog
 
+* Version 0.9.9 - 2022.07.08
+	* fix scss
+	* bump up version on jquery, jquery.easing and clipboard
+	* update node package dependencies
+	* change service name
+	* change fontawesome delivery from cdn to self-host
+	* fix config.toml
+	* id and class elements added to menu items
+	* pre and post elements added to menu items [#48]
+	* use SRI for CDN js sources [#45]
+	* fix heading styles
+	* change to using math.div for division
+
 * Version 0.9.8 - 2021.10.18
 	* fix sample document
 	* edit README

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,6 +1,6 @@
 version: '3'
 services:
-  server:
+  hugo:
     image: klakegg/hugo:0.81.0-alpine
     volumes:
       - .:/hugo/themes/hugo-theme-techdoc

diff --git a/exampleSite/config.toml b/exampleSite/config.toml
@@ -17,7 +17,7 @@ enableMissingTranslationPlaceholders = false
     # Source Code repository section
     description = "put your description"
     github_repository = "https://github.com/thingsym/hugo-theme-techdoc"
-    version = "0.9.7"
+    version = "0.9.9"
 
     # Documentation repository section
     # documentation repository (set edit link to documentation repository)
@@ -74,11 +74,18 @@ enableMissingTranslationPlaceholders = false
         name = "Home"
         url = "/"
         weight = 1
+        identifier = 'home'
+        pre = "<i class='fa fa-heart'></i>&nbsp;"
 
     [[menu.main]]
         name = "Twitter"
         url = "https://twitter.com/thingsym"
         weight = 2
+        identifier = 'twitter'
+        pre = "<b>pre!</b> "
+        post = " <b>post!</b>"
+        [menu.main.params]
+          class = 'twitter-menu-item'
 
 # Markup configure section
 # See https://gohugo.io/getting-started/configuration-markup/

diff --git a/exampleSite/content/getting-started/configuration.md b/exampleSite/content/getting-started/configuration.md
@@ -15,7 +15,7 @@ For an example of `config.toml`, see [config.toml](https://github.com/thingsym/h
     # Source Code repository section
     description = "put your description"
     github_repository = "https://github.com/thingsym/hugo-theme-techdoc"
-    version = "0.9.8"
+    version = "0.9.9"
 
     # Documentation repository section
     # documentation repository (set edit link to documentation repository)
@@ -81,7 +81,7 @@ default: `https://github.com/thingsym/hugo-theme-techdoc`
 
 The version of souce code
 
-default: `0.9.8`
+default: `0.9.9`
 
 #### `github_doc_repository`
 

diff --git a/layouts/partials/global-menu.html b/layouts/partials/global-menu.html
@@ -5,15 +5,15 @@
 <ul>
 {{- range .Site.Menus.main.ByWeight -}}
 {{ if .HasChildren -}}
-<li class="parent{{ if $currentPage.HasMenuCurrent "main" . }} active{{ end }}">{{template "menu-item" dict "item" .}}
+<li{{ with .Identifier }} id="{{ . }}"{{ end }} class="parent{{ if $currentPage.HasMenuCurrent "main" . }} active{{ end }} {{ with .Params.class }}{{ . }}{{ end }}">{{template "menu-item" dict "item" .}}
 <ul class="sub-menu">
 {{ range .Children -}}
-<li class="child{{ if $currentPage.HasMenuCurrent "main" . }} active{{ end }}">{{template "menu-item" dict "item" .}}</li>
+<li{{ with .Identifier }} id="{{ . }}"{{ end }} class="child{{ if $currentPage.HasMenuCurrent "main" . }} active{{ end }} {{ with .Params.class }}{{ . }}{{ end }}">{{template "menu-item" dict "item" .}}</li>
 {{ end -}}
 </ul>
 </li>
 {{- else }}
-<li{{ if $currentPage.HasMenuCurrent "main" . }} class="active"{{ end }}>{{template "menu-item" dict "item" .}}</li>
+<li{{ with .Identifier }} id="{{ . }}"{{ end }}{{ if $currentPage.HasMenuCurrent "main" . }} class="active {{with .Params.class}}{{ . }}{{ end }}"{{ else }} class="{{ with .Params.class }}{{ . }}{{ end }}"{{ end }}>{{template "menu-item" dict "item" .}}</li>
 {{- end -}}
 {{- end -}}
 </ul>
@@ -27,10 +27,9 @@
   {{- with .Pre -}}{{- . -}}{{- end -}}
   {{- .Name -}}
   {{- with .Post -}}{{- . -}}{{- end -}}
-  {{ if .HasChildren -}}
+  {{- if .HasChildren -}}
   <i class="fas fa-angle-right"></i>
-  {{ end -}}  
+  {{- end -}}
 </a>
 {{- end -}}
 {{- end -}}
-
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
@@ -15,16 +15,12 @@
 <link href="{{ .Site.BaseURL }}/index.xml" rel="alternate" type="application/rss+xml">
 <link rel="canonical" href="{{ .Permalink }}">
 <link rel="stylesheet" href="{{"css/theme.min.css" | absURL}}">
-<script src="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.1.1/js/fontawesome.min.js"
-    integrity="sha256-8VIPpMbn140LuBA5s/e/YBbGen4ny3AdkwmoIvfGHeU=" crossorigin="anonymous"></script>
-<script src="https://cdn.jsdelivr.net/npm/jquery@3.4.1/dist/jquery.min.js"
-    integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"></script>
-<script src="https://cdn.jsdelivr.net/npm/jquery.easing@1.4.1/jquery.easing.min.js"
-    integrity="sha256-H3cjtrm/ztDeuhCN9I4yh4iN2Ybx/y1RM7rMmAesA0k=" crossorigin="anonymous"></script>
-<script src="https://cdn.jsdelivr.net/npm/clipboard@2.0.6/dist/clipboard.min.js"
-    integrity="sha256-inc5kl9MA1hkeYUt+EC3BhlIgyp/2jDIyBLS6k3UxPI=" crossorigin="anonymous"></script>
-<script src="{{ "js/bundle.js" | absURL }}"></script>
 {{ partial "meta/chroma.html" . -}}
+<script defer src="{{ .Site.BaseURL }}/js/fontawesome6/all.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
+<script src="https://cdn.jsdelivr.net/npm/jquery.easing@1.4.1/jquery.easing.min.js" integrity="sha256-H3cjtrm/ztDeuhCN9I4yh4iN2Ybx/y1RM7rMmAesA0k=" crossorigin="anonymous"></script>
+<script src="https://cdn.jsdelivr.net/npm/clipboard@2.0.11/dist/clipboard.min.js" integrity="sha256-4XodgW4TwIJuDtf+v6vDJ39FVxI0veC/kSCCmnFp7ck=" crossorigin="anonymous"></script>
+<script src="{{ "js/bundle.js" | absURL }}"></script>
 {{- partial "meta/google-analytics-async.html" . -}}
 {{- partial "meta/tag-manager.html" . -}}
 {{- partial "meta/google-site-verification.html" . -}}

diff --git a/layouts/partials/search.html b/layouts/partials/search.html
@@ -1,6 +1,6 @@
 <script src="https://cdn.jsdelivr.net/npm/algoliasearch@4.0.0/dist/algoliasearch-lite.umd.js" integrity="sha256-MfeKq2Aw9VAkaE9Caes2NOxQf6vUa8Av0JqcUXUGkd0=" crossorigin="anonymous"></script>
 <script src="https://cdn.jsdelivr.net/npm/instantsearch.js@4.0.0/dist/instantsearch.production.min.js" integrity="sha256-6S7q0JJs/Kx4kb/fv0oMjS855QTz5Rc2hh9AkIUjUsk=" crossorigin="anonymous"></script>
-<script src="https://unpkg.com/dayjs@1.8.21/dayjs.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/dayjs@1.11.3/dayjs.min.js" integrity="sha256-iu/zLUB+QgISXBLCW/mcDi/rnf4m4uEDO0wauy76x7U=" crossorigin="anonymous"></script>
 
 <div id="searchbox"></div>
 <div id="stats"></div>