Merge pull request #496 from kakawait/develop

Release 0.5.1-BETA
kakawait · Aug 27, 2021 · 0990bf9 · 0990bf9
2 parents 37550aa + c1d16b6
commit 0990bf9
Show file tree

Hide file tree

Showing 15 changed files with 30 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.5.1-BETA](https://github.com/kakawait/hugo-tranquilpeak-theme/milestone/24) - 27 aug 2021
+
+- Fix fancybox gallery since upgrade to 3.x.x ([#490](https://github.com/kakawait/hugo-tranquilpeak-theme/issues/490))
+- Fix `clearReading` options that was only applied to type `posts`. Now apply to any types of `mainSections` ([#492](https://github.com/kakawait/hugo-tranquilpeak-theme/issues/492))
+- Fix merriweather font that only load latin subset, missing other subsets like vietnamese. ([#493](https://github.com/kakawait/hugo-tranquilpeak-theme/issues/493))
+
 ## [0.5.0-BETA](https://github.com/kakawait/hugo-tranquilpeak-theme/milestone/5) - 14 aug 2021
 
 ### Forwords

diff --git a/README.md b/README.md
@@ -28,7 +28,7 @@ How can I migrate my current version? Please read [CHANGELOG.md](https://github.
 ## General
 
 - **Authors**: [Thibaud Leprêtre (kakawait)](https://github.com/kakawait) and [Louis Barranqueiro (LouisBarranqueiro)](https://github.com/LouisBarranqueiro)
-- **Version**: 0.5.0-BETA (based on Hexo version 3.1.0)
+- **Version**: 0.5.1-BETA (based on Hexo version 3.1.0)
 - **Compatibility**: Hugo v0.53
 
 ## Features

diff --git a/docs/developer.md b/docs/developer.md
@@ -30,7 +30,7 @@ If you want to report a bug or ask a question, [create an issue](https://github.
 ## General ##
 
 - **Author** : Thibaud Leprêtre
-- **Version** : 0.5.0-BETA (based on Hexo version 3.1.0)
+- **Version** : 0.5.1-BETA (based on Hexo version 3.1.0)
 - **Compatibility** : Hugo v0.53
 
 ## Requirements ##

diff --git a/docs/user.md b/docs/user.md
@@ -61,7 +61,7 @@ If you want to report a bug or ask a question, [create an issue](https://github.
 ## General
 
 - **Authors**: [Thibaud Leprêtre (kakawait)](https://github.com/kakawait) and [Louis Barranqueiro (LouisBarranqueiro)](https://github.com/LouisBarranqueiro)
-- **Version**: 0.5.0-BETA (based on Hexo version 3.1.0)
+- **Version**: 0.5.1-BETA (based on Hexo version 3.1.0)
 - **Compatibility**: Hugo v0.53
 
 ## Features
@@ -354,7 +354,7 @@ E.g to display a shortcut to open algolia search window :
 | Variable | Description |
 |--------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | sidebarBehavior | Define the behavior of the header and sidebar :<ul><li>1: Display extra large sidebar on extra large screen, large sidebar on large screen, medium sidebar on medium screen and header bar on small screen and extra large sidebar is swiped on extra large screen and large sidebar on all lower screens when open button is clicked (default)</li><li>2: Display large sidebar on extra large & large screen, medium sidebar on medium screen and header bar on small screen and large sidebar is swiped when open button is clicked</li><li>3: Display medium sidebar on large and medium screen and header bar on small screen and medium sidebar is swiped when open button is clicked</li><li>4: Display header bar on all screens, extra large sidebar is swiped on extra large screen and large sidebar is swiped on all lower screens</li><li>5: Display header bar on all screens and large sidebar is swiped on large screen</li><li>6: Display header bar on all screens and medium sidebar is swiped</li></ul> |
-| clearReading | Hide sidebar on all article page to let article take full width to improve reading, and enjoy wide images and cover images. Useless if `sidebarBehavior` is equal to `3` or `4`. (true: enable, false: disable). Default behavior : `params.clearReading` value in theme configuration file. |
+| clearReading | Hide sidebar on all page (that is part of [mainSections](https://gohugo.io/functions/where/#mainsections)) to let page take full width to improve reading, and enjoy wide images and cover images. Useless if `sidebarBehavior` is equal to `3` or `4`. (true: enable, false: disable). Default behavior : `params.clearReading` value in theme configuration file. |
 | thumbnailImage | Display thumbnail image of each post on index pages |
 | thumbnailImagePosition | Display thumbnail image at the right of title in index pages (`right`, `left` or `bottom`). Set this value to `right` if you have old posts to keep the old style on them and define `thumbnailImagePosition` on a post to overwrite this setting. (Default: `right`) |
 | autoThumbnailImage | Automatically select the cover image or the first photo from the gallery of a post if there is no thumbnail image as the thumbnail image. Set this value to `true` if you have old posts that use the cover image or the first photo as the thumbnail image and set `autoThumbnailImage` to `false` on a post to overwrite this setting. (Default : `true`) |

diff --git a/exampleSite/config.toml b/exampleSite/config.toml
@@ -1,5 +1,5 @@
 # Tranquilpeak
-# Version : 0.5.0-BETA
+# Version : 0.5.1-BETA
 # Author : Thibaud Leprêtre
 
 # I STRONGLY recommend you to use a CDN to speed up loading of pages.

diff --git a/exampleSite/content/posts/Welcome-to-the-new-Tranquilpeak.md b/exampleSite/content/posts/Welcome-to-the-new-Tranquilpeak.md
@@ -1,5 +1,5 @@
 ---
-title: "Welcome to Tranquilpeak 0.5.0-BETA"
+title: "Welcome to Tranquilpeak 0.5.1-BETA"
 date: 2015-06-15
 categories:
 - tranquilpeak
@@ -24,7 +24,6 @@ Tranquilpeak is a gorgeous responsive theme for Hugo blog framework. It has many
 <!--more-->
 
 ![Tranquilpeak](/img/showcase.png)
-Tranquilpeak is a gorgeous responsive theme for Hugo blog framework. It has many features and integrated services to improve user experience.
 
 {{< toc >}}
 
@@ -58,7 +57,7 @@ How can I migrate my current version? Please read [CHANGELOG.md](https://github.
 ## General
 
 - **Authors**: [Thibaud Leprêtre (kakawait)](https://github.com/kakawait) and [Louis Barranqueiro (LouisBarranqueiro)](https://github.com/LouisBarranqueiro)
-- **Version**: 0.5.0-BETA (based on Hexo version 3.1.0)
+- **Version**: 0.5.1-BETA (based on Hexo version 3.1.0)
 - **Compatibility**: Hugo v0.53
 
 ## Features

diff --git a/layouts/partials/head.html b/layouts/partials/head.html
@@ -1,10 +1,10 @@
-{{- $.Scratch.Set "isPost" false -}}
+{{- $.Scratch.Set "isTypeInMainSections" false -}}
 {{- if .IsPage -}}
-  {{- if eq .Type "posts" -}}
-    {{- $.Scratch.Set "isPost" true -}}
+  {{- if in site.Params.mainSections .Type -}}
+    {{- $.Scratch.Set "isTypeInMainSections" true -}}
   {{- end -}}
 {{- end -}}
-{{- if and (and ($.Scratch.Get "isPost") (lt .Site.Params.sidebarBehavior 3)) (or (and .Site.Params.clearReading (not .Params.clearReading)) .Params.clearReading) -}}
+{{- if and (and ($.Scratch.Get "isTypeInMainSections") (lt .Site.Params.sidebarBehavior 3)) (or (and .Site.Params.clearReading (not .Params.clearReading)) .Params.clearReading) -}}
   {{- .Scratch.Set "sidebarBehavior" (add .Site.Params.sidebarBehavior 3) -}}
 {{- else -}}
   {{- .Scratch.Set "sidebarBehavior" .Site.Params.sidebarBehavior -}}
@@ -48,7 +48,7 @@
     {{ end }}
     <!--EXTERNAL STYLES END-->
     <!--STYLES-->
-    <link rel="stylesheet" href="{{ "css/style-x4v5aep1xln8tw4u8b4utrzzm45rcnnq6emr4myqn5eka2yri56y1t7q.min.css" | absURL }}" />
+    <link rel="stylesheet" href="{{ "css/style-2w2urpokyukbsouppglitcyxngrsa0pcm58rrm5mqo3ieqo6bkvr3cz9nvf.min.css" | absURL }}" />
     <!--STYLES END-->
     {{ range .Site.Params.customCSS }}
       {{ if isset . "href" }}

diff --git a/layouts/partials/meta.html b/layouts/partials/meta.html
@@ -1,7 +1,7 @@
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="generator" content="Hugo {{ hugo.Version }} with theme Tranquilpeak 0.5.0-BETA">
+<meta name="generator" content="Hugo {{ hugo.Version }} with theme Tranquilpeak 0.5.1-BETA">
 <meta name="author" content="{{ .Site.Author.name }}">
 <meta name="keywords" content="{{ with .Keywords }}{{ delimit . ", " }}{{ end }}{{ if .Site.Params.keywords }}, {{ delimit .Site.Params.keywords ", " }}{{ end }}">
 <meta name="description" content="{{ if .Description }}{{ .Description }}{{ else if .IsPage }}{{ .Summary }}{{ else }}{{ .Site.Params.description }}{{ end }}">

diff --git a/layouts/partials/post/gallery.html b/layouts/partials/post/gallery.html
@@ -13,7 +13,7 @@
           {{ $imageLength := len $image }}
           <div class="photo-box">
             <a class="photo-box-inner fancybox" 
-               data-fancybox-group="gallery-{{ $.File.UniqueID }}"
+               data-fancybox="gallery-{{ $.File.UniqueID }}"
                data-caption="{{ if gt $imageLength 2 }}{{ index $image 2 }}{{ else }}{{ index $image 1 }}{{ end }}"
                title="{{ if gt $imageLength 2 }}{{ index $image 2 }}{{ else }}{{ index $image 1 }}{{ end }}" 
                href="{{ index $image 0 }}"

diff --git a/layouts/shortcodes/image.html b/layouts/shortcodes/image.html
@@ -21,7 +21,7 @@
 {{ end }}
 <div class="figure {{ delimit ($.Scratch.Get "i-classes") " " }}" {{ with (.Get "thumbnailWidth") }}style="width:{{ . }};"{{ end }}>
   {{ if eq ($.Scratch.Get "i-fancybox") 1 }}
-    <a class="fancybox" href="{{ .Get "src" }}"{{ with (.Get "title") }} title="{{ . }}"{{ end }} data-fancybox-group="{{ with (.Get "group") }}{{ . }}{{ end }}">
+    <a class="fancybox" href="{{ .Get "src" }}"{{ with (.Get "title") }} title="{{ . }}"{{ end }} data-fancybox="{{ with (.Get "group") }}{{ . }}{{ end }}">
   {{ end }}
     <img class="fig-img" src="{{ with (.Get "thumbnail") }}{{ . }}{{ else }}{{ .Get "src" }}{{ end }}" {{ if or (.Get "thumbnail-width") (.Get "thumbnail-height") }}style="{{ with (.Get "thumbnail-width") }}width: {{ . }};{{ end }}{{ with (.Get "thumbnail-height") }}height: {{ . }};{{ end }}"{{ end }}{{ with (.Get "title") }} alt="{{ . }}"{{ end }}>
   {{ if eq ($.Scratch.Get "i-fancybox") 1 }}

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hugo-tranquilpeak-theme",
-  "version": "0.5.0-BETA",
+  "version": "0.5.1-BETA",
   "description": "A gorgeous responsive theme for Hugo blog framework",
   "main": "Gruntfile.js",
   "scripts": {

diff --git a/src/scss/utils/_fonts.scss b/src/scss/utils/_fonts.scss
@@ -12,7 +12,7 @@
     src:         local('Open Sans Bold'), local('OpenSans-Bold'), url(https://fonts.gstatic.com/s/opensans/v10/k3k702ZOKiLJc3WVjuplzJS3E-kSBmtLoNJPDtbj2Pk.ttf) format('truetype');
 }
 
-@font-face {
+/*@font-face {
     font-family: 'Merriweather';
     font-style:  normal;
     font-weight: 300;
@@ -45,4 +45,6 @@
     font-style:  italic;
     font-weight: 700;
     src:         local('Merriweather Bold Italic'), local('Merriweather-BoldItalic'), url(https://fonts.gstatic.com/s/merriweather/v8/EYh7Vl4ywhowqULgRdYwII1kRdeHIFWYEsp6A2f99b0.ttf) format('truetype');
-}
+}*/
+
+@import url('https://fonts.googleapis.com/css2?family=Merriweather:ital,wght@0,300;0,400;0,700;1,300;1,700&display=swap'); 
diff --git a/static/css/style-2w2urpokyukbsouppglitcyxngrsa0pcm58rrm5mqo3ieqo6bkvr3cz9nvf.min.css b/static/css/style-2w2urpokyukbsouppglitcyxngrsa0pcm58rrm5mqo3ieqo6bkvr3cz9nvf.min.css
diff --git a/static/css/style-x4v5aep1xln8tw4u8b4utrzzm45rcnnq6emr4myqn5eka2yri56y1t7q.min.css b/static/css/style-x4v5aep1xln8tw4u8b4utrzzm45rcnnq6emr4myqn5eka2yri56y1t7q.min.css