From 18533b5ad6fca2779f4cd14241ce193c8c82b109 Mon Sep 17 00:00:00 2001 From: Michael Compton <46600603+mjamescompton@users.noreply.github.com> Date: Fri, 9 Feb 2024 11:39:38 +0100 Subject: [PATCH 1/6] util: Update to ttui version 1.8.0 --- doc/package.json | 2 +- doc/themes/the-things-stack/layouts/partials/head/head.html | 2 +- doc/yarn.lock | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/package.json b/doc/package.json index ceec4524e8..0209f2ee11 100644 --- a/doc/package.json +++ b/doc/package.json @@ -4,7 +4,7 @@ "private": true, "description": "Hugo Theme for The Things Stack", "dependencies": { - "@ttui/design": "https://ttui.thethingsindustries.com/release/ttui-1.7.4.tar.gz" + "@tti/design": "https://ttui.thethingsindustries.com/release/ttui-1.8.0.tar.gz" }, "devDependencies": {} } diff --git a/doc/themes/the-things-stack/layouts/partials/head/head.html b/doc/themes/the-things-stack/layouts/partials/head/head.html index 3548759720..6681985fb7 100644 --- a/doc/themes/the-things-stack/layouts/partials/head/head.html +++ b/doc/themes/the-things-stack/layouts/partials/head/head.html @@ -32,5 +32,5 @@ {{ partial "gtm_head.html" . }} - + diff --git a/doc/yarn.lock b/doc/yarn.lock index 68ce800a7f..4d303ad91b 100644 --- a/doc/yarn.lock +++ b/doc/yarn.lock @@ -2,6 +2,6 @@ # yarn lockfile v1 -"@ttui/design@https://ttui.thethingsindustries.com/release/ttui-1.7.4.tar.gz": +"@tti/design@https://ttui.thethingsindustries.com/release/ttui-1.8.0.tar.gz": version "0.0.0" - resolved "https://ttui.thethingsindustries.com/release/ttui-1.7.4.tar.gz#03bddf2d0cc548d977ba7b4a2fb7c6876bd3b939" + resolved "https://ttui.thethingsindustries.com/release/ttui-1.8.0.tar.gz#54802fdbdb033fb8bc83c43b57e8a19b22fb5a12" From 19a899fdedf1f5eff86a185eafc82eb118132bb4 Mon Sep 17 00:00:00 2001 From: Michael Compton <46600603+mjamescompton@users.noreply.github.com> Date: Fri, 9 Feb 2024 11:40:16 +0100 Subject: [PATCH 2/6] util: Add ttui-header --- .../the-things-stack/assets/js/theme.js | 6 +- .../layouts/partials/header/nav.html | 82 +++++++------------ 2 files changed, 32 insertions(+), 56 deletions(-) diff --git a/doc/themes/the-things-stack/assets/js/theme.js b/doc/themes/the-things-stack/assets/js/theme.js index df169da7d0..94192ea149 100644 --- a/doc/themes/the-things-stack/assets/js/theme.js +++ b/doc/themes/the-things-stack/assets/js/theme.js @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -import "@ttui/design/ui/ttui-vendor.js"; -import "@ttui/design/ui/main.js"; -import "@ttui/design/ui/components/heading-expanded/index.js"; +import "@tti/design/ui/ttui-vendor.js"; +import "@tti/design/ui/main.js"; +import "@tti/design/ui/components/ttui-header"; function addNavBarBurgers(){ var $navbarBurgers = Array.prototype.slice.call(document.querySelectorAll('.navbar-burger'), 0) diff --git a/doc/themes/the-things-stack/layouts/partials/header/nav.html b/doc/themes/the-things-stack/layouts/partials/header/nav.html index 8bf5244047..456123b04c 100644 --- a/doc/themes/the-things-stack/layouts/partials/header/nav.html +++ b/doc/themes/the-things-stack/layouts/partials/header/nav.html @@ -1,60 +1,36 @@ - +
+ {{- if .Site.Params.search.enabled -}} + + {{- end -}} {{- if .Site.Menus.buttons }} {{- if not .Params.hidebuttons + -}} +
+ {{- range .Site.Menus.buttons }} + {{ .Pre }}{{ .Name }} {{- end }}
+ {{- end -}} {{- end }}
- - + + {{- if .Site.Params.search.enabled -}} - - + + {{- end -}} From ba45b9656061570c48902cd4185388eaf1cb4aba Mon Sep 17 00:00:00 2001 From: Michael Compton <46600603+mjamescompton@users.noreply.github.com> Date: Fri, 9 Feb 2024 11:40:45 +0100 Subject: [PATCH 3/6] util: Header styling changes --- doc/themes/the-things-stack/assets/css/theme.scss | 4 ++++ doc/themes/the-things-stack/layouts/_default/baseof.html | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/themes/the-things-stack/assets/css/theme.scss b/doc/themes/the-things-stack/assets/css/theme.scss index 407e641ac5..48fe432216 100644 --- a/doc/themes/the-things-stack/assets/css/theme.scss +++ b/doc/themes/the-things-stack/assets/css/theme.scss @@ -37,3 +37,7 @@ } @import "vendor/bulma-tooltip.min"; + +.DocSearch-Modal { + transform: translate(0, 56px) +} diff --git a/doc/themes/the-things-stack/layouts/_default/baseof.html b/doc/themes/the-things-stack/layouts/_default/baseof.html index bb3037a990..23e14d80d9 100644 --- a/doc/themes/the-things-stack/layouts/_default/baseof.html +++ b/doc/themes/the-things-stack/layouts/_default/baseof.html @@ -1,6 +1,6 @@ - + {{ partial "head/head.html" . }} From 7f7d46931999ebf46fd24c381c79f19615c7bd20 Mon Sep 17 00:00:00 2001 From: Michael Compton <46600603+mjamescompton@users.noreply.github.com> Date: Fri, 9 Feb 2024 11:41:15 +0100 Subject: [PATCH 4/6] util: TEMPORARY remove js minify for yarn link --- doc/themes/the-things-stack/layouts/partials/footer/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/themes/the-things-stack/layouts/partials/footer/footer.html b/doc/themes/the-things-stack/layouts/partials/footer/footer.html index 050538cf60..65ce755b3d 100644 --- a/doc/themes/the-things-stack/layouts/partials/footer/footer.html +++ b/doc/themes/the-things-stack/layouts/partials/footer/footer.html @@ -32,7 +32,7 @@

About Us

{{- $script := resources.Get "js/vendor/basicLightbox.min.js" }} -{{- $script := resources.Get "js/theme.js" | js.Build | resources.Minify | resources.Fingerprint }} +{{- $script := resources.Get "js/theme.js" | js.Build }} {{- partial "intercom.html" . -}} From 0f9922d3675a86a6ba33db9d5dcfbfd3989ed537 Mon Sep 17 00:00:00 2001 From: Pavel Jankoski Date: Wed, 27 Mar 2024 14:43:29 +0100 Subject: [PATCH 5/6] Bump ttui version --- doc/package.json | 2 +- doc/themes/the-things-stack/layouts/partials/head/head.html | 2 +- doc/yarn.lock | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/package.json b/doc/package.json index 0209f2ee11..d7e73da320 100644 --- a/doc/package.json +++ b/doc/package.json @@ -4,7 +4,7 @@ "private": true, "description": "Hugo Theme for The Things Stack", "dependencies": { - "@tti/design": "https://ttui.thethingsindustries.com/release/ttui-1.8.0.tar.gz" + "@tti/design": "https://ttui.thethingsindustries.com/release/ttui-1.9.4.tar.gz" }, "devDependencies": {} } diff --git a/doc/themes/the-things-stack/layouts/partials/head/head.html b/doc/themes/the-things-stack/layouts/partials/head/head.html index 6681985fb7..5dd9a54aa2 100644 --- a/doc/themes/the-things-stack/layouts/partials/head/head.html +++ b/doc/themes/the-things-stack/layouts/partials/head/head.html @@ -32,5 +32,5 @@ {{ partial "gtm_head.html" . }} - + diff --git a/doc/yarn.lock b/doc/yarn.lock index 4d303ad91b..a3e9654da8 100644 --- a/doc/yarn.lock +++ b/doc/yarn.lock @@ -2,6 +2,6 @@ # yarn lockfile v1 -"@tti/design@https://ttui.thethingsindustries.com/release/ttui-1.8.0.tar.gz": +"@tti/design@https://ttui.thethingsindustries.com/release/ttui-1.9.4.tar.gz": version "0.0.0" - resolved "https://ttui.thethingsindustries.com/release/ttui-1.8.0.tar.gz#54802fdbdb033fb8bc83c43b57e8a19b22fb5a12" + resolved "https://ttui.thethingsindustries.com/release/ttui-1.9.4.tar.gz#959d2d5a6bbebadc858be9936ea08e2cb6571a3c" From 6c6e16087c34f8eef0e2940ace061677bd7df9da Mon Sep 17 00:00:00 2001 From: Pavel Jankoski Date: Tue, 23 Apr 2024 15:11:16 +0200 Subject: [PATCH 6/6] doc: Include new ttui-footer and bump ttui version --- doc/config/_default/config.toml | 15 ++++ doc/package.json | 2 +- .../the-things-stack/assets/js/theme.js | 1 + .../layouts/partials/footer/footer.html | 75 +++++++++++-------- .../layouts/partials/header/nav.html | 5 +- doc/yarn.lock | 4 +- 6 files changed, 65 insertions(+), 37 deletions(-) diff --git a/doc/config/_default/config.toml b/doc/config/_default/config.toml index b41a2cead5..34eea2f46f 100644 --- a/doc/config/_default/config.toml +++ b/doc/config/_default/config.toml @@ -46,3 +46,18 @@ pygmentsUseClasses = true name = "Get The Things Stack" url = "https://www.thethingsindustries.com/stack/plans/" weight = 1 + + [[menu.social_media]] + name = "X" + url = "https://twitter.com/thethingsindust" + weight = 1 + + [[menu.social_media]] + name = "LinkedIn" + url = "https://www.linkedin.com/company/10346190" + weight = 2 + + [[menu.social_media]] + name = "YouTube" + url = "https://www.youtube.com/channel/UCv85CXnZUXEKnlZpQapTAwQ" + weight = 3 diff --git a/doc/package.json b/doc/package.json index d7e73da320..3115071077 100644 --- a/doc/package.json +++ b/doc/package.json @@ -4,7 +4,7 @@ "private": true, "description": "Hugo Theme for The Things Stack", "dependencies": { - "@tti/design": "https://ttui.thethingsindustries.com/release/ttui-1.9.4.tar.gz" + "@tti/design": "https://ttui.thethingsindustries.com/release/ttui-1.10.0.tar.gz" }, "devDependencies": {} } diff --git a/doc/themes/the-things-stack/assets/js/theme.js b/doc/themes/the-things-stack/assets/js/theme.js index 94192ea149..7f9918a3f9 100644 --- a/doc/themes/the-things-stack/assets/js/theme.js +++ b/doc/themes/the-things-stack/assets/js/theme.js @@ -15,6 +15,7 @@ import "@tti/design/ui/ttui-vendor.js"; import "@tti/design/ui/main.js"; import "@tti/design/ui/components/ttui-header"; +import "@tti/design/ui/components/ttui-footer"; function addNavBarBurgers(){ var $navbarBurgers = Array.prototype.slice.call(document.querySelectorAll('.navbar-burger'), 0) diff --git a/doc/themes/the-things-stack/layouts/partials/footer/footer.html b/doc/themes/the-things-stack/layouts/partials/footer/footer.html index 65ce755b3d..003d8bdf75 100644 --- a/doc/themes/the-things-stack/layouts/partials/footer/footer.html +++ b/doc/themes/the-things-stack/layouts/partials/footer/footer.html @@ -1,34 +1,47 @@ -
-
-
- - {{- if .Site.Menus.contributing }} - - {{ end -}} - {{- if .Site.Menus.about_us }} - - {{ end -}} -
-
-
+
+ + + {{- range .Site.Menus.main }} + + {{ .Name }} + + {{- end }} + + {{- if .Site.Menus.contributing }} + + {{- range .Site.Menus.contributing }} + + {{ .Name }} + + {{- end }} + + {{ end -}} + {{- if .Site.Menus.about_us }} + + {{- range .Site.Menus.about_us }} + + {{ .Name }} + + {{- end }} + + {{ end -}} + + {{- if .Site.Menus.social_media }} + + {{- range .Site.Menus.social_media }} + + {{- end }} + + + {{ end -}} +
{{- $script := resources.Get "js/vendor/basicLightbox.min.js" }} diff --git a/doc/themes/the-things-stack/layouts/partials/header/nav.html b/doc/themes/the-things-stack/layouts/partials/header/nav.html index 456123b04c..fa0f38d957 100644 --- a/doc/themes/the-things-stack/layouts/partials/header/nav.html +++ b/doc/themes/the-things-stack/layouts/partials/header/nav.html @@ -12,9 +12,8 @@ -}}
{{- range .Site.Menus.buttons }} - {{ .Pre }}{{ .Name }} + {{- end }}
{{- end -}} {{- end }} diff --git a/doc/yarn.lock b/doc/yarn.lock index a3e9654da8..eb0cacc625 100644 --- a/doc/yarn.lock +++ b/doc/yarn.lock @@ -2,6 +2,6 @@ # yarn lockfile v1 -"@tti/design@https://ttui.thethingsindustries.com/release/ttui-1.9.4.tar.gz": +"@tti/design@https://ttui.thethingsindustries.com/release/ttui-1.10.0.tar.gz": version "0.0.0" - resolved "https://ttui.thethingsindustries.com/release/ttui-1.9.4.tar.gz#959d2d5a6bbebadc858be9936ea08e2cb6571a3c" + resolved "https://ttui.thethingsindustries.com/release/ttui-1.10.0.tar.gz#11a69b26b4c21181c37b1784452f27c12c4111d5"