Merge branch 'next_gen' of https://github.com/Hanzei/hugo-theme-introduction into Hanzei-next_gen

This commit is contained in:
Vicky 2018-09-03 16:59:49 +09:00
commit ef92cd4822
7 changed files with 20 additions and 16 deletions

View file

@ -2,7 +2,7 @@ git:
depth: false depth: false
env: env:
- HUGO_VERSION="0.47" - HUGO_VERSION="0.48"
install: install:
- wget -q https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_${HUGO_VERSION}_Linux-64bit.tar.gz - wget -q https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_${HUGO_VERSION}_Linux-64bit.tar.gz

2
assets/.gitattributes vendored Normal file
View file

@ -0,0 +1,2 @@
vendor/** linguist-generated=true
vendor/** -diff -merge

2
exampleSite/.gitattributes vendored Normal file
View file

@ -0,0 +1,2 @@
resources/** linguist-generated=true
resources/** -diff -merge

View file

@ -10,18 +10,17 @@
{{ $totalProjects := (len .Pages) }} {{ $totalProjects := (len .Pages) }}
{{ $numberOfProjectsToShow := .Site.Params.home.numberOfProjectsToShow | default $totalProjects }} {{ $numberOfProjectsToShow := .Site.Params.home.numberOfProjectsToShow | default $totalProjects }}
{{ range $index, $element := .Pages.ByWeight | first $numberOfProjectsToShow }} {{ range $index, $element := .Pages.ByWeight | first $numberOfProjectsToShow }}
{{ $width := "302x" }}
{{ $columWidth := "is-one-third" }}
{{ if .Site.Params.projects.useTwoColumns }} {{ if .Site.Params.projects.useTwoColumns }}
{{ .Scratch.Set "width" "490x" }} {{ $columWidth = "is-half" }}
<div class="column is-half"> {{ $width = "490x" }}
{{ else }}
{{ .Scratch.Set "width" "302x" }}
<div class="column is-one-third">
{{ end}} {{ end}}
<div class="column {{ $columWidth }}">
<div class="card" data-target="#project-{{ $index }}"> <div class="card" data-target="#project-{{ $index }}">
<div class="card-image"> <div class="card-image">
<figure class="image is-3by2"> <figure class="image is-3by2">
<a {{ if .Params.external_link }} href="{{ .Params.external_link }}" {{ end }}> <a {{ if .Params.external_link }} href="{{ .Params.external_link }}" {{ end }}>
{{ $width := ( .Scratch.Get "width" ) }}
{{ with .Resources.ByType "image" }} {{ with .Resources.ByType "image" }}
{{ range first 1 (sort . "Params.weight") }} {{ range first 1 (sort . "Params.weight") }}
{{ $image := .Resize $width }} {{ $image := .Resize $width }}

View file

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

2
static/.gitattributes vendored Normal file
View file

@ -0,0 +1,2 @@
fonts/** linguist-generated=true
fonts/** -diff -merge

View file

@ -5,7 +5,7 @@ description = "Minimal, single page, smooth scrolling theme for Hugo."
homepage = "https://github.com/vickylai/hugo-theme-introduction" 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" ] 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"] features = ["responsive", "blog", "portfolio", "gallery"]
min_version = "0.46" min_version = "0.48"
[author] [author]
name = "Vicky Lai" name = "Vicky Lai"