diff options
| author | Curtis Timson <curt@live.co.uk> | 2022-04-05 21:17:00 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-05 21:17:00 +0300 |
| commit | ed1e68e78b24998c53e868dbf623f7194574c744 (patch) | |
| tree | 3b1ebba17726a4867fe4e81d752b7ccf28a3ecf9 | |
| parent | 018e5c69bdcd75287865f53ebea9548f25a0a3c3 (diff) | |
⬆️ Upgrade to Hugo v0.94 (#44)v4.4.0
* ⬆️ Hugo Version 0.94
* update portfolio query on home
* update blog query
* add netlify.toml
* update theme version
* update publish path
* v4.4.0
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | layouts/_default/baseof.html | 6 | ||||
| -rw-r--r-- | layouts/_default/list.html | 6 | ||||
| -rw-r--r-- | layouts/index.html | 11 | ||||
| -rw-r--r-- | layouts/partials/footer/recentposts.html | 2 | ||||
| -rw-r--r-- | layouts/partials/footer/social.html | 24 | ||||
| -rw-r--r-- | layouts/partials/htmlhead.html | 8 | ||||
| -rw-r--r-- | layouts/partials/nav.html | 16 | ||||
| -rw-r--r-- | layouts/partials/portfolio.html | 4 | ||||
| -rw-r--r-- | netlify.toml | 8 | ||||
| -rw-r--r-- | package-lock.json | 4 | ||||
| -rw-r--r-- | package.json | 4 | ||||
| -rw-r--r-- | theme.toml | 2 |
13 files changed, 49 insertions, 48 deletions
@@ -1,6 +1,6 @@ # Hugo Theme Dopetrope - + Dopetrope theme ported from [HTML5 UP](https://html5up.net/) for use with the [Hugo static site generator](https://gohugo.io/). diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 13c2e72..3a65983 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -5,9 +5,9 @@ Free for personal and commercial use under the CCA 3.0 license (html5up.net/license) --> <html> - {{ partial "htmlhead.html" . }} + {{- partial "htmlhead.html" -}} <body class="homepage"> - {{ block "main" . }} - {{ end }} + {{- block "main" . }} + {{- end }} </body> </html>
\ No newline at end of file diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 8aa1e24..e9420d6 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -4,10 +4,8 @@ <!-- Header --> <div id="header-wrapper"> <div id="header"> - {{ partial "logo.html" . }} {{ partial "nav.html" . }} - </div> </div> @@ -15,8 +13,8 @@ <div id="main-wrapper"> <div class="container"> - {{ $paginator := .Paginate (where .Data.Pages "Type" .Site.Params.Blog.foldername) }} - {{ partial "blog.html" (dict "title" .Site.Params.Blog.title "paginator" $paginator) }} + {{- $paginator := .Paginate (where .Data.Pages "Type" .Site.Params.Blog.foldername) }} + {{- partial "blog.html" (dict "title" .Site.Params.Blog.title "paginator" $paginator) }} <footer> <ul class="actions" style="text-align: center"> diff --git a/layouts/index.html b/layouts/index.html index 6111f2e..6a8d296 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -4,30 +4,25 @@ <!-- Header --> <div id="header-wrapper"> <div id="header"> - {{ partial "logo.html" . }} - {{ partial "nav.html" . }} - {{ partial "banner.html" . }} - {{ partial "intro.html" . }} - </div> </div> <!-- Main --> <div id="main-wrapper"> <div class="container"> - {{ $portfolioItems := where .Site.Pages "Type" .Site.Params.Portfolio.foldername }} + {{ $portfolioItems := where .Site.RegularPages "Type" .Site.Params.Portfolio.foldername }} {{ if $portfolioItems }} <div class="row"> <div class="12u"> - {{ partial "portfolio.html" . }} + {{ partial "portfolio.html" (dict "context" . "portfolioItems" $portfolioItems) }} </div> </div> {{ end }} - {{ $blogPaginator := .Paginate (where .Data.Pages "Type" .Site.Params.Blog.foldername) 2 }} + {{ $blogPaginator := .Paginate (where .Site.RegularPages "Type" .Site.Params.Blog.foldername) 2 }} {{ if $blogPaginator.TotalNumberOfElements }} <div class="row"> <div class="12u"> diff --git a/layouts/partials/footer/recentposts.html b/layouts/partials/footer/recentposts.html index 1842b3b..2737cd3 100644 --- a/layouts/partials/footer/recentposts.html +++ b/layouts/partials/footer/recentposts.html @@ -6,7 +6,7 @@ </header> {{ end }} <ul class="dates"> - {{ range first 5 (where .Site.Pages "Type" .Site.Params.Blog.foldername) }} + {{ range first 5 (where .Site.RegularPages "Type" .Site.Params.Blog.foldername) }} <li> <span class="date">{{ .Date.Format "Jan" }} <strong>{{ .Date.Format "_2" }}</strong></span> <h3><a href="{{ .Permalink }}">{{ .Title }}</a></h3> diff --git a/layouts/partials/footer/social.html b/layouts/partials/footer/social.html index 68e9120..cdb4ce1 100644 --- a/layouts/partials/footer/social.html +++ b/layouts/partials/footer/social.html @@ -1,19 +1,19 @@ <ul class="social"> - {{ with .Site.Data.footer.links.social }} - {{ if .facebook }} + {{- with .Site.Data.footer.links.social }} + {{- if .facebook }} <li><a class="icon fa-facebook" href="{{ .facebook }}"><span class="label">Facebook</span></a></li> - {{ end }} - {{ if .twitter }} + {{- end }} + {{- if .twitter }} <li><a class="icon fa-twitter" href="{{ .twitter }}"><span class="label">Twitter</span></a></li> - {{ end }} - {{ if .dribbble }} + {{- end }} + {{- if .dribbble }} <li><a class="icon fa-dribbble" href="{{ .dribbble }}"><span class="label">Dribbble</span></a></li> - {{ end }} - {{ if .linkedin }} + {{- end }} + {{- if .linkedin }} <li><a class="icon fa-linkedin" href="{{ .linkedin }}"><span class="label">LinkedIn</span></a></li> - {{ end }} - {{ if .googleplus }} + {{- end }} + {{- if .googleplus }} <li><a class="icon fa-google-plus" href="{{ .googleplus }}"><span class="label">Google+</span></a></li> - {{ end }} - {{ end }} + {{- end }} + {{- end }} </ul>
\ No newline at end of file diff --git a/layouts/partials/htmlhead.html b/layouts/partials/htmlhead.html index 8c93433..b9260ce 100644 --- a/layouts/partials/htmlhead.html +++ b/layouts/partials/htmlhead.html @@ -1,10 +1,10 @@ <head> - <title>{{ .Site.Title }}</title> + <title>{{ site.Title }}</title> <meta charset="utf-8" /> <meta name="viewport" content="width=device-width, initial-scale=1" /> - <!--[if lte IE 8]><script src="{{ .Site.BaseURL }}assets/js/ie/html5shiv.js"></script><![endif]--> - <link rel="stylesheet" href="{{ .Site.BaseURL }}assets/css/main.css" /> + <!--[if lte IE 8]><script src="{{ site.BaseURL }}assets/js/ie/html5shiv.js"></script><![endif]--> + <link rel="stylesheet" href="{{ site.BaseURL }}assets/css/main.css" /> <!--[if lte IE 8]><link rel="stylesheet" href="{{ .Site.BaseURL }}assets/css/ie8.css" /><![endif]--> {{ .Hugo.Generator }} - {{ partial "htmlheadcustom.html" . }} + {{- partial "htmlheadcustom.html" -}} </head>
\ No newline at end of file diff --git a/layouts/partials/nav.html b/layouts/partials/nav.html index 0819e07..0ced224 100644 --- a/layouts/partials/nav.html +++ b/layouts/partials/nav.html @@ -2,23 +2,23 @@ <nav id="nav"> <ul> <li class="current"><a href="{{ .Site.BaseURL }}">Home</a></li> - {{ $portfolioItems := where .Site.Pages "Type" .Site.Params.Portfolio.foldername }} - {{ if $portfolioItems }} + {{- $portfolioItems := where .Site.RegularPages "Type" .Site.Params.Portfolio.foldername }} + {{- if $portfolioItems }} <li> <a href="{{ .Site.BaseURL }}#portfolio">{{ .Site.Params.Portfolio.title }}</a> </li> - {{ end }} - {{ $blogPosts := first 5 (where .Site.Pages "Type" .Site.Params.Blog.foldername) }} - {{ if $blogPosts }} + {{- end }} + {{- $blogPosts := first 5 (where .Site.RegularPages "Type" .Site.Params.Blog.foldername) }} + {{- if $blogPosts }} <li> <a href="{{ .Site.BaseURL }}{{ .Site.Params.Blog.foldername }}">{{ .Site.Params.Blog.title }}</a> <ul> - {{ range $blogPosts }} + {{- range $blogPosts }} <li><a href="{{ .Permalink }}">{{ .Title }}</a></li> - {{ end }} + {{- end }} </ul> </li> - {{ end }} + {{- end }} <li><a href="{{ .Site.BaseURL }}#contact">Contact</a></li> </ul> </nav>
\ No newline at end of file diff --git a/layouts/partials/portfolio.html b/layouts/partials/portfolio.html index 5c46e89..b610c66 100644 --- a/layouts/partials/portfolio.html +++ b/layouts/partials/portfolio.html @@ -1,10 +1,10 @@ <!-- Portfolio --> <section id="portfolio"> <header class="major"> - <h2>{{ .Site.Params.Portfolio.title }}</h2> + <h2>{{ .context.Site.Params.Portfolio.title }}</h2> </header> <div class="row"> - {{ range where .Data.Pages "Type" .Site.Params.Portfolio.foldername }} + {{ range .portfolioItems }} <div class="4u 12u(mobile)"> <section class="box"> <a href="{{ .Permalink }}" class="image featured"><img src="{{ .Params.thumbnail }}" alt="" /></a> diff --git a/netlify.toml b/netlify.toml new file mode 100644 index 0000000..d0e45e5 --- /dev/null +++ b/netlify.toml @@ -0,0 +1,8 @@ +[build] + base = "exampleSite/" + publish = "public" + command = "hugo --gc --themesDir ../.. --config config-prod.toml" + +[build.environment] + HUGO_VERSION = "0.94.2" + HUGO_THEME = "repo"
\ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 7304d1f..9bb99ce 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "hugo-theme-dopetrope", - "version": "4.3.0", + "version": "4.4.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "hugo-theme-dopetrope", - "version": "4.3.0", + "version": "4.4.0", "license": "Creative Commons Attribution" } } diff --git a/package.json b/package.json index ca5e24b..7216b4c 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,10 @@ { "name": "hugo-theme-dopetrope", - "version": "4.3.0", + "version": "4.4.0", "description": "Hugo Theme Dopetrope", "main": "index.js", "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" + "dev": "cd exampleSite && hugo server" }, "repository": { "type": "git", @@ -5,7 +5,7 @@ description = "An elegant open-source and mobile-first theme" homepage = "https://html5up.net/uploads/demos/dopetrope/index.html" tags = ["blog", "html5up"] features = ["blog"] -min_version = 0.19 +min_version = 0.94 [author] name = "Curtis Timson" |