diff options
Diffstat (limited to 'layouts')
| -rw-r--r-- | layouts/_default/list.html | 96 | ||||
| -rw-r--r-- | layouts/_default/single.html | 63 | ||||
| -rw-r--r-- | layouts/blog/list.html | 66 | ||||
| -rw-r--r-- | layouts/blog/single.html | 2 | ||||
| -rw-r--r-- | layouts/index.html | 4 | ||||
| -rw-r--r-- | layouts/partials/header.html | 12 | ||||
| -rw-r--r-- | layouts/partials/nav-single.html | 13 | ||||
| -rw-r--r-- | layouts/partials/projects.html | 100 |
8 files changed, 254 insertions, 102 deletions
diff --git a/layouts/_default/list.html b/layouts/_default/list.html index a6fa55a..791e8b6 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,66 +1,64 @@ {{ partial "header.html" . }} -<div class="section" id="top"><!-- Parent section --> - - <div class="container hero {{ if .Site.Params.fadein }} fade-in one {{ end }}"><!-- Begin Title --> - <h1 class="bold-title is-1">{{ .Site.Params.firstname }}'s Blog</h1> - </div><!-- End Title --> +<div class="section" id="top"> + <!-- Parent section --> + <div class="container hero {{ if .Site.Params.fadein }} fade-in one {{ end }}"> + <!-- Begin Title --> + <h1 class="bold-title is-1">{{ .Title }}</h1> + </div> + <!-- End Title --> <!-- Everything below fades in two! --> <div class="section no-padding {{ if .Site.Params.fadein }} fade-in two {{ end }}"> - <div class="container"><!-- Begin Nav bar --> - {{ partial "nav-list.html" . }} - </div><!-- End Nav bar --> - - <div class="container"><!-- Begin Blog container --> - - {{ if .Site.Params.showlatest }} - <h2 class="title is-2 top-pad">Latest Post</h2> - {{ range first 1 (where .Data.Pages.ByPublishDate "Section" "blog") }} - <div class="summary">{{ .Date.Format .Site.Params.dateform }} - <h3 class="title is-3 strong-post-title"><a href="{{ .RelPermalink }}">{{ .Title }}</a></h3> - <div class="markdown"> - {{ .Summary }} - {{ if .Truncated }} - <a href="{{ .RelPermalink }}">...Read More</a> - {{ end }} - </div> + <div class="container"> + <!-- Begin Nav bar --> + {{ partial "nav-list.html" . }} </div> - {{ end }} - {{ end }} + <!-- End Nav bar --> + <article> + <!-- "{{.Content}}" pulls from the markdown content of the corresponding _index.md --> + {{ .Content }} + </article> + - <h2 class="title is-2 top-pad">All Posts</h2> - <ul> - {{ range .Data.Pages.ByPublishDate }} - {{ if eq .Section "blog" }} - {{ partial "li.html" . }} - {{ end }} - {{ end }} - </ul> + <div class="container"> + <!-- Begin Blog container --> + <ul> + <!-- Ranges through content/post/*.md --> + {{ range .Data.Pages.ByPublishDate }} {{ if not (eq .Section "blog") }} + <li> + <a href="{{.Permalink}}">{{.Date.Format .Site.Params.dateform }} | {{.Title}}</a> + </li> + {{ end }} {{ end }} + </ul> + </div> + <!-- End Blog container --> - </div><!-- End Blog container --> + <div class="container has-text-centered top-pad"> + <hr> + <a href="{{ .Permalink }}#top"> + <i class="fa fa-arrow-up"></i> + </a> + <hr> + </div> -<div class="container has-text-centered top-pad"> -<hr> -<a href="{{ .Permalink }}#top"><i class="fa fa-arrow-up"></i></a> -<hr> + {{ partial "footer.html" . }} + </div> + <!-- End fade in two --> </div> - -{{ partial "footer.html" . }} -</div><!-- End fade in two --> -</div><!-- End parent section --> +<!-- End parent section --> <!-- Bitty scrolling links script --> <script> -$('a[href^="{{ .Permalink }}#"]').click(function(e) { - e.preventDefault(); - var target = this.hash; - $('html, body').animate({ - scrollTop: $(target).offset().top - }, 500); - return false; -}) + $('a[href^="{{ .Permalink }}#"]').click(function (e) { + e.preventDefault(); + var target = this.hash; + $('html, body').animate({ + scrollTop: $(target).offset().top + }, 500); + return false; + }) </script> </body>
\ No newline at end of file diff --git a/layouts/_default/single.html b/layouts/_default/single.html new file mode 100644 index 0000000..11480c0 --- /dev/null +++ b/layouts/_default/single.html @@ -0,0 +1,63 @@ +{{ partial "header.html" . }} + +<div class="section" id="top"> + <!-- Parent section --> + + <div class="container hero {{ if .Site.Params.fadein }} fade-in one {{ end }}"> + <!-- Begin Title --> + <h1 class="bold-title is-1">{{ .Title }}</h1> + </div> + <!-- End Title --> + + <!-- Everything below fades in two! --> + <div class="section {{ if .Site.Params.fadein }} fade-in two {{ end }}"> + + <div class="container"> + <!-- Begin Nav bar --> + {{ partial "nav-single.html" . }} + </div> + <!-- End Nav bar --> + + <div class="container markdown {{ if .Site.Params.fadein }} fade-in two {{ end }} top-pad"> + <!-- Begin blog post content --> + {{ if .Params.image }} + <div class="has-text-centered"> + <img src="{{ .Params.image }}" class="img-responsive"> + </div> + {{ end }} + + {{ .Content }} + </div> + <!-- End blog post content --> + + <div class="disqus"> + {{ template "_internal/disqus.html" . }} + </div> + + <div class="container has-text-centered top-pad"> + <hr> + <a href="{{ .Permalink }}#top"> + <i class="fa fa-arrow-up"></i> + </a> + <hr> + </div> + + {{ partial "footer.html" . }} + </div> + <!-- End fade in two --> +</div> +<!-- End parent section --> + +<!-- Bitty scrolling links script --> +<script> + $('a[href^="{{ .Permalink }}#"]').click(function (e) { + e.preventDefault(); + var target = this.hash; + $('html, body').animate({ + scrollTop: $(target).offset().top + }, 500); + return false; + }) +</script> + +</body>
\ No newline at end of file diff --git a/layouts/blog/list.html b/layouts/blog/list.html new file mode 100644 index 0000000..80d9029 --- /dev/null +++ b/layouts/blog/list.html @@ -0,0 +1,66 @@ +{{ partial "header.html" . }} + +<div class="section" id="top"><!-- Parent section --> + + <div class="container hero {{ if .Site.Params.fadein }} fade-in one {{ end }}"><!-- Begin Title --> + <h1 class="bold-title is-1">{{ .Site.Params.bloghead }}</h1> + </div><!-- End Title --> + + <!-- Everything below fades in two! --> + <div class="section no-padding {{ if .Site.Params.fadein }} fade-in two {{ end }}"> + + <div class="container"><!-- Begin Nav bar --> + {{ partial "nav-list.html" . }} + </div><!-- End Nav bar --> + + <div class="container"><!-- Begin Blog container --> + + {{ if .Site.Params.showlatest }} + <h2 class="title is-2 top-pad">Latest Post</h2> + {{ range first 1 (where .Data.Pages.ByPublishDate "Section" "blog") }} + <div class="summary">{{ .Date.Format .Site.Params.dateform }} + <h3 class="title is-3 strong-post-title"><a href="{{ .RelPermalink }}">{{ .Title }}</a></h3> + <div class="markdown"> + {{ .Summary }} + {{ if .Truncated }} + <a href="{{ .RelPermalink }}">...Read More</a> + {{ end }} + </div> + </div> + {{ end }} + {{ end }} + + <h2 class="title is-2 top-pad">All Posts</h2> + <ul> + {{ range .Data.Pages.ByPublishDate }} + {{ if eq .Section "blog" }} + {{ partial "li.html" . }} + {{ end }} + {{ end }} + </ul> + + </div><!-- End Blog container --> + +<div class="container has-text-centered top-pad"> +<hr> +<a href="{{ .Permalink }}#top"><i class="fa fa-arrow-up"></i></a> +<hr> +</div> + +{{ partial "footer.html" . }} +</div><!-- End fade in two --> +</div><!-- End parent section --> + +<!-- Bitty scrolling links script --> +<script> +$('a[href^="{{ .Permalink }}#"]').click(function(e) { + e.preventDefault(); + var target = this.hash; + $('html, body').animate({ + scrollTop: $(target).offset().top + }, 500); + return false; +}) +</script> + +</body>
\ No newline at end of file diff --git a/layouts/blog/single.html b/layouts/blog/single.html index b4703b8..24110cb 100644 --- a/layouts/blog/single.html +++ b/layouts/blog/single.html @@ -3,7 +3,7 @@ <div class="section" id="top"><!-- Parent section --> <div class="container hero {{ if .Site.Params.fadein }} fade-in one {{ end }}"><!-- Begin Title --> - <h1 class="bold-title is-1">{{ .Site.Params.firstname }}'s Blog</h1> + <h1 class="bold-title is-1">{{ .Site.Params.bloghead }}</h1> </div><!-- End Title --> <!-- Everything below fades in two! --> diff --git a/layouts/index.html b/layouts/index.html index 1d1721f..7e69b37 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -64,7 +64,7 @@ {{ end }} <div class="column markdown"> {{ range .Data.Pages }} - {{if eq .Title "about" }} + {{if eq .Title "About" }} {{.Content}} {{end}} {{ end }} @@ -103,7 +103,7 @@ <h2 class="title is-2">Contact</h2> <div class="markdown"> {{ range .Data.Pages }} - {{if eq .Title "contact" }} + {{if eq .Title "Contact" }} {{.Content}} {{end}} {{ end }} diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 8f76872..d7e8612 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -41,11 +41,14 @@ {{ end }} <!-- jQuery --> -<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script> +<script +src="https://code.jquery.com/jquery-3.2.1.min.js" +integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4=" +crossorigin="anonymous"></script> <!-- Fonts and icon CSS --> <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css"> -<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:400,700|Ubuntu+Mono:400,400i,700,700i|Raleway:500|Work+Sans"> +<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Nunito+Sans"> {{ if .Site.Params.cachebuster }} @@ -81,10 +84,7 @@ <link href="{{ .RSSLink }}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" /> {{ end }} -<!--[if lt IE 9]> - <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script> -<![endif]--> </head> -<body lang="{{ .Site.Params.lang }}"> +<body>
\ No newline at end of file diff --git a/layouts/partials/nav-single.html b/layouts/partials/nav-single.html index 6c2a534..64d9a49 100644 --- a/layouts/partials/nav-single.html +++ b/layouts/partials/nav-single.html @@ -12,20 +12,9 @@ <span class="nav-item"> <a href="/#about">About</a> </span> - {{ if .Site.Params.showprojects }} <span class="nav-item"> - <a href="/#projects">Projects</a> - </span> - {{ end }} - {{ if .Site.Params.showallposts }} - <span class="nav-item"> - <a href="/#blog">Back to blog</a> - </span> - {{ else }} - <span class="nav-item"> - <a href="/blog">Back to blog</a> + <a href="/{{ .Section }}">Back to {{ .Section }}</a> </span> - {{ end }} <span class="nav-item"> <a href="/#contact">Contact</a> </span> diff --git a/layouts/partials/projects.html b/layouts/partials/projects.html index 6c8fd0a..55f9f0f 100644 --- a/layouts/partials/projects.html +++ b/layouts/partials/projects.html @@ -1,39 +1,75 @@ -<div class="container"><!-- Begin Projects container --> -<h2 class="title is-2 has-text-centered">Projects</h2> +<div class="container"> + <!-- Begin Projects container --> + <h2 class="title is-2 has-text-centered">Projects</h2> -<div class="columns is-mobile"> - - <div class="column has-text-centered"> - {{ if .Site.Params.project1img }} - <div class="thumbnail"> - <a href="{{ .Site.Params.project1link }}"><img class="img-responsive" src="/{{ .Site.Params.project1img }}" alt="{{ .Site.Params.project1title }}"></a> - </div> - {{ end }} - <div class="thumbnail"><a href="{{ .Site.Params.project1link }}"><h4 class="title is-4 top-pad">{{ .Site.Params.project1title }}</h4></a> - </div> + <div class="section is-small"> + <div class="columns is-multiline"> + {{ range sort .Pages }} {{ if eq .Section "projects" }} + <div class="column is-one-third"> + <!-- Hey Vicky, show half column if number is even. --> + <div class="card"> + <div class="card-image"> + <figure class="image is-3by2"> + <a {{ if .Params.external_link }} + href="{{ .Params.external_link }}" + {{ else }} + id="project{{.Title}}" + {{ end }}> + <img src="{{ .Params.image | default "{{ .Params.placeholderimg }}" }}"/> + </a> + </figure> + </div> + <div class="card-content has-text-centered top-pad"> + <a {{ if .Params.external_link }} + href="{{ .Params.external_link }}" + {{ else }} + id="project{{.Title}}" + {{ end }}> + {{ .Title }} + </a> + </div> + </div> + </div> + {{ end }} {{ end }} + </div> </div> +</div> +<!-- End Projects container --> - <div class="column has-text-centered"> - {{ if .Site.Params.project2img }} - <div class="thumbnail"> - <a href="{{ .Site.Params.project2link }}"><img class="img-responsive" src="/{{ .Site.Params.project2img }}" alt="{{ .Site.Params.project2title }}"></a> - </div> - {{ end }} - <div class="thumbnail"><a href="{{ .Site.Params.project2link }}"><h4 class="title is-4 top-pad">{{ .Site.Params.project2title }}</h4></a> - </div> +<!-- Projects modals --> +{{ range sort .Pages }} {{ if eq .Section "projects" }} +<div class="modal" id="modal{{.Title}}"> + <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 }}" 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{{.Title}}"></button> +</div> +<script> + $('#project{{.Title}}').click(function() { + $('#modal{{.Title}}').addClass('is-active'); + }); + $('#close{{.Title}}').click(function() { + $('#modal{{.Title}}').removeClass('is-active'); + }); +</script> +{{ end }} {{ end }} - <div class="column has-text-centered"> - {{ if .Site.Params.project3img }} - <div class="thumbnail"> - <a href="{{ .Site.Params.project3link }}"><img class="img-responsive" src="/{{ .Site.Params.project3img }}" alt="{{ .Site.Params.project3title }}"></a> - </div> - {{ end }} - <div class="thumbnail"><a href="{{ .Site.Params.project3link }}"><h4 class="title is-4 top-pad">{{ .Site.Params.project3title }}</h4></a> - </div> - </div> +<div class="container has-text-centered top-pad"> + <a href="#top"> + <i class="fa fa-arrow-up"></i> + </a> </div> -</div><!-- End Projects container --> - -<div class="container has-text-centered top-pad"><a href="#top"><i class="fa fa-arrow-up"></i></a></div> |