From d137efe0222269e09b427325176f0044558e3cc5 Mon Sep 17 00:00:00 2001
From: Kaushal Modi <kaushal.modi@gmail.com>
Date: Mon, 16 Jul 2018 17:05:30 -0400
Subject: [PATCH] Squashed 'themes/gohugoioTheme/' changes from
 f31a3dc8..66249819

66249819 Replace .Data.Pages with .Pages
32f73caa Set permission of non-executable files to 0644
69018d07 Update README.md
3b9bc8ee Update README.md
fa34f071 Update eSolia link
89573498 Fix the "edit this page" link
d0704efb Use lang.Merge to "fill in the gaps" for untranslated pages
771ae9fc Merge commit '650fac3a4e7d256f4505402ab44cfc3c804b8dea'
177aab5b Fix "reflect: Zero(nil)" error in showcase

git-subtree-dir: themes/gohugoioTheme
git-subtree-split: 662498195c8ca49e235ced10ae899f1a82804021
---
 README.md                                     |   8 +++++-
 data/sponsors.toml                            |   2 +-
 layouts/404.html                              |   0
 layouts/_default/baseof.html                  |   0
 layouts/_default/list.html                    |   3 +-
 layouts/_default/single.html                  |   0
 layouts/_default/taxonomy.html                |   2 +-
 layouts/_default/terms.html                   |   2 +-
 layouts/news/list.html                        |   3 +-
 layouts/page/documentation-home.html          |   2 +-
 layouts/partials/boxes-small-news.html        |   2 +-
 .../partials/home-page-sections/showcase.html |   2 ++
 layouts/partials/icon-link.html               |   0
 layouts/partials/manifest.html                |   0
 layouts/partials/nav-links-docs.html          |  26 +++++++++---------
 layouts/partials/nav-links.html               |   0
 layouts/partials/nav-top.html                 |   0
 layouts/partials/page-edit.html               |   2 +-
 layouts/partials/site-footer.html             |   0
 layouts/partials/site-nav.html                |   0
 layouts/partials/svg/apple.svg                |   0
 layouts/partials/svg/facebook.svg             |   0
 layouts/partials/svg/freebsd.svg              |   0
 layouts/partials/svg/github-squared.svg       |   0
 layouts/partials/svg/gopher-front.svg         |   0
 layouts/partials/svg/gopher-side_path.svg     |   0
 layouts/partials/svg/instagram.svg            |   0
 layouts/partials/svg/link-ext.svg             |   0
 layouts/partials/svg/md.svg                   |   0
 layouts/partials/svg/windows.svg              |   0
 layouts/robots.txt                            |   0
 src/css/_columns.css                          |   0
 src/css/_tachyons.css                         |   0
 src/css/_variables.css                        |   0
 src/css/main.css                              |   0
 src/css/postcss.config.js                     |   0
 src/js/main.js                                |   0
 src/package.json                              |   0
 src/readme.md                                 |   0
 src/webpack.config.js                         |   0
 static/images/gopher-side_color.svg           |   0
 .../homepage-screenshot-hugo-themes.jpg       | Bin
 theme.toml                                    |   2 +-
 43 files changed, 33 insertions(+), 23 deletions(-)
 mode change 100755 => 100644 layouts/404.html
 mode change 100755 => 100644 layouts/_default/baseof.html
 mode change 100755 => 100644 layouts/_default/list.html
 mode change 100755 => 100644 layouts/_default/single.html
 mode change 100755 => 100644 layouts/partials/boxes-small-news.html
 mode change 100755 => 100644 layouts/partials/icon-link.html
 mode change 100755 => 100644 layouts/partials/manifest.html
 mode change 100755 => 100644 layouts/partials/nav-links.html
 mode change 100755 => 100644 layouts/partials/nav-top.html
 mode change 100755 => 100644 layouts/partials/page-edit.html
 mode change 100755 => 100644 layouts/partials/site-footer.html
 mode change 100755 => 100644 layouts/partials/site-nav.html
 mode change 100755 => 100644 layouts/partials/svg/apple.svg
 mode change 100755 => 100644 layouts/partials/svg/facebook.svg
 mode change 100755 => 100644 layouts/partials/svg/freebsd.svg
 mode change 100755 => 100644 layouts/partials/svg/github-squared.svg
 mode change 100755 => 100644 layouts/partials/svg/gopher-front.svg
 mode change 100755 => 100644 layouts/partials/svg/gopher-side_path.svg
 mode change 100755 => 100644 layouts/partials/svg/instagram.svg
 mode change 100755 => 100644 layouts/partials/svg/link-ext.svg
 mode change 100755 => 100644 layouts/partials/svg/md.svg
 mode change 100755 => 100644 layouts/partials/svg/windows.svg
 mode change 100755 => 100644 layouts/robots.txt
 mode change 100755 => 100644 src/css/_columns.css
 mode change 100755 => 100644 src/css/_tachyons.css
 mode change 100755 => 100644 src/css/_variables.css
 mode change 100755 => 100644 src/css/main.css
 mode change 100755 => 100644 src/css/postcss.config.js
 mode change 100755 => 100644 src/js/main.js
 mode change 100755 => 100644 src/package.json
 mode change 100755 => 100644 src/readme.md
 mode change 100755 => 100644 src/webpack.config.js
 mode change 100755 => 100644 static/images/gopher-side_color.svg
 mode change 100755 => 100644 static/images/homepage-screenshot-hugo-themes.jpg

diff --git a/README.md b/README.md
index c95c9e739..1898fb19a 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,7 @@
-Theme for gohugo.io sites. More info to come.
+# GoHugo Sites Theme
+
+Theme for gohugo.io sites:
+* [https://gohugo.io/](https://gohugo.io/)
+* [https://themes.gohugo.io/](https://themes.gohugo.io/)
+
+More info to come.
diff --git a/data/sponsors.toml b/data/sponsors.toml
index eb9964f39..9261ffc78 100644
--- a/data/sponsors.toml
+++ b/data/sponsors.toml
@@ -12,6 +12,6 @@ copy = ""
 
 [[banners]]
 name = "eSolia"
-link = "https://esolia.com/"
+link = "https://esolia.com/post/why-did-esolia-choose-hugo/"
 logo = "/images/sponsors/esolia-logo.svg"
 copy = ""
\ No newline at end of file
diff --git a/layouts/404.html b/layouts/404.html
old mode 100755
new mode 100644
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
old mode 100755
new mode 100644
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
old mode 100755
new mode 100644
index a0835342a..3b7a2307e
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,4 +1,5 @@
 {{ define "main" }}
-  {{ $section_to_display :=  .Sections | default .Paginator.Pages }}
+  {{ $paginator := .Paginate (.Pages | lang.Merge (where .Sites.First.RegularPages "Section" .Section)) }}
+  {{ $section_to_display :=  .Sections | default $paginator.Pages }}
   {{ partial "pagelayout.html" (dict "context" . "section_to_display" $section_to_display ) }}
 {{ end }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
old mode 100755
new mode 100644
diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html
index 9968398b2..77d1812d9 100644
--- a/layouts/_default/taxonomy.html
+++ b/layouts/_default/taxonomy.html
@@ -1,4 +1,4 @@
 {{ define "main" }}
-  {{ $section_to_display :=  .Data.Pages }}
+  {{ $section_to_display := .Pages }}
   {{ partial "pagelayout.html" (dict "context" . "section_to_display" $section_to_display ) }}
 {{ end }}
diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html
index 28795cf44..f6b566656 100644
--- a/layouts/_default/terms.html
+++ b/layouts/_default/terms.html
@@ -1,6 +1,6 @@
 {{/* {{ define "header" }}{{ partial "page-header" . }}{{ end }} */}}
 {{ define "main" }}
-{{ $section_to_display :=  .Data.Pages }}
+{{ $section_to_display := .Pages }}
 <div class="w-100 ph4 pb5 pb6-ns pt1 pt3-ns">
 
   <div class="flex">
diff --git a/layouts/news/list.html b/layouts/news/list.html
index 716966e17..5a5284658 100644
--- a/layouts/news/list.html
+++ b/layouts/news/list.html
@@ -28,7 +28,8 @@
 
     {{ $interior_classes := $.Site.Params.flex_box_interior_classes }}
     <section class="flex-ns flex-wrap justify-between w-100 w-80-nsTK v-top">
-      {{ range .Paginator.Pages }}
+      {{ $paginator := .Paginate (.Pages | lang.Merge (where .Sites.First.RegularPages "Section" .Section)) -}}
+      {{ range $paginator.Pages }}
         {{ partial "boxes-section-summaries" (dict "context" . "classes" $interior_classes "fullcontent" false) }}
       {{ end }}
     </section>
diff --git a/layouts/page/documentation-home.html b/layouts/page/documentation-home.html
index 04b57d4ca..91f744c30 100644
--- a/layouts/page/documentation-home.html
+++ b/layouts/page/documentation-home.html
@@ -1,4 +1,4 @@
 {{ define "main" }}
-{{ $section_to_display :=  (.Site.Taxonomies.categories.fundamentals).Pages }}
+{{ $section_to_display := (.Site.Taxonomies.categories.fundamentals).Pages | lang.Merge (.Sites.First.Taxonomies.categories.fundamentals).Pages }}
   {{ partial "pagelayout.html" (dict "context" . "section_to_display" $section_to_display ) }}
 {{ end }}
diff --git a/layouts/partials/boxes-small-news.html b/layouts/partials/boxes-small-news.html
old mode 100755
new mode 100644
index ad254b6aa..0d89f057f
--- a/layouts/partials/boxes-small-news.html
+++ b/layouts/partials/boxes-small-news.html
@@ -3,7 +3,7 @@
     <!-- <a href="/news/" class="link accent-color tr-ns f6 w-100 w-50-m w-10-l bg-animate hover-bg-accent-color hover-white pv3 pv4-l ph3 ph4-l dib">
       Latest News:
     </a> -->
-    {{ range first 4 ( sort (where .Data.Pages "Section" "news") "Date" "desc" ) }}
+    {{ range first 4 ( sort (where .Pages "Section" "news") "Date" "desc" ) }}
       <!-- only show 2 boxes on mobile -->
       {{ $.Scratch.Add "i" 1 }}{{ $i := $.Scratch.Get "i" }}
       <a href="{{ .URL }}" class="link lh-copy light-gray f6 w-100 w-50-m w-25-l bg-animate hover-bg-accent-color hover-white pv3 pv4-ns ph3 ph4-ns{{ if ge $i 3 }} dn dib-l{{ else }} dib{{ end }}">
diff --git a/layouts/partials/home-page-sections/showcase.html b/layouts/partials/home-page-sections/showcase.html
index 774c10e0f..c73cfa5e9 100644
--- a/layouts/partials/home-page-sections/showcase.html
+++ b/layouts/partials/home-page-sections/showcase.html
@@ -5,10 +5,12 @@
     <div class="w-100 overflow-x-scroll">
       <div class="row nowrap mv2 pb1">
         {{ $showcasePages := where .Site.RegularPages "Section" "showcase" }}
+        {{ if $showcasePages }}
         {{ template "home_showcase_item" (index $showcasePages 0) }}
         {{ range $p := first 10 ($showcasePages | after 1 | shuffle) }}
           {{template "home_showcase_item" $p }}
         {{end}}
+        {{end}}
       </div>
     </div>
   </div>
diff --git a/layouts/partials/icon-link.html b/layouts/partials/icon-link.html
old mode 100755
new mode 100644
diff --git a/layouts/partials/manifest.html b/layouts/partials/manifest.html
old mode 100755
new mode 100644
diff --git a/layouts/partials/nav-links-docs.html b/layouts/partials/nav-links-docs.html
index 444715471..61aa11dde 100644
--- a/layouts/partials/nav-links-docs.html
+++ b/layouts/partials/nav-links-docs.html
@@ -6,18 +6,18 @@
       <li class="f5 w-100 hover-bg-light-gray hover-accent-color-light fw8{{ if eq $post "break" }} mb1 bb b--moon-gray{{ end }}">
         <a href="{{ if .HasChildren }}javascript:void(0){{ else }}{{ .URL }}{{ end }}" class="js-toggle dib w-100 link mid-gray hover-accent-color-light pl2 pr2 pv2 {{if or ($currentPage.IsMenuCurrent "docs" .) ($currentPage.HasMenuCurrent "docs" .) }} primary-color{{end}}" data-target=".{{ .Identifier }}">{{ .Name }}</a>
 
-          {{ if .HasChildren }}
-            <ul class="{{ .Identifier }} desktopmenu animated fadeIn list pl0 bg-light-gray{{if $currentPage.HasMenuCurrent "docs" . }} db{{ else }} dn{{ end }}">
-              {{ range .Children }}
-                <li  class="f6 fw4">
-                  <a href="{{.URL}}" class="db link hover-bg-gray hover-white pl3 pr2 pv2 {{if $currentPage.IsMenuCurrent "docs" . }}primary-color {{ else }}black {{end}}">
-                    {{ .Name }}
-                  </a>
-                </li>
-              {{ end }}
-            </ul>
-          {{end}}
-        </li>
-    {{end}}
+        {{- if .HasChildren }}
+        <ul class="{{ .Identifier }} desktopmenu animated fadeIn list pl0 bg-light-gray{{if $currentPage.HasMenuCurrent "docs" . }} db{{ else }} dn{{ end }}">
+          {{- range .Children }}
+          <li class="f6 fw4">
+            <a href="{{.URL}}" class="db link hover-bg-gray hover-white pl3 pr2 pv2 {{if $currentPage.IsMenuCurrent "docs" . }}primary-color {{ else }}black {{end}}">
+              {{ .Name }}
+            </a>
+          </li>
+          {{- end}}
+        </ul>
+        {{- end}}
+      </li>
+    {{- end}}
   </ul>
 </nav>
diff --git a/layouts/partials/nav-links.html b/layouts/partials/nav-links.html
old mode 100755
new mode 100644
diff --git a/layouts/partials/nav-top.html b/layouts/partials/nav-top.html
old mode 100755
new mode 100644
diff --git a/layouts/partials/page-edit.html b/layouts/partials/page-edit.html
old mode 100755
new mode 100644
index ba9c2bdcf..edf84669e
--- a/layouts/partials/page-edit.html
+++ b/layouts/partials/page-edit.html
@@ -1,3 +1,3 @@
-<a href="{{.Site.Params.ghrepo}}edit/master/content/{{.File.Path}}" class="
+<a href="{{.Site.Params.ghrepo}}edit/master/content/{{ .Lang }}/{{.File.Path}}" class="
 f6 ph3 pv1 br2 dib  tc ttu mv3 bg-primary-color white hover-bg-green link
 ">Improve this page</a>
diff --git a/layouts/partials/site-footer.html b/layouts/partials/site-footer.html
old mode 100755
new mode 100644
diff --git a/layouts/partials/site-nav.html b/layouts/partials/site-nav.html
old mode 100755
new mode 100644
diff --git a/layouts/partials/svg/apple.svg b/layouts/partials/svg/apple.svg
old mode 100755
new mode 100644
diff --git a/layouts/partials/svg/facebook.svg b/layouts/partials/svg/facebook.svg
old mode 100755
new mode 100644
diff --git a/layouts/partials/svg/freebsd.svg b/layouts/partials/svg/freebsd.svg
old mode 100755
new mode 100644
diff --git a/layouts/partials/svg/github-squared.svg b/layouts/partials/svg/github-squared.svg
old mode 100755
new mode 100644
diff --git a/layouts/partials/svg/gopher-front.svg b/layouts/partials/svg/gopher-front.svg
old mode 100755
new mode 100644
diff --git a/layouts/partials/svg/gopher-side_path.svg b/layouts/partials/svg/gopher-side_path.svg
old mode 100755
new mode 100644
diff --git a/layouts/partials/svg/instagram.svg b/layouts/partials/svg/instagram.svg
old mode 100755
new mode 100644
diff --git a/layouts/partials/svg/link-ext.svg b/layouts/partials/svg/link-ext.svg
old mode 100755
new mode 100644
diff --git a/layouts/partials/svg/md.svg b/layouts/partials/svg/md.svg
old mode 100755
new mode 100644
diff --git a/layouts/partials/svg/windows.svg b/layouts/partials/svg/windows.svg
old mode 100755
new mode 100644
diff --git a/layouts/robots.txt b/layouts/robots.txt
old mode 100755
new mode 100644
diff --git a/src/css/_columns.css b/src/css/_columns.css
old mode 100755
new mode 100644
diff --git a/src/css/_tachyons.css b/src/css/_tachyons.css
old mode 100755
new mode 100644
diff --git a/src/css/_variables.css b/src/css/_variables.css
old mode 100755
new mode 100644
diff --git a/src/css/main.css b/src/css/main.css
old mode 100755
new mode 100644
diff --git a/src/css/postcss.config.js b/src/css/postcss.config.js
old mode 100755
new mode 100644
diff --git a/src/js/main.js b/src/js/main.js
old mode 100755
new mode 100644
diff --git a/src/package.json b/src/package.json
old mode 100755
new mode 100644
diff --git a/src/readme.md b/src/readme.md
old mode 100755
new mode 100644
diff --git a/src/webpack.config.js b/src/webpack.config.js
old mode 100755
new mode 100644
diff --git a/static/images/gopher-side_color.svg b/static/images/gopher-side_color.svg
old mode 100755
new mode 100644
diff --git a/static/images/homepage-screenshot-hugo-themes.jpg b/static/images/homepage-screenshot-hugo-themes.jpg
old mode 100755
new mode 100644
diff --git a/theme.toml b/theme.toml
index 7334c0e2e..fe55ec76e 100644
--- a/theme.toml
+++ b/theme.toml
@@ -8,7 +8,7 @@ description = ""
 homepage = "https://github.com/budparr/gohugo.io"
 tags = ["website"]
 features = ["", ""]
-min_version = 0.18
+min_version = 0.38
 
 [author]
   name = "Bud Parr"