Merge branch 'next_gen' of https://github.com/Hanzei/hugo-theme-intro…

…duction into Hanzei-next_gen
victoriadrake · Sep 3, 2018 · ef92cd4 · ef92cd4
2 parents 03e8040 + fe57f7d
commit ef92cd4
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 16 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ git:
   depth: false
 
 env:
-  - HUGO_VERSION="0.47"
+  - HUGO_VERSION="0.48"
 
 install:
   - wget -q https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_${HUGO_VERSION}_Linux-64bit.tar.gz

diff --git a/assets/.gitattributes b/assets/.gitattributes
@@ -0,0 +1,2 @@
+vendor/**    linguist-generated=true
+vendor/**     -diff -merge
diff --git a/exampleSite/.gitattributes b/exampleSite/.gitattributes
@@ -0,0 +1,2 @@
+resources/**    linguist-generated=true
+resources/**     -diff -merge
diff --git a/layouts/partials/home/projects.html b/layouts/partials/home/projects.html
@@ -10,18 +10,17 @@ <h2 class="title is-2 has-text-centered">
                 {{ $totalProjects := (len .Pages) }}
                 {{ $numberOfProjectsToShow := .Site.Params.home.numberOfProjectsToShow | default $totalProjects }}
                 {{ range $index, $element := .Pages.ByWeight | first $numberOfProjectsToShow }}
+                {{ $width := "302x" }}
+                {{ $columWidth := "is-one-third" }}
                 {{ if .Site.Params.projects.useTwoColumns }}
-                {{ .Scratch.Set "width" "490x" }}
-                <div class="column is-half">
-                {{ else }}
-                {{ .Scratch.Set "width" "302x" }}
-                <div class="column is-one-third">
-                {{ end }}
+                  {{ $columWidth = "is-half" }}
+                  {{ $width = "490x" }}
+                {{ end}}
+                <div class="column {{ $columWidth }}">
                     <div class="card" data-target="#project-{{ $index }}">
                         <div class="card-image">
                             <figure class="image is-3by2">
                                 <a {{ if .Params.external_link }} href="{{ .Params.external_link }}" {{ end }}>
-                                    {{ $width := ( .Scratch.Get "width" ) }}
                                     {{ with .Resources.ByType "image" }}
                                     {{ range first 1 (sort . "Params.weight") }}
                                     {{ $image := .Resize $width }}

diff --git a/layouts/projects/list.html b/layouts/projects/list.html
@@ -7,18 +7,17 @@
             <div class="columns is-multiline">
                 {{ $numberOfPages := len .Pages}}
                 {{ range .Pages.ByWeight }}
+                {{ $width := "302x" }}
+                {{ $columWidth := "is-one-third" }}
                 {{ if .Site.Params.projects.useTwoColumns }}
-                {{ .Scratch.Set "width" "490x" }}
-                <div class="column is-half">
-                {{ else }}
-                {{ .Scratch.Set "width" "302x" }}
-                <div class="column is-one-third">
-                {{ end }}
+                  {{ $columWidth = "is-half" }}
+                  {{ $width = "490x" }}
+                {{ end}}
+                <div class="column {{ $columWidth }}">
                     <div class="card">
                         <div class="card-image">
                             <figure class="image is-3by2">
                                 <a href="{{ if .Params.external_link }}{{ .Params.external_link }}{{ else }}{{ .Permalink }}{{ end }}">
-                                    {{ $width := ( .Scratch.Get "width" ) }}
                                     {{ with .Resources.ByType "image" }}
                                     {{ range first 1 (sort . "Params.weight") }}
                                     {{ $image := .Resize $width }}

diff --git a/static/.gitattributes b/static/.gitattributes
@@ -0,0 +1,2 @@
+fonts/**    linguist-generated=true
+fonts/**     -diff -merge
diff --git a/theme.toml b/theme.toml
@@ -5,7 +5,7 @@ description = "Minimal, single page, smooth scrolling theme for Hugo."
 homepage = "https://github.com/vickylai/hugo-theme-introduction"
 tags = ["blog", "bulma", "clean", "dark", "disqus", "font awesome", "gallery", "minimal", "minimalist", "mobile", "multilingual", "one page", "personal", "responsive", "simple", "single page", "starter", "syntax highlighting", "projects", "white" ]
 features = ["responsive", "blog", "portfolio", "gallery"]
-min_version = "0.46"
+min_version = "0.48"
 
 [author]
   name = "Vicky Lai"