From 2a2311ea3fb1b89a266668bfd16aa96475fc183e Mon Sep 17 00:00:00 2001 From: Dimitri Staessens Date: Wed, 19 Jun 2019 20:30:25 +0200 Subject: theme: Update terrassa theme to newest version This updates the terrassa theme to the latest version. --- themes/terrassa/layouts/partials/cta-btn.html | 4 +-- themes/terrassa/layouts/partials/fontawesome.html | 15 +++++++++++ themes/terrassa/layouts/partials/head.html | 32 +++++++++++------------ themes/terrassa/layouts/partials/header.html | 3 +-- themes/terrassa/layouts/partials/hero.html | 6 ++--- themes/terrassa/layouts/partials/scripts.html | 4 +-- themes/terrassa/layouts/partials/sections.html | 6 ++++- themes/terrassa/layouts/partials/styles.html | 6 +++-- 8 files changed, 48 insertions(+), 28 deletions(-) create mode 100644 themes/terrassa/layouts/partials/fontawesome.html (limited to 'themes/terrassa/layouts/partials') diff --git a/themes/terrassa/layouts/partials/cta-btn.html b/themes/terrassa/layouts/partials/cta-btn.html index 1d7b73f..81f63a0 100644 --- a/themes/terrassa/layouts/partials/cta-btn.html +++ b/themes/terrassa/layouts/partials/cta-btn.html @@ -1,4 +1,4 @@ - {{ .Site.Params.cta.cta }} + aria-label="{{ $.Site.Params.cta.cta }}"> + {{ $.Site.Params.cta.cta }} \ No newline at end of file diff --git a/themes/terrassa/layouts/partials/fontawesome.html b/themes/terrassa/layouts/partials/fontawesome.html new file mode 100644 index 0000000..6cc5fd5 --- /dev/null +++ b/themes/terrassa/layouts/partials/fontawesome.html @@ -0,0 +1,15 @@ +{{ $version := "5.7.2" }} +{{ $integrity := "sha384-0pzryjIRos8mFBWMzSSZApWtPl/5++eIfzYmTgBBmXYdhvxPc+XcFEk+zJwDgWbP" }} +{{ if and $.Site.Params.fa.version $.Site.Params.fa.integrity }} +{{ $version = $.Site.Params.fa.version }} +{{ $integrity = $.Site.Params.fa.integrity }} +{{ end }} + +{{ $src := printf "%s%s%s" "https://use.fontawesome.com/releases/v" $version "/js/all.js" }} + + diff --git a/themes/terrassa/layouts/partials/head.html b/themes/terrassa/layouts/partials/head.html index a2885d2..8d0b97f 100644 --- a/themes/terrassa/layouts/partials/head.html +++ b/themes/terrassa/layouts/partials/head.html @@ -1,21 +1,21 @@ - - - - - {{ .Site.Title }} - {{ .Title }} - - + + + + + {{ $.Site.Title }} - {{ .Title }} + + - {{ .Hugo.Generator }} + {{ hugo.Generator }} - {{ if .Site.GoogleAnalytics }} - {{ template "_internal/google_analytics.html" . }} - {{ end }} + {{ if .Site.GoogleAnalytics }} + {{ template "_internal/google_analytics.html" . }} + {{ end }} - {{ template "_internal/twitter_cards.html" . }} - {{ template "_internal/opengraph.html" . }} + {{ template "_internal/twitter_cards.html" . }} + {{ template "_internal/opengraph.html" . }} - - {{ partial "styles.html" . }} - \ No newline at end of file + + {{ partial "styles.html" . }} + diff --git a/themes/terrassa/layouts/partials/header.html b/themes/terrassa/layouts/partials/header.html index 8016264..212f470 100644 --- a/themes/terrassa/layouts/partials/header.html +++ b/themes/terrassa/layouts/partials/header.html @@ -11,5 +11,4 @@ {{ partial "menu.html" . }} {{ partial "hamburger-menu.html" . }} - {{ partial "matomo/analytics.html" . }} - + \ No newline at end of file diff --git a/themes/terrassa/layouts/partials/hero.html b/themes/terrassa/layouts/partials/hero.html index 138d674..d3c2a30 100644 --- a/themes/terrassa/layouts/partials/hero.html +++ b/themes/terrassa/layouts/partials/hero.html @@ -1,9 +1,9 @@ -
+
{{ .Content }} - {{ if .Site.Params.cta.show }} + {{ if $.Site.Params.cta.show }} {{ partial "cta-btn.html" . }} {{ end }}
diff --git a/themes/terrassa/layouts/partials/scripts.html b/themes/terrassa/layouts/partials/scripts.html index 46beb79..63e20b1 100644 --- a/themes/terrassa/layouts/partials/scripts.html +++ b/themes/terrassa/layouts/partials/scripts.html @@ -4,5 +4,5 @@ {{ $js := $bundle | resources.Minify | resources.Fingerprint "sha512" }} - \ No newline at end of file + +{{ partial "fontawesome.html" . }} diff --git a/themes/terrassa/layouts/partials/sections.html b/themes/terrassa/layouts/partials/sections.html index 6d4cfc3..eda7fd2 100644 --- a/themes/terrassa/layouts/partials/sections.html +++ b/themes/terrassa/layouts/partials/sections.html @@ -2,9 +2,13 @@ {{ $len := (len $items) }} {{ range $i, $e := $items }} -{{ partial "section.html" .}} +{{ partial "section.html" . }} {{ if ne (add $i 1) $len }} + +{{ if $.Site.Params.separator.show }} {{ partial "separator.html" . }} +{{ end }} + {{ end }} {{ end}} \ No newline at end of file diff --git a/themes/terrassa/layouts/partials/styles.html b/themes/terrassa/layouts/partials/styles.html index 4dd5827..cf06c3a 100644 --- a/themes/terrassa/layouts/partials/styles.html +++ b/themes/terrassa/layouts/partials/styles.html @@ -3,7 +3,9 @@ {{ $style := resources.Get "css/style.css" }} {{ $media := resources.Get "css/media-queries.css" }} {{ $animations := resources.Get "css/animations.css" }} -{{ $bundle := slice $reset $base $style $media $animations | resources.Concat "css/bundle.css" }} -{{ $css := $bundle | resources.Minify | resources.Fingerprint "sha512" }} +{{ $custom := resources.Get "css/custom.css" }} +{{ $bundle := slice $reset $base $style $media $animations $custom | resources.Concat "css/bundle.css" }} + +{{ $css := $bundle | resources.Minify }} \ No newline at end of file -- cgit v1.2.3