Skip to content

Commit

Permalink
Removed dead code, added default parameters, local assets.
Browse files Browse the repository at this point in the history
  • Loading branch information
Vicky committed Mar 25, 2018
1 parent 65b49aa commit 8d23938
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 27 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## Version 3.3.0 - Mar 25 2018

- Default parameters implemented so theme renders without custom config parameters
- Local assets placed

*Thank you very much to @paskal and @Hanzei for your important contributions!*

## Version 3.2.1 - Feb 3 2018

- Allow highlight theme choice using built-in Chroma and `pygmentsStyle` config
Expand Down
4 changes: 2 additions & 2 deletions layouts/blog/list.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@

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

<div class="container hero {{ if .Site.Params.fadeIn }} fade-in one {{ end }}"><!-- Begin Title -->
<div class="container hero {{ if .Site.Params.fadeIn | default true }}fade-in one{{ end }}"><!-- Begin Title -->
<h1 class="bold-title is-1">{{ .Site.Params.blogHead | default "Blog" }}</h1>
</div><!-- End Title -->

<!-- Everything below fades in two! -->
<div class="section no-padding {{ if .Site.Params.fadeIn }} fade-in two {{ end }}">
<div class="section no-padding {{ if .Site.Params.fadeIn | default true }}fade-in two{{ end }}">

<div class="container"><!-- Begin Nav bar -->
{{ partial "nav-list.html" . }}
Expand Down
8 changes: 4 additions & 4 deletions layouts/blog/single.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@

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

<div class="container hero {{ if .Site.Params.fadeIn }} fade-in one {{ end }}"><!-- Begin Title -->
<div class="container hero {{ if .Site.Params.fadeIn | default true }}fade-in one{{ end }}"><!-- Begin Title -->
<h1 class="bold-title is-1">{{ .Site.Params.blogHead | default "Blog" }}</h1>
</div><!-- End Title -->

<!-- Everything below fades in two! -->
<div class="section {{ if .Site.Params.fadeIn }} fade-in two {{ end }}">
<div class="section {{ if .Site.Params.fadeIn | default true }}fade-in two{{ end }}">

<div class="container"><!-- Begin Nav bar -->
{{ partial "nav-single.html" . }}
</div><!-- End Nav bar -->

<div class="container {{ if .Site.Params.fadeIn }} fade-in two {{ end }}"><!-- Begin blog title container -->
<div class="container {{ if .Site.Params.fadeIn | default true }}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 | default "Jan 02, 2006") }} |
Expand Down Expand Up @@ -57,7 +57,7 @@ <h2 class="title is-1 top-pad strong-post-title"><a href="{{ .Permalink }}">{{ .

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

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

Expand Down
12 changes: 6 additions & 6 deletions layouts/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,29 +9,29 @@
<div class="hero-body">
<div class="container has-text-centered">
<!-- Title and tagline -->
<h1 class="bold-title {{ if .Site.Params.fadeIn }}fade-in one{{ end }}">
<h1 class="bold-title {{ if .Site.Params.fadeIn | default true }}fade-in one{{ end }}">
Hi, I'm {{ .Site.Params.firstName | default "Introduction" }}.
</h1>
<h3 class="subtitle is-3 {{ if.Site.Params.fadeIn }} fade-in two{{ end }}">
<h3 class="subtitle is-3 {{ if .Site.Params.fadeIn | default true }}fade-in two{{ end }}">
{{ .Site.Params.tagLine }}
</h3>
<!-- End title and tagline -->
<!-- Some social icons -->
<div class="{{ if .Site.Params.fadeIn }}fade-in three{{ end }}">
<div class=" {{ if .Site.Params.fadeIn | default true }}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 {{ if .Site.Params.fadeIn }}fade-in three{{ end }}">
<div class="hero-foot {{ if .Site.Params.fadeIn | default true }}fade-in three{{ end }}">
<hr>
<nav class="nav-center">
<a class="nav-item" href="#about">About</a>
{{ if .Site.Params.showProjects }}
<a class="nav-item" href="#projects">Projects</a>
{{ end }}
{{ if .Site.Params.showBlog }}
{{ if .Site.Params.showBlog | default true }}
<a class="nav-item" href="#blog">Blog</a>
{{ end }}
<a class="nav-item" href="#contact">Contact</a>
Expand All @@ -41,7 +41,7 @@ <h3 class="subtitle is-3 {{ if.Site.Params.fadeIn }} fade-in two{{ end }}">
</div><!-- Done with Hero -->

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

<!-- Tell them all about it! -->
<div class="section" id="about">
Expand Down
16 changes: 1 addition & 15 deletions layouts/partials/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,8 @@
{{ if .Site.Params.cacheBuster }}
{{ $t := now.Unix }}
<link rel="stylesheet" href="css/{{ .Site.Params.themeStyle | default "dark" }}-style.css?t={{$t}}">
{{range .Site.Params.extraCSSFiles}}
<link rel="stylesheet" href="{{.}}?t={{$t}}">
{{ end }}
{{ else }}

<link rel="stylesheet" href="css/{{ .Site.Params.themeStyle | default "dark" }}-style.css">
{{range .Site.Params.extraCSSFiles}}
<link rel="stylesheet" href="{{.}}">
{{end}}

{{ end }}

<!-- Custom css -->
Expand All @@ -61,13 +53,7 @@
{{- end }}

<!-- Icon -->
<link rel="shortcut icon"
{{ if .Site.Params.faviconFile }}
href="{{ .Site.Params.faviconFile }}"
{{ else }}
href="img/favicon.ico"
{{ end }}
>
<link rel="shortcut icon" href="{{ .Site.Params.faviconFile | default "img/favicon.ico" }}">

<!-- Google Analytics -->
{{ template "_internal/google_analytics_async.html" . }}
Expand Down
Binary file added static/img/favicon.ico
Binary file not shown.

0 comments on commit 8d23938

Please sign in to comment.