Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ability to turn off the fadein effect #4

Merged
merged 3 commits into from
May 5, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions exampleSite/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ highlightjs = true # Syntax highlighting
lang = "en"
footertext = "" # Text to show in footer (overrides default text)

fadein = true # Turn on/off the fade-in effect

showblog = true # Show Blog section on home page
showallposts = false # Set 'true' to list all posts on home page, or set 'false' to link to separate blog list page
showlatest = true # Show latest blog post summary
Expand Down
8 changes: 4 additions & 4 deletions layouts/404.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@

<div class="section" id="top"><!-- Parent section -->

<div class="container hero is-medium has-text-centered fade-in one"><!-- Begin Title -->
<div class="container hero is-medium has-text-centered {{ if .Site.Params.fadein }} fade-in one {{ end }}"><!-- Begin Title -->
<h1 class="bold-title is-1">404</h1>
</div><!-- End Title -->

<!-- Everything below fades in two! -->
<div class="section fade-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 fade-in two top-pad"><!-- Begin blurb -->
<div class="container {{ if .Site.Params.fadein }} fade-in two {{ end }} top-pad"><!-- Begin blurb -->
Oops! Either you've found a bug (in which case, <a href="mailto:{{ .Site.Params.email }}">please tell me</a>) or you're just making things up. This page doesn't exist!
</div><!-- End blurb -->

<div class="top-pad"><hr></div>
{{ partial "footer.html" . }}
</div><!-- End parent section -->
</div><!-- End parent section -->
6 changes: 3 additions & 3 deletions layouts/_default/list.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

<div class="section" id="top"><!-- Parent section -->

<div class="container hero fade-in one"><!-- Begin Title -->
<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 -->

<!-- Everything below fades in two! -->
<div class="section no-padding fade-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" . }}
Expand Down Expand Up @@ -61,4 +61,4 @@ <h2 class="title is-2 top-pad">All Posts</h2>
}, 500);
return false;
})
</script>
</script>
16 changes: 8 additions & 8 deletions layouts/blog/single.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@

<div class="section" id="top"><!-- Parent section -->

<div class="container hero fade-in one"><!-- Begin Title -->
<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 -->

<!-- Everything below fades in two! -->
<div class="section fade-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 fade-in two"><!-- Begin blog title container -->
<div class="container {{ if .Site.Params.fadein }} fade-in two {{ end }}"><!-- Begin blog title container -->
<h2 class="title is-1 top-pad strong-post-title"><a href="{{ .Permalink }}">{{ .Title }}</a></h2>
<div class="post-data">
{{ .Date.Format .Site.Params.dateform }} |
{{ if eq 1 .ReadingTime }}{{ .ReadingTime }} minute read{{ else }}{{ .ReadingTime }} minutes read{{ end }}
</div>

{{ if .Site.Params.sharebuttons }}
<div class="blog-share">
Share this:
Expand All @@ -45,13 +45,13 @@ <h2 class="title is-1 top-pad strong-post-title"><a href="{{ .Permalink }}">{{ .
</a>
</div>
{{ end }}

</div><!-- End blog title container -->

<div class="container markdown fade-in two top-pad"><!-- Begin blog post content -->
<div class="container markdown {{ if .Site.Params.fadein }} fade-in two {{ end }} top-pad"><!-- Begin blog post content -->
{{ .Content }}
</div><!-- End blog post content -->

<div class="disqus">
{{ template "_internal/disqus.html" . }}
</div>
Expand All @@ -76,4 +76,4 @@ <h2 class="title is-1 top-pad strong-post-title"><a href="{{ .Permalink }}">{{ .
}, 500);
return false;
})
</script>
</script>
16 changes: 11 additions & 5 deletions layouts/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,22 @@
<div class="hero-body">
<div class="container has-text-centered">
<!-- Title and tagline -->
<h1 class="bold-title fade-in one">Hi, I'm {{ .Site.Params.firstname }}.</h1>
<h3 class="subtitle is-3 fade-in two">{{ .Site.Params.tagline }}</h3>
<h1 class="bold-title {{ if .Site.Params.fadein }}fade-in one{{ end }}">
Hi, I'm {{ .Site.Params.firstname }}.
</h1>
<h3 class="subtitle is-3 {{ if.Site.Params.fadein }} fade-in two{{ end }}">
{{ .Site.Params.tagline }}
</h3>
<!-- End title and tagline -->
<!-- Some social icons -->
<div class="fade-in three">{{ partial "social.html" . }}</div>
<div class="{{ if .Site.Params.fadein }}fade-in three{{ end }}">
{{ partial "social.html" . }}
</div>
<!-- End top social icons -->
</div>
</div> <!-- Hero body title end -->
<!-- Hero foot has nav bar -->
<div class="hero-foot fade-in three">
<div class="hero-foot {{ if .Site.Params.fadein }}fade-in three{{ end }}">
<hr>
<nav class="nav-center">
<a class="nav-item" href="#about">About</a>
Expand All @@ -43,7 +49,7 @@ <h3 class="subtitle is-3 fade-in two">{{ .Site.Params.tagline }}</h3>
</div><!-- End of top section -->

<!-- Everything below fades in three! -->
<div class="section no-padding fade-in three">
<div class="section no-padding {{ if .Site.Params.fadein }}fade-in three{{ end }}">

<!-- Tell them all about it! -->
<div class="section" id="about">
Expand Down