diff options
| author | Curtis Timson <curt@live.co.uk> | 2018-03-01 11:35:05 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-01 11:35:05 +0300 |
| commit | 4a789ed8d362e177c1707baa904774e9d720e082 (patch) | |
| tree | 3288bf9ab6c27db64ac2ed9af3100eb75a0f46ce | |
| parent | 75f05c9db8556866edf1ce4ba83051b105a658e8 (diff) | |
| parent | 6303a50f96db3f234daac23273d25397bdc519c2 (diff) | |
Merge pull request #32 from curttimson/feature/baseof
Feature/baseof
| -rw-r--r-- | layouts/_default/baseof.html | 13 | ||||
| -rw-r--r-- | layouts/_default/list.html | 85 | ||||
| -rw-r--r-- | layouts/_default/single.html | 78 | ||||
| -rw-r--r-- | layouts/index.html | 90 | ||||
| -rw-r--r-- | package.json | 2 |
5 files changed, 125 insertions, 143 deletions
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html new file mode 100644 index 0000000..13c2e72 --- /dev/null +++ b/layouts/_default/baseof.html @@ -0,0 +1,13 @@ +<!DOCTYPE HTML> +<!-- + Dopetrope by HTML5 UP + html5up.net | @ajlkn + Free for personal and commercial use under the CCA 3.0 license (html5up.net/license) +--> +<html> + {{ partial "htmlhead.html" . }} + <body class="homepage"> + {{ block "main" . }} + {{ end }} + </body> +</html>
\ No newline at end of file diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 1fc67b7..cd2b313 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,55 +1,44 @@ +{{ define "main" }} + <div id="page-wrapper"> + + <!-- Header --> + <div id="header-wrapper"> + <div id="header"> + + {{ partial "logo.html" . }} + {{ partial "nav.html" . }} -<!DOCTYPE HTML> -<!-- - Dopetrope by HTML5 UP - html5up.net | @ajlkn - Free for personal and commercial use under the CCA 3.0 license (html5up.net/license) ---> -<html> - {{ partial "htmlhead.html" . }} - <body class="homepage"> - <div id="page-wrapper"> - - <!-- Header --> - <div id="header-wrapper"> - <div id="header"> - - {{ partial "logo.html" . }} - {{ partial "nav.html" . }} - - </div> </div> + </div> + + <!-- Main --> + <div id="main-wrapper"> + <div class="container"> + + {{ $paginator := .Paginate (where .Data.Pages "Type" .Site.Params.Blog.foldername) .Site.Params.Blog.postsperpage }} + {{ partial "blog.html" (dict "title" .Site.Params.Blog.title "paginator" $paginator) }} + + <footer> + <ul class="actions" style="text-align: center"> + {{ if $paginator.HasPrev }} + <li><a href="{{ .Site.BaseURL }}{{ $paginator.Prev.URL }}" class="button big">Prev</a></li> + {{ end }} + {{ if $paginator.HasNext }} + <li><a href="{{ .Site.BaseURL }}{{ $paginator.Next.URL }}" class="button alt big">Next</a></li> + {{ end }} + </ul> + </footer> - <!-- Main --> - <div id="main-wrapper"> - <div class="container"> - - {{ $paginator := .Paginate (where .Data.Pages "Type" .Site.Params.Blog.foldername) .Site.Params.Blog.postsperpage }} - {{ partial "blog.html" (dict "title" .Site.Params.Blog.title "paginator" $paginator) }} - - <footer> - <ul class="actions" style="text-align: center"> - {{ if $paginator.HasPrev }} - <li><a href="{{ .Site.BaseURL }}{{ $paginator.Prev.URL }}" class="button big">Prev</a></li> - {{ end }} - {{ if $paginator.HasNext }} - <li><a href="{{ .Site.BaseURL }}{{ $paginator.Next.URL }}" class="button alt big">Next</a></li> - {{ end }} - </ul> - </footer> - - </div> </div> + </div> + + {{ partial "footer/index.html" . }} - {{ partial "footer/index.html" . }} - - </div> - + </div> - {{ partial "scripts/index.html" . }} - {{ if .Site.Params.Settings.disqus }} - <script id="dsq-count-scr" src="//{{ .Site.Params.Settings.disqus }}.disqus.com/count.js" async></script> - {{ end }} + {{ partial "scripts/index.html" . }} + {{ if .Site.Params.Settings.disqus }} + <script id="dsq-count-scr" src="//{{ .Site.Params.Settings.disqus }}.disqus.com/count.js" async></script> + {{ end }} - </body> -</html> +{{ end }}
\ No newline at end of file diff --git a/layouts/_default/single.html b/layouts/_default/single.html index cc16d29..18708b3 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,55 +1,45 @@ +{{ define "main" }} + <div id="page-wrapper"> -<!DOCTYPE HTML> -<!-- - Dopetrope by HTML5 UP - html5up.net | @ajlkn - Free for personal and commercial use under the CCA 3.0 license (html5up.net/license) ---> -<html> - {{ partial "htmlhead.html" . }} - <body class="homepage"> - <div id="page-wrapper"> + <!-- Header --> + <div id="header-wrapper"> + <div id="header"> - <!-- Header --> - <div id="header-wrapper"> - <div id="header"> + {{ partial "logo.html" . }} + {{ partial "nav.html" . }} - {{ partial "logo.html" . }} - {{ partial "nav.html" . }} - - </div> </div> - - <!-- Main --> - <div id="main-wrapper"> - <div class="container"> - {{ if and (or (eq .Site.Data.sidebar.content.position "left") (eq .Site.Data.sidebar.content.position "right")) (not (eq .Params.hidesidebar true)) }} - <div class="row"> - {{ if eq .Site.Data.sidebar.content.position "left" }} - <div class="4u 12u(mobile)"> - {{ partial "post/sidebar" . }} - </div> - {{ end }} - <div class="8u 12u(mobile)"> - {{ partial "post/content.html" . }} - </div> - {{ if eq .Site.Data.sidebar.content.position "right" }} - <div class="4u 12u(mobile)"> - {{ partial "post/sidebar" . }} - </div> - {{ end }} + </div> + + <!-- Main --> + <div id="main-wrapper"> + <div class="container"> + {{ if and (or (eq .Site.Data.sidebar.content.position "left") (eq .Site.Data.sidebar.content.position "right")) (not (eq .Params.hidesidebar true)) }} + <div class="row"> + {{ if eq .Site.Data.sidebar.content.position "left" }} + <div class="4u 12u(mobile)"> + {{ partial "post/sidebar" . }} + </div> + {{ end }} + <div class="8u 12u(mobile)"> + {{ partial "post/content.html" . }} + </div> + {{ if eq .Site.Data.sidebar.content.position "right" }} + <div class="4u 12u(mobile)"> + {{ partial "post/sidebar" . }} </div> - {{ else }} - {{ partial "post/content.html" . }} {{ end }} </div> + {{ else }} + {{ partial "post/content.html" . }} + {{ end }} </div> + </div> + + {{ partial "footer/index.html" . }} - {{ partial "footer/index.html" . }} - - </div> + </div> - {{ partial "scripts/index.html" . }} + {{ partial "scripts/index.html" . }} - </body> -</html> +{{ end }}
\ No newline at end of file diff --git a/layouts/index.html b/layouts/index.html index 82154f2..6111f2e 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -1,65 +1,55 @@ +{{ define "main" }} + <div id="page-wrapper"> -<!DOCTYPE HTML> -<!-- - Dopetrope by HTML5 UP - html5up.net | @ajlkn - Free for personal and commercial use under the CCA 3.0 license (html5up.net/license) ---> -<html> - {{ partial "htmlhead.html" . }} - <body class="homepage"> - <div id="page-wrapper"> + <!-- Header --> + <div id="header-wrapper"> + <div id="header"> - <!-- Header --> - <div id="header-wrapper"> - <div id="header"> + {{ partial "logo.html" . }} - {{ partial "logo.html" . }} + {{ partial "nav.html" . }} - {{ partial "nav.html" . }} + {{ partial "banner.html" . }} - {{ partial "banner.html" . }} + {{ partial "intro.html" . }} - {{ partial "intro.html" . }} - - </div> </div> - - <!-- Main --> - <div id="main-wrapper"> - <div class="container"> - {{ $portfolioItems := where .Site.Pages "Type" .Site.Params.Portfolio.foldername }} - {{ if $portfolioItems }} - <div class="row"> - <div class="12u"> - {{ partial "portfolio.html" . }} - </div> + </div> + + <!-- Main --> + <div id="main-wrapper"> + <div class="container"> + {{ $portfolioItems := where .Site.Pages "Type" .Site.Params.Portfolio.foldername }} + {{ if $portfolioItems }} + <div class="row"> + <div class="12u"> + {{ partial "portfolio.html" . }} </div> - {{ end }} - {{ $blogPaginator := .Paginate (where .Data.Pages "Type" .Site.Params.Blog.foldername) 2 }} - {{ if $blogPaginator.TotalNumberOfElements }} - <div class="row"> - <div class="12u"> - {{ partial "blog.html" (dict "title" .Site.Params.Blog.title "paginator" $blogPaginator) }} - </div> + </div> + {{ end }} + {{ $blogPaginator := .Paginate (where .Data.Pages "Type" .Site.Params.Blog.foldername) 2 }} + {{ if $blogPaginator.TotalNumberOfElements }} + <div class="row"> + <div class="12u"> + {{ partial "blog.html" (dict "title" .Site.Params.Blog.title "paginator" $blogPaginator) }} </div> - <footer> - <ul class="actions" style="text-align: center"> - <li><a href="{{ .Site.Params.Blog.foldername }}" class="button big">{{ .Site.Params.Blog.viewalltext }}</a></li> - </ul> - </footer> - {{ end }} </div> + <footer> + <ul class="actions" style="text-align: center"> + <li><a href="{{ .Site.Params.Blog.foldername }}" class="button big">{{ .Site.Params.Blog.viewalltext }}</a></li> + </ul> + </footer> + {{ end }} </div> + </div> - {{ partial "footer/index.html" . }} + {{ partial "footer/index.html" . }} - </div> + </div> - {{ partial "scripts/index.html" . }} - {{ if .Site.Params.Settings.disqus }} - <script id="dsq-count-scr" src="//{{ .Site.Params.Settings.disqus }}.disqus.com/count.js" async></script> - {{ end }} + {{ partial "scripts/index.html" . }} + {{ if .Site.Params.Settings.disqus }} + <script id="dsq-count-scr" src="//{{ .Site.Params.Settings.disqus }}.disqus.com/count.js" async></script> + {{ end }} - </body> -</html> +{{ end }} diff --git a/package.json b/package.json index 9816863..9ce0d75 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hugo-theme-dopetrope", - "version": "4.0.0", + "version": "4.1.0", "description": "Hugo Theme Dopetrope", "main": "index.js", "scripts": { |