diff options
Diffstat (limited to 'layouts/partials')
| -rw-r--r-- | layouts/partials/blogsection.html | 2 | ||||
| -rw-r--r-- | layouts/partials/footer.html | 2 | ||||
| -rw-r--r-- | layouts/partials/header.html | 1 | ||||
| -rw-r--r-- | layouts/partials/nav-list.html | 4 | ||||
| -rw-r--r-- | layouts/partials/nav-single.html | 4 | ||||
| -rw-r--r-- | layouts/partials/projects.html | 101 |
6 files changed, 63 insertions, 51 deletions
diff --git a/layouts/partials/blogsection.html b/layouts/partials/blogsection.html index 62796a6..bc10f7b 100644 --- a/layouts/partials/blogsection.html +++ b/layouts/partials/blogsection.html @@ -25,7 +25,7 @@ {{ end }} </ul> {{ else }} -<div class="container has-text-centered top-pad"><a href="/blog">ALL BLOG POSTS</a></div> +<div class="container has-text-centered top-pad"><a href="{{ "/blog" | relURL }}">ALL BLOG POSTS</a></div> {{ end }} </div><!-- End Blog container --> diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 78dc47c..39e2446 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -3,7 +3,7 @@ {{ if .Site.Params.footerText }} {{ .Site.Params.footerText | markdownify }} {{ else }} - <span class="footer-text"><a href="https://github.com/vickylai/hugo-theme-introduction" target="_blank" rel="noopener">Introduction</a> theme for <a href="http://gohugo.io/" target="_blank" rel="noopener">Hugo</a>. Made with <i class="fa fa-heart"></i> and <i class="fa fa-coffee"></i> by <a href="https://vickylai.com" target="_blank" rel="noopener">Vicky Lai</a>.</span> + <span class="footer-text"><a href="https://github.com/vickylai/hugo-theme-introduction" target="_blank" rel="noopener">Introduction</a> theme for <a href="http://gohugo.io/" target="_blank" rel="noopener">Hugo</a>. Made with <a href="https://vickylai.com" target="_blank" rel="noopener"><i class="fa fa-heart"></i> and <i class="fa fa-coffee"></i></a> by open source contributors.</span> {{ end }} </div><!-- End Footer container --> </div><!-- End Footer section --> diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 95aeddd..82ff72b 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -10,7 +10,6 @@ <meta name="referrer" content="no-referrer"> {{ if .Site.Params.description }}<meta name="description" content="{{ .Site.Params.description }}">{{ end }} -<base href="{{ .Site.BaseURL }}"> <title> {{ $url := replace .Permalink ( printf "%s" .Site.BaseURL) "" }} {{ if eq $url "/" }} diff --git a/layouts/partials/nav-list.html b/layouts/partials/nav-list.html index 1c6869a..dc00b6c 100644 --- a/layouts/partials/nav-list.html +++ b/layouts/partials/nav-list.html @@ -9,9 +9,11 @@ <span class="nav-item"> <a href="{{ "/" | relURL }}">Main</a> </span> + {{ if (.Site.GetPage "page" "about") }} <span class="nav-item"> <a href="{{ "/about" | relURL }}">About</a> </span> + {{ end }} {{ if and (.Site.Params.showProjects) (ne .Page.Section "projects") }} <span class="nav-item"> <a href="{{ "/projects" | relURL }}">Projects</a> @@ -22,9 +24,11 @@ <a href="{{ "/blog" | relURL }}">Blog</a> </span> {{ end }} + {{ if (.Site.GetPage "page" "contact") }} <span class="nav-item"> <a href="{{ "/contact" | relURL }}">Contact</a> </span> + {{ end }} {{ if .Site.RSSLink }} <span class="nav-item"> <a href="{{ .Site.RSSLink }}"><i class="fa fa-rss"></i></a> diff --git a/layouts/partials/nav-single.html b/layouts/partials/nav-single.html index b088ab0..9775c03 100644 --- a/layouts/partials/nav-single.html +++ b/layouts/partials/nav-single.html @@ -9,9 +9,11 @@ <span class="nav-item"> <a href="{{ "/" | relURL }}">Main</a> </span> + {{ if (.Site.GetPage "page" "about") }} <span class="nav-item"> <a href="{{ "/about" | relURL }}">About</a> </span> + {{ end }} {{ if .Site.Params.showProjects }} <span class="nav-item"> {{ if ne .Section "projects" }} @@ -30,9 +32,11 @@ {{ end }} </span> {{ end }} + {{ if (.Site.GetPage "page" "contact") }} <span class="nav-item"> <a href="{{ "/contact" | relURL }}">Contact</a> </span> + {{ end }} {{ if .Site.RSSLink }} <span class="nav-item"> <a href="{{ .Site.RSSLink }}"><i class="fa fa-rss"></i></a> diff --git a/layouts/partials/projects.html b/layouts/partials/projects.html index 1adef84..4688f83 100644 --- a/layouts/partials/projects.html +++ b/layouts/partials/projects.html @@ -4,13 +4,16 @@ <div class="section is-small"> <div class="columns is-multiline"> - {{ range sort .Pages }} {{ if eq .Section "projects" }} - {{ if eq .Site.Params.projectColumns "2" }} - <div class="column is-half"> {{ else if eq .Site.Params.projectColumns "3" }} - <div class="column is-one-third"> {{ else }} - <div class="column is-one-third"> {{ end }} - <!-- Hey Vicky, show half column if number is even. --> - <div {{ if not .Params.external_link }} id="project{{ $card := .Title | urlize }}{{ replace $card "%" ""}}" {{ end }} class="card"> + {{ $totalProjects := (len (.Site.GetPage "section" "projects").Pages) }} + {{ $numberOfProjectsToShow := .Site.Params.numberOfProjectsToShow | default $totalProjects }} + {{ range (.Site.GetPage "section" "projects").Pages | first $numberOfProjectsToShow }} + {{ if eq (mod $numberOfProjectsToShow 2) 0 }} + <div class="column is-half"> + {{ else }} + <div class="column is-one-third"> + {{ end }} + <div {{ if not .Params.external_link }} id="project{{ $card := .Title | urlize }}{{ replace $card "%" " "}}" {{ end }} + class="card"> <div class="card-image"> <figure class="image is-3by2"> <a {{ if .Params.external_link }} href="{{ .Params.external_link }}" {{ end }}> @@ -19,52 +22,54 @@ </figure> </div> <div class="card-content has-text-centered top-pad"> - <a {{ if .Params.external_link }} href="{{ .Params.external_link }}" {{ end }}> - {{ .Title }} - </a> + <a {{ if .Params.external_link }} href="{{ .Params.external_link }}" {{ end }}> + {{ .Title }} + </a> </div> + </div> </div> + {{ end }} </div> - {{ end }} {{ end }} + </div> + </div> + {{ if lt $numberOfProjectsToShow $totalProjects }} + <div class="container has-text-centered top-pad"> + <a href="{{ "/projects" | relURL }}">ALL PROJECTS</a> </div> -</div> -</div> -<!-- End Projects container --> + {{ end }} + <!-- End Projects container --> -<!-- Projects modals --> -{{ range sort .Pages }} {{ if eq .Section "projects" }} {{ if not .Params.external_link }} -<div class="modal" id="modal{{ $card := .Title | urlize }}{{ replace $card "%" ""}}"> - <div class="modal-background"></div> - <div class="modal-card"> - {{ with .Title }} - <header class="modal-card-header bottom-pad"> - <p class="modal-card-title has-text-centered">{{ . }}</p> - </header> - {{ end }} - {{ if .Params.image }} - <img src="{{ .Params.image | relURL }}" class="img-responsive img-centered"> - {{ end }} - {{ if .Content }} - <section class="modal-card-body markdown"> - {{ .Content }} - </section> - {{ end }} + <!-- Projects modals --> + {{ range (.Site.GetPage "section" "projects").Pages | first $numberOfProjectsToShow }} {{ if not .Params.external_link }} + <div class="modal" id="modal{{ $card := .Title | urlize }}{{ replace $card "%" " "}}"> + <div class="modal-background"></div> + <div class="modal-card"> + {{ with .Title }} + <header class="modal-card-header bottom-pad"> + <p class="modal-card-title has-text-centered">{{ . }}</p> + </header> + {{ end }} {{ if .Params.image }} + <img src="{{ .Params.image | relURL }}" class="img-responsive img-centered"> {{ end }} {{ if .Content }} + <section class="modal-card-body markdown"> + {{ .Content }} + </section> + {{ end }} + </div> + <button class="modal-close is-large" aria-label="close" id="close{{ $card := .Title | urlize }}{{ replace $card "%" ""}}"></button> </div> - <button class="modal-close is-large" aria-label="close" id="close{{ $card := .Title | urlize }}{{ replace $card "%" ""}}"></button> -</div> -<script> - $('#project{{ $card := .Title | urlize }}{{ replace $card "%" ""}}').click(function() { - $('#modal{{ $card := .Title | urlize }}{{ replace $card "%" ""}}').addClass('is-active'); - }); - $('#close{{ $card := .Title | urlize }}{{ replace $card "%" ""}}').click(function() { - $('#modal{{ $card := .Title | urlize }}{{ replace $card "%" ""}}').removeClass('is-active'); - }); -</script> -{{ end }} {{ end }} {{ end }} + <script> + $('#project{{ $card := .Title | urlize }}{{ replace $card "%" ""}}').click(function () { + $('#modal{{ $card := .Title | urlize }}{{ replace $card "%" ""}}').addClass('is-active'); + }); + $('#close{{ $card := .Title | urlize }}{{ replace $card "%" ""}}').click(function () { + $('#modal{{ $card := .Title | urlize }}{{ replace $card "%" ""}}').removeClass('is-active'); + }); + </script> + {{ end }} {{ end }} -<div class="container has-text-centered top-pad"> - <a href="#top"> - <i class="fa fa-arrow-up"></i> - </a> -</div> + <div class="container has-text-centered top-pad"> + <a href="#top"> + <i class="fa fa-arrow-up"></i> + </a> + </div>
\ No newline at end of file |