Merge branch 'master' of https://github.com/hivickylai/hugo-theme-introduction

exampleSite/config.toml

@@ -27,6 +27,7 @@ canonifyurls        = true                              # Turns relative urls in
     pygmentsCodefences  = true
     footertext          = ""                            # Text to show in footer (overrides default text)
     fadein              = true                          # Turn on/off the fade-in effect
+    customCSS           = []                            # Include custom css files e.g. ["css/foo.css", "css/bar.css"]
 
     showblog            = true                          # Show Blog section on home page
     showprojects        = true                          # Show Projects section on home page

layouts/_default/list.html

@@ -29,7 +29,7 @@
                 <!-- 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>
+                    <a href="{{.Permalink}}">{{.Date.Format (.Site.Params.dateform | default "Jan 02, 2006") }} | {{.Title}}</a>
                 </li>
                 {{ end }} {{ end }}
             </ul>

layouts/_default/taxonomy.html

@@ -29,7 +29,7 @@
                 <!-- Ranges through content/post/*.md -->
                 {{ range .Data.Pages.ByPublishDate }}
                 <li>
-                    <a href="{{.Permalink}}">{{.Date.Format .Site.Params.dateForm }} | {{.Title}}</a>
+                    <a href="{{.Permalink}}">{{.Date.Format (.Site.Params.dateform | default "Jan 02, 2006") }} | {{.Title}}</a>
                 </li>
                 {{ end }}
             </ul>

layouts/blog/list.html

@@ -4,7 +4,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.blogHead }}</h1>
+    <h1 class="bold-title is-1">{{ .Site.Params.blogHead | default "Blog" }}</h1>
     </div><!-- End Title -->
 
     <!-- Everything below fades in two! -->
@@ -19,7 +19,7 @@
     {{ if .Site.Params.showLatest }}
     <h2 class="title is-2 top-pad">Latest Post</h2>
         {{ range first 1 (where .Data.Pages.ByPublishDate.Reverse "Section" "blog") }}
-        <div class="summary">{{ .Date.Format .Site.Params.dateForm }}
+        <div class="summary">{{ .Date.Format (.Site.Params.dateform | default "Jan 02, 2006") }}
             <h3 class="title is-3 strong-post-title"><a href="{{ .RelPermalink }}">{{ .Title }}</a></h3>
                 <div class="markdown">
                 {{ .Summary }}

layouts/blog/single.html

@@ -4,7 +4,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.blogHead }}</h1>
+    <h1 class="bold-title is-1">{{ .Site.Params.blogHead | default "Blog" }}</h1>
     </div><!-- End Title -->
 
 <!-- Everything below fades in two! -->
@@ -17,7 +17,7 @@
     <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 }} |
+                {{ .Date.Format (.Site.Params.dateform | default "Jan 02, 2006") }} |
                 {{ if eq 1 .ReadingTime }}{{ .ReadingTime }} minute read{{ else }}{{ .ReadingTime }} minutes read{{ end }}
             </div>
 

layouts/index.html

@@ -3,14 +3,14 @@
 
 <div id="top"> <!-- Where all the awesome begins -->
 
-<div class="hero is-{{ .Site.Params.introHeight }}">
+<div class="hero is-{{ .Site.Params.introHeight | default "fullheight" }}">
 <!-- Possible hero-head not used -->
     <!-- Super sweet Hero body title -->
     <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 }}">
-                Hi, I'm {{ .Site.Params.firstName }}.
+                Hi, I'm {{ .Site.Params.firstName | default "Introduction" }}.
             </h1>
             <h3 class="subtitle is-3 {{ if.Site.Params.fadeIn }} fade-in two{{ end }}">
                 {{ .Site.Params.tagLine }}

layouts/partials/blogsection.html

@@ -3,7 +3,7 @@
 {{ if .Site.Params.showLatest }}
 <h2 class="title is-2 has-text-centered">Latest Post</h2>
     {{ range first 1 (where .Data.Pages.ByPublishDate.Reverse "Section" "blog") }}
-    <div class="summary">{{ .Date.Format .Site.Params.dateForm }}
+    <div class="summary">{{ .Date.Format (.Site.Params.dateform | default "Jan 02, 2006") }}
         <h3 class="title is-3 latest-post-title"><a href="{{ .RelPermalink }}">{{ .Title }}</a></h3>
             <div class="markdown">
             {{ .Summary }}

layouts/partials/header.html

@@ -34,32 +34,32 @@
 {{ end }}
 
 <!-- jQuery -->
-<script
+<script type="text/javascript" src="/js/jquery-3.3.1.min.js"></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.7.0/css/font-awesome.min.css">
+<link rel="stylesheet" href="/css/font-awesome.min.css">
-<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Nunito+Sans">
+<link rel="stylesheet" href="/css/nunito_sans.css">
 
 {{ if .Site.Params.cacheBuster }}
-
     {{ $t := now.Unix }}
-    <link rel="stylesheet" href="css/{{ .Site.Params.themeStyle }}-style.css?t={{$t}}">
+    <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 }}-style.css">
+    <link rel="stylesheet" href="css/{{ .Site.Params.themeStyle | default "dark" }}-style.css">
     {{range .Site.Params.extraCSSFiles}}
         <link rel="stylesheet" href="{{.}}">
     {{end}}
 
 {{ end }}
 
+<!-- Custom css -->
+{{ range .Site.Params.customCSS -}}
+    <link rel="stylesheet" href="{{ . | absURL }}">
+{{- end }}
+
 <!-- Icon -->
 <link rel="shortcut icon"
 {{ if .Site.Params.faviconFile }}

layouts/partials/li.html

@@ -1,3 +1,3 @@
 <li class="post-item">
-    <span><a href="{{ .Permalink }}">{{ .Title }}</a></span> - <span>{{ .Date.Format .Site.Params.dateForm }}</span>
+    <span><a href="{{ .Permalink }}">{{ .Title }}</a></span> - <span>{{ .Date.Format (.Site.Params.dateform | default "Jan 02, 2006") }}</span>
 </li>

layouts/partials/projects.html

@@ -5,8 +5,8 @@
     <div class="section is-small">
         <div class="columns is-multiline">
             {{ range sort .Pages }} {{ if eq .Section "projects" }}
-            {{ if eq .Site.Params.projectColumns "2" }}
+            {{ if eq (.Site.Params.projectColumns | default "3") "2" }}
-            <div class="column is-half"> {{ else if eq .Site.Params.projectColumns "3" }}
+            <div class="column is-half"> {{ else if eq (.Site.Params.projectColumns | default "3") "3" }}
             <div class="column is-one-third"> {{ end }}
                 <!-- Hey Vicky, show half column if number is even. -->
                 <div {{ if not .Params.external_link }} id="project{{.Title | urlize}}" {{ end }} class="card">

static/css/nunito_sans.css

@@ -0,0 +1,24 @@
+/* vietnamese */
+@font-face {
+  font-family: 'Nunito Sans';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Nunito Sans Regular'), local('NunitoSans-Regular'), url(../fonts/NunitoSans-Regular.ttf) format('woff2');
+  unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Nunito Sans';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Nunito Sans Regular'), local('NunitoSans-Regular'), url(../fonts/NunitoSans-Regular.ttf) format('woff2');
+  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: 'Nunito Sans';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Nunito Sans Regular'), local('NunitoSans-Regular'), url(../fonts/NunitoSans-Regular.ttf) format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}

static/fonts/OFL.txt

@@ -0,0 +1,93 @@
+Copyright 2016 The Nunito Project Authors (contact@sansoxygen.com),
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.