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 ceec4524e8..3115071077 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.10.0.tar.gz" }, "devDependencies": {} } 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/assets/js/theme.js b/doc/themes/the-things-stack/assets/js/theme.js index df169da7d0..7f9918a3f9 100644 --- a/doc/themes/the-things-stack/assets/js/theme.js +++ b/doc/themes/the-things-stack/assets/js/theme.js @@ -12,9 +12,10 @@ // 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"; +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/_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" . }} 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..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,38 +1,51 @@ - +
+ + + {{- 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" }} -{{- $script := resources.Get "js/theme.js" | js.Build | resources.Minify | resources.Fingerprint }} +{{- $script := resources.Get "js/theme.js" | js.Build }} {{- partial "intercom.html" . -}} 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..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/themes/the-things-stack/layouts/partials/header/nav.html b/doc/themes/the-things-stack/layouts/partials/header/nav.html index 8bf5244047..fa0f38d957 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,35 @@ - +
+ {{- if .Site.Params.search.enabled -}} + + {{- end -}} {{- if .Site.Menus.buttons }} {{- if not .Params.hidebuttons + -}} +
+ {{- range .Site.Menus.buttons }} + {{- end }}
+ {{- end -}} {{- end }}
- - + + {{- if .Site.Params.search.enabled -}} - - + + {{- end -}} diff --git a/doc/yarn.lock b/doc/yarn.lock index 68ce800a7f..eb0cacc625 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.10.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.10.0.tar.gz#11a69b26b4c21181c37b1784452f27c12c4111d5"