diff options
author | Thibaud Lepretre <thibaud.lepretre@gmail.com> | 2019-07-04 16:01:16 +0300 |
---|---|---|
committer | Thibaud Lepretre <thibaud.lepretre@gmail.com> | 2021-08-11 15:02:36 +0300 |
commit | 33930d6adc3476c358acf25d69d2c4cfee7201cb (patch) | |
tree | 22815535fe4fbe66e5391338f10b637e25116055 /layouts | |
parent | 16763796503454e9cd666e0c644f079c1f0df96d (diff) |
Sync from 1cafcb39c8a101893ae30f92a0a789e2c1d8b85b
- [x] SCSS
- [x] JS
- [x] i18n files
- [x] HTML
- [x] gitalk
- [x] FontAwesome 5
- [ ] Docs
Fixes #287
Diffstat (limited to 'layouts')
-rw-r--r-- | layouts/_default/single.html | 4 | ||||
-rw-r--r-- | layouts/_default/summary.html | 24 | ||||
-rw-r--r-- | layouts/partials/about.html | 4 | ||||
-rw-r--r-- | layouts/partials/head.html | 1 | ||||
-rw-r--r-- | layouts/partials/header.html | 6 | ||||
-rw-r--r-- | layouts/partials/menu.html | 4 | ||||
-rw-r--r-- | layouts/partials/pagination.html | 8 | ||||
-rw-r--r-- | layouts/partials/post/actions.html | 22 | ||||
-rw-r--r-- | layouts/partials/post/gallery.html | 15 | ||||
-rw-r--r-- | layouts/partials/post/header.html | 4 | ||||
-rw-r--r-- | layouts/partials/post/meta.html | 2 | ||||
-rw-r--r-- | layouts/partials/post/share-options.html | 10 | ||||
-rw-r--r-- | layouts/partials/schema.html | 56 | ||||
-rw-r--r-- | layouts/partials/script.html | 2 | ||||
-rw-r--r-- | layouts/partials/search.html | 2 | ||||
-rw-r--r-- | layouts/partials/sidebar.html | 2 |
16 files changed, 116 insertions, 50 deletions
diff --git a/layouts/_default/single.html b/layouts/_default/single.html index a9a90d0..e8d4c34 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -8,14 +8,14 @@ class="{{ with .Params.coverimage }}hasCover{{ end }} {{ if eq .Params.covermeta "out" }}hasCoverMetaOut{{ else }}hasCoverMetaIn{{ end }} {{ with .Params.coverCaption }}hasCoverCaption{{ end }}"> - <article class="post" itemscope itemType="http://schema.org/BlogPosting"> + <article class="post"> {{ with .Params.covercaption }} <span class="post-header-cover-caption caption">{{ . | markdownify }}</span> {{ end }} {{ if or (not .Params.coverimage) (eq .Params.covermeta "out") }} {{ partial "post/header.html" . }} {{ end }} - <div class="post-content markdown" itemprop="articleBody"> + <div class="post-content markdown"> <div class="main-content-wrap"> {{ (replaceRE "<!--\\s*[t|T][o|O][c|C]\\s*-->" (printf "<h1 id=\"table-of-contents\">%s</h1>%s" (i18n "post.toc") .TableOfContents) .Content) | safeHTML }} {{ partial "post/gallery.html" . }} diff --git a/layouts/_default/summary.html b/layouts/_default/summary.html index 4a0ee91..1981b67 100644 --- a/layouts/_default/summary.html +++ b/layouts/_default/summary.html @@ -22,32 +22,32 @@ {{ else }} {{ .Scratch.Set "thumbnailImagePosition" "bottom" }} {{ end }} -<article class="postShorten postShorten--thumbnailimg-{{ .Scratch.Get "thumbnailImagePosition" }}" itemscope itemType="http://schema.org/BlogPosting"> +<article class="postShorten postShorten--thumbnailimg-{{ .Scratch.Get "thumbnailImagePosition" }}"> <div class="postShorten-wrap"> {{ if and (.Scratch.Get "thumbnailImage") (eq (.Scratch.Get "thumbnailImagePosition") "top")}} {{ with .Params.link }} - <a href="{{ . | absURL }}" target="_blank"> + <a href="{{ . | absURL }}" aria-label="{{ if i18n "global.open_post" }}{{ i18n "global.open_post" }}: {{ .Title }}{{ end }}" target="_blank"> {{ else }} - <a href="{{ $.Permalink }}"> + <a href="{{ .Permalink }}" aria-label="{{ if i18n "global.open_post" }}{{ i18n "global.open_post" }}: {{ .Title }}{{ end }}"> {{ end }} <div class="postShorten-thumbnailimg"> - <img alt="" itemprop="image" src="{{ .Scratch.Get "thumbnailImage" }}"/> + <img alt="" src="{{ .Scratch.Get "thumbnailImage" }}"/> </div> </a> {{ end }} <div class="postShorten-header"> - <h1 class="postShorten-title" itemprop="headline"> + <h1 class="postShorten-title"> {{ with .Params.link }} - <a class="link-unstyled" href="{{ . | absURL }}" target="_blank"> + <a class="link-unstyled" href="{{ . | absURL }}" aria-label="{{ if i18n "global.open_post" }}{{ i18n "global.open_post" }}: {{ .Title }}{{ end }}" target="_blank"> {{ else }} - <a class="link-unstyled" href="{{ $.Permalink }}"> + <a class="link-unstyled" href="{{ .Permalink }}" aria-label="{{ if i18n "global.open_post" }}{{ i18n "global.open_post" }}: {{ .Title }}{{ end }}"> {{ end }} {{ .Title }} </a> </h1> {{ partial "post/meta" . }} </div> - <div class="postShorten-excerpt" itemprop="articleBody"> + <div class="postShorten-excerpt"> {{ if .Params.Summary }} {{ .Params.Summary | markdownify }} {{ else }} @@ -55,9 +55,9 @@ {{ end }} <p> {{ with .Params.link }} - <a href="{{ . | absURL }}" class="postShorten-excerpt_link link" target="_blank">{{ i18n "post.read_more" }}</a> + <a href="{{ . | absURL }}" class="postShorten-excerpt_link link" aria-label="{{ if i18n "global.open_post" }}{{ i18n "global.open_post" }}: {{ .Title }}{{ end }}"> target="_blank">{{ i18n "post.read_more" }}</a> {{ else }} - <a href="{{ $.Permalink }}" class="postShorten-excerpt_link link">{{ i18n "post.read_more" }}</a> + <a href="{{ .Permalink }}" class="postShorten-excerpt_link link" aria-label="{{ if i18n "global.open_post" }}{{ i18n "global.open_post" }}: {{ .Title }}{{ end }}">{{ i18n "post.read_more" }}</a> {{ end }} {{ with .Params.readingtime }} <span class="postShorten-readingtime"> @@ -68,9 +68,9 @@ </div> </div> {{ if and (.Scratch.Get "thumbnailImage") (ne (.Scratch.Get "thumbnailImagePosition") "top")}} - <a href="{{ .Permalink }}"> + <a href="{{ .Permalink }}" aria-label="{{ if i18n "global.open_post" }}{{ i18n "global.open_post" }}: {{ .Title }}{{ end }}"> <div class="postShorten-thumbnailimg"> - <img alt="" itemprop="image" src="{{ .Scratch.Get "thumbnailImage" }}"/> + <img alt="" src="{{ .Scratch.Get "thumbnailImage" }}"/> </div> </a> {{ end }} diff --git a/layouts/partials/about.html b/layouts/partials/about.html index 406fb17..411781e 100644 --- a/layouts/partials/about.html +++ b/layouts/partials/about.html @@ -1,7 +1,7 @@ <div id="about"> <div id="about-card"> <div id="about-btn-close"> - <i class="fa fa-remove"></i> + <i class="fa fa-times"></i> </div> {{ with ($.Scratch.Get "authorPicture") }} <img id="about-card-picture" src="{{ . }}{{ if in . "//www.gravatar.com/avatar/" }}?s=110{{ end }}" alt="{{ i18n "global.author_picture" }}" /> @@ -19,7 +19,7 @@ {{ end }} {{ with .Site.Author.location }} <div id="about-card-location"> - <i class="fa fa-map-marker"></i> + <i class="fa fa-map-marker-alt"></i> <br/> {{ . }} </div> diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 4b91049..7334277 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -25,6 +25,7 @@ <html lang="{{ .Site.LanguageCode }}"> <head> {{ partial "head_start.html" . }} + {{ partial "schema.html" . }} {{ partial "meta.html" . }} <title>{{ with .Title }}{{ . }}{{ else }}{{ .Site.Title }}{{ end }}</title> diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 86c363e..8c9f987 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -1,15 +1,15 @@ <header id="header" data-behavior="{{ .Scratch.Get "sidebarBehavior" }}"> <i id="btn-open-sidebar" class="fa fa-lg fa-bars"></i> <div class="header-title"> - <a class="header-title-link" href="{{ "/" | relLangURL }}">{{ .Site.Title }}</a> + <a class="header-title-link" href="{{ "/" | relLangURL }}" aria-label="{{ if i18n "global.go_to_homepage" }}{{ i18n "global.go_to_homepage" }}{{ end }}">{{ .Site.Title }}</a> </div> {{ with .Site.Params.header.rightLink }} {{ if and (in .url ":") (not (in .url (printf "%s" $.Site.BaseURL))) }} <a class="{{ if .icon }}header-right-icon {{ else }}header-right-picture {{ end }}{{ with .class }}{{ . }}{{ end }}" - href="{{ .url | safeURL }}" target="_blank" rel="noopener"> + href="{{ .url | safeURL }}" target="_blank" rel="noopener" aria-label="{{ if i18n "global.open_link" }}{{ i18n "global.open_link" }}: {{ .url | safeURL }}{{ end }}"> {{ else if .url }} <a class="{{ if .icon }}header-right-icon {{ else }}header-right-picture {{ end }}{{ with .class }}{{ . }}{{ end }}" - href="{{ .url | safeURL }}"> + href="{{ .url | safeURL }}" aria-label="{{ if i18n "global.open_link" }}{{ i18n "global.open_link" }}: {{ .url | safeURL }}{{ end }}"> {{ end }} {{ if .icon }} <i class="fa fa-lg fa-{{ .icon }}"></i> diff --git a/layouts/partials/menu.html b/layouts/partials/menu.html index 14cff57..2ba9797 100644 --- a/layouts/partials/menu.html +++ b/layouts/partials/menu.html @@ -1,9 +1,9 @@ {{ range .menu }} <li class="sidebar-button"> {{ if and (or (in .URL "://") (in .URL "mailto:") (in .URL "tel:") (in .URL "callto:") (in .URL "skype:")) (not (in .URL (printf "%s" $.root.Site.BaseURL))) }} - <a class="sidebar-button-link {{ if eq .Identifier "search" }}open-algolia-search{{ end }}" href="{{ .URL | safeURL }}" target="_blank" rel="noopener"> + <a class="sidebar-button-link {{ if eq .Identifier "search" }}open-algolia-search{{ end }}" href="{{ .URL | safeURL }}" target="_blank" rel="noopener" title="{{ .Name }}"> {{ else }} - <a class="sidebar-button-link {{ if eq .Identifier "search" }}open-algolia-search{{ end }}" href="{{ .URL | relLangURL }}"> + <a class="sidebar-button-link {{ if eq .Identifier "search" }}open-algolia-search{{ end }}" href="{{ .URL | relLangURL }}" title="{{ .Name }}"> {{ end }} {{ .Pre }} {{ $name := (i18n (printf "global.%s" .Identifier)) }} diff --git a/layouts/partials/pagination.html b/layouts/partials/pagination.html index 8677695..36a7950 100644 --- a/layouts/partials/pagination.html +++ b/layouts/partials/pagination.html @@ -4,7 +4,7 @@ {{ if .Site.Params.swapPaginator }} {{ if .Paginator.HasPrev }} <li class="pagination-prev"> - <a class="btn btn--default btn--small" href="{{ .Paginator.Prev.URL }}"> + <a class="btn btn--default btn--small" href="{{ .Paginator.Prev.URL }}" aria-label="{{ i18n "pagination.older_posts" }}"> <i class="fa fa-angle-left text-base icon-mr"></i> <span>{{ i18n "pagination.older_posts" }}</span> </a> @@ -12,7 +12,7 @@ {{ end }} {{ if .Paginator.HasNext }} <li class="pagination-next"> - <a class="btn btn--default btn--small" href="{{ .Paginator.Next.URL }}"> + <a class="btn btn--default btn--small" href="{{ .Paginator.Next.URL }}" aria-label="{{ i18n "pagination.newer_posts" }}"> <span>{{ i18n "pagination.newer_posts" }}</span> <i class="fa fa-angle-right text-base icon-ml"></i> </a> @@ -21,7 +21,7 @@ {{ else }} {{ if .Paginator.HasPrev }} <li class="pagination-prev"> - <a class="btn btn--default btn--small" href="{{ .Paginator.Prev.URL }}"> + <a class="btn btn--default btn--small" href="{{ .Paginator.Prev.URL }}" aria-label="{{ i18n "pagination.newer_posts" }}"> <i class="fa fa-angle-left text-base icon-mr"></i> <span>{{ i18n "pagination.newer_posts" }}</span> </a> @@ -29,7 +29,7 @@ {{ end }} {{ if .Paginator.HasNext }} <li class="pagination-next"> - <a class="btn btn--default btn--small" href="{{ .Paginator.Next.URL }}"> + <a class="btn btn--default btn--small" href="{{ .Paginator.Next.URL }}" aria-label="{{ i18n "pagination.older_posts" }}"> <span>{{ i18n "pagination.older_posts" }}</span> <i class="fa fa-angle-right text-base icon-ml"></i> </a> diff --git a/layouts/partials/post/actions.html b/layouts/partials/post/actions.html index 3a62ffa..909e9c4 100644 --- a/layouts/partials/post/actions.html +++ b/layouts/partials/post/actions.html @@ -5,7 +5,7 @@ {{ if .Site.Params.swapPaginator }} <li class="post-action"> {{ with .PrevInSection }} - <a class="post-action-btn btn btn--default tooltip--top" href="{{ .RelPermalink }}" data-tooltip="{{ .Title }}"> + <a class="post-action-btn btn btn--default tooltip--top" href="{{ .RelPermalink }}" data-tooltip="{{ .Title }}" aria-label="{{ i18n "pagination.previous" }}: {{ .Title }}"> {{ else }} <a class="post-action-btn btn btn--disabled"> {{ end }} @@ -15,7 +15,7 @@ </li> <li class="post-action"> {{ with .NextInSection }} - <a class="post-action-btn btn btn--default tooltip--top" href="{{ .RelPermalink }}" data-tooltip="{{ .Title }}"> + <a class="post-action-btn btn btn--default tooltip--top" href="{{ .RelPermalink }}" data-tooltip="{{ .Title }}" aria-label="{{ i18n "pagination.next" }}: {{ .Title }}"> {{ else }} <a class="post-action-btn btn btn--disabled"> {{ end }} @@ -26,7 +26,7 @@ {{ else }} <li class="post-action"> {{ with .NextInSection }} - <a class="post-action-btn btn btn--default tooltip--top" href="{{ .RelPermalink }}" data-tooltip="{{ .Title }}"> + <a class="post-action-btn btn btn--default tooltip--top" href="{{ .RelPermalink }}" data-tooltip="{{ .Title }}" aria-label="{{ i18n "pagination.next" }}: {{ .Title }}"> {{ else }} <a class="post-action-btn btn btn--disabled"> {{ end }} @@ -36,7 +36,7 @@ </li> <li class="post-action"> {{ with .PrevInSection }} - <a class="post-action-btn btn btn--default tooltip--top" href="{{ .RelPermalink }}" data-tooltip="{{ .Title }}"> + <a class="post-action-btn btn btn--default tooltip--top" href="{{ .RelPermalink }}" data-tooltip="{{ .Title }}" aria-label="{{ i18n "pagination.previous" }}: {{ .Title }}"> {{ else }} <a class="post-action-btn btn btn--disabled"> {{ end }} @@ -50,14 +50,14 @@ <ul class="post-actions post-action-share" > {{ if (not (eq .Params.showSocial false)) }} <li class="post-action hide-lg hide-md hide-sm"> - <a class="post-action-btn btn btn--default btn-open-shareoptions" href="#btn-open-shareoptions"> - <i class="fa fa-share-alt"></i> + <a class="post-action-btn btn btn--default btn-open-shareoptions" href="#btn-open-shareoptions" aria-label="{{ i18n "post.share" }}"> + <i class="fa fa-share-alt" aria-hidden="true"></i> </a> </li> {{ range .Site.Params.sharingOptions }} <li class="post-action hide-xs"> - <a class="post-action-btn btn btn--default" target="new" href="{{ printf .url $.Permalink }}"> - <i class="fa {{ .icon }}"></i> + <a class="post-action-btn btn btn--default" target="new" href="{{ printf .url $.Permalink }}" title="{{ i18n "global.share_on" }} {{ .name }}" aria-label="{{ i18n "global.share_on" }} {{ .name }}"> + <i class="fa {{ .icon }}" aria-hidden="true"></i> </a> </li> {{ end }} @@ -71,11 +71,11 @@ {{ end }} <li class="post-action"> {{ if findRE "<!--\\s*[t|T][o|O][c|C]\\s*-->" .Content }} - <a class="post-action-btn btn btn--default" href="#table-of-contents"> + <a class="post-action-btn btn btn--default" href="#table-of-contents" aria-label="{{ i18n "post.toc" }}"> {{ else }} - <a class="post-action-btn btn btn--default" href="#"> + <a class="post-action-btn btn btn--default" href="#" aria-label="{{ i18n "post.back_to_top" }}"> {{ end }} - <i class="fa fa-list"></i> + <i class="fa fa-list" aria-hidden="true"></i> </a> </li> </ul> diff --git a/layouts/partials/post/gallery.html b/layouts/partials/post/gallery.html index 95d92d5..8ec52e5 100644 --- a/layouts/partials/post/gallery.html +++ b/layouts/partials/post/gallery.html @@ -1,19 +1,26 @@ +{{ $GALLERY_IMAGES_DISPLAYED_LIMIT := 3 }} {{ if and .Site.Params.imageGallery .Params.gallery }} {{ $galleryLength := len .Params.gallery }} {{ $imageGalleryClass := "" }} {{ if gt $galleryLength 0 }} <div class="image-gallery"> <div class="image-gallery-metabar"> - <span>Gallery {{ $galleryLength }} images</span> + <span>{{ i18n "post.gallery"}} {{ if gt $galleryLength 1 }}{{ replace (i18n "post.image.other") "{n}" $galleryLength }}{{ else }}{{ i18n "post.image.one" }}{{ end }}</span> </div> <div class="image-gallery-photos {{ if gt $galleryLength 2 }}image-gallery-photos--thumbnail{{ end }}"> {{ range $index, $element := .Params.gallery }} {{ $image := (split $element " ") }} {{ $imageLength := len $image }} <div class="photo-box"> - <a class="photo-box-inner fancybox" data-fancybox-group="gallery-{{ $.File.UniqueID }}" - title="{{ if gt $imageLength 2 }}{{ index $image 2 }}{{ else }}{{ index $image 1 }}{{ end }}" href="{{ index $image 0 }}"> - <img class="photo" src="{{ if gt $imageLength 2 }}{{ index $image 1 }}{{ else }}{{ index $image 0 }}{{ end }}" itemprop="image"> + <a class="photo-box-inner fancybox" + data-fancybox-group="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 }}" + aria-label="{{ i18n "global.zoom_in_on_picture" }}"> + {{ if lt $index $GALLERY_IMAGES_DISPLAYED_LIMIT }} + <img class="photo" src="{{ if gt $imageLength 2 }}{{ index $image 1 }}{{ else }}{{ index $image 0 }}{{ end }}"> + {{ end }} </a> </div> {{ end }} diff --git a/layouts/partials/post/header.html b/layouts/partials/post/header.html index a6226c8..30937d3 100644 --- a/layouts/partials/post/header.html +++ b/layouts/partials/post/header.html @@ -1,12 +1,12 @@ <div class="post-header main-content-wrap {{ if $.Params.metaalignment }}text-{{ $.Params.metaalignment }}{{ else }}text-left{{ end }}"> {{ with $.Params.link }} <h1 itemprop="headline"> - <a class="link" href="{{ . | absURL }}" target="_blank" itemprop="url"> + <a class="link" href="{{ . | absURL }}" target="_blank" rel="noopener" aria-label="{{ i18n "global.open_link"}}: {{ . | absURL }}"> {{ $.Title }} </a> </h1> {{ else }} - <h1 class="post-title" itemprop="headline"> + <h1 class="post-title"> {{ $.Title }} </h1> {{ end }} diff --git a/layouts/partials/post/meta.html b/layouts/partials/post/meta.html index d143721..01408b1 100644 --- a/layouts/partials/post/meta.html +++ b/layouts/partials/post/meta.html @@ -1,7 +1,7 @@ {{ if not (eq .Params.showMeta false) }} <div class="postShorten-meta post-meta"> {{ if not (eq .Params.showDate false) }} - <time itemprop="datePublished" datetime="{{ .Date.Format "2006-01-02T15:04:05Z07:00" }}"> + <time datetime="{{ .Date.Format "2006-01-02T15:04:05Z07:00" }}"> {{ partial "internal/date.html" . }} </time> {{ end }} diff --git a/layouts/partials/post/share-options.html b/layouts/partials/post/share-options.html index 871f3c2..061e59f 100644 --- a/layouts/partials/post/share-options.html +++ b/layouts/partials/post/share-options.html @@ -1,13 +1,15 @@ +{{ if .Site.Params.sharingOptions }} <div id="share-options-bar" class="share-options-bar" data-behavior="{{ .Scratch.Get "sidebarBehavior" }}"> - <i id="btn-close-shareoptions" class="fa fa-close"></i> + <i id="btn-close-shareoptions" class="fa fa-times"></i> <ul class="share-options"> {{ range .Site.Params.sharingOptions }} <li class="share-option"> - <a class="share-option-btn" target="new" href="{{ printf .url (substr (querify "x" $.Permalink) 2) }}"> - <i class="fa {{ .icon }}"></i><span>{{ printf (i18n "global.share_on") .name }}</span> + <a class="share-option-btn" target="new" href="{{ printf .url (substr (querify "x" $.Permalink) 2) }}" aria-label="{{ i18n "global.share_on" }} {{ .name }}"> + <i class="fa {{ .icon }}" aria-hidden="true"></i><span>{{ printf (i18n "global.share_on") .name }}</span> </a> </li> {{ end }} </ul> </div> -<div id="share-options-mask" class="share-options-mask"></div>
\ No newline at end of file +<div id="share-options-mask" class="share-options-mask"></div> +{{ end }}
\ No newline at end of file diff --git a/layouts/partials/schema.html b/layouts/partials/schema.html new file mode 100644 index 0000000..d169fb0 --- /dev/null +++ b/layouts/partials/schema.html @@ -0,0 +1,56 @@ +<script type="application/ld+json"> +{{ if eq .Section "posts" }} +{ + "@context": "https://schema.org", + "@type": "BlogPosting", + "headline": {{ .Title }}, + {{ if .Params.coverimage }} + "image": {{ .Params.coverImage | absURL }}, + {{ else if .Params.thumbnailImage }} + "image": {{ .Params.thumbnailImage | absURL }}, + {{ end }} + "datePublished": {{ .PublishDate }}, + "dateModified": {{ .Lastmod }}, + "author": { + "@type": "Person", + "name": {{ .Site.Author.name }}, + {{ with ($.Scratch.Get "authorPicture") }} + "image": {{ . }} + {{ end }} + }, + "mainEntityOfPage": { + "@type": "WebPage", + "@id": "{{ .Permalink }}" + }, + "publisher": { + "@type": "Organization", + "name": {{ .Site.Title }}, + {{ with ($.Scratch.Get "authorPicture") }} + "logo": { + "@type": "ImageObject", + "url": {{ . }} + } + {{ end }} + }, + "description": {{ .Summary | plainify | safeHTML }}, + "keywords": [{{ with .Keywords }}{{ delimit . ", " }}{{ end }}{{ if .Site.Params.keywords }}, {{ delimit .Site.Params.keywords ", " }}{{ end }}] +} +{{ else }} +{ + "@context":"http://schema.org", + "@type":"Website", + "@id":"{{ .Site.BaseURL }}", + "author": { + "@type": "Person", + "name": {{ .Site.Author.name }}, + {{ with ($.Scratch.Get "authorPicture") }} + "image": {{ . }} + {{ end }} + }, + "name":"{{ .Site.Title }}", + "description":"{{ if .Description }}{{ .Description }}{{ else if .IsPage }}{{ .Summary }}{{ else }}{{ .Site.Params.description }}{{ end }}", + "url":"{{ .Permalink }}", + "keywords":"[{{ with .Keywords }}{{ delimit . ", " }}{{ end }}{{ if .Site.Params.keywords }}, {{ delimit .Site.Params.keywords ", " }}{{ end }}]" +} +{{ end }} +</script>
\ No newline at end of file diff --git a/layouts/partials/script.html b/layouts/partials/script.html index 355befb..a7cd608 100644 --- a/layouts/partials/script.html +++ b/layouts/partials/script.html @@ -34,7 +34,7 @@ $(document).ready(function() { {{ if not (eq .Params.comments false) }} {{ if .Site.DisqusShortname }} <script> - var disqus_config = function () { + var disqus_config = function() { this.page.url = '{{ .Permalink }}'; {{ if .Params.disqusIdentifier }} this.page.identifier = '{{ .Params.disqusIdentifier }}'; diff --git a/layouts/partials/search.html b/layouts/partials/search.html index 5e2b38c..5f49a64 100644 --- a/layouts/partials/search.html +++ b/layouts/partials/search.html @@ -2,7 +2,7 @@ <div id="algolia-search-modal" class="modal-container"> <div class="modal"> <div class="modal-header"> - <span class="close-button"><i class="fa fa-close"></i></span> + <span class="close-button"><i class="fa fa-times"></i></span> <a href="https://algolia.com" target="_blank" rel="noopener" class="searchby-algolia text-color-light link-unstyled"> <span class="searchby-algolia-text text-color-light text-small">by</span> <img class="searchby-algolia-logo" src="https://www.algolia.com/static_assets/images/press/downloads/algolia-light.svg"> diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html index ef0f6f9..dac5dcc 100644 --- a/layouts/partials/sidebar.html +++ b/layouts/partials/sidebar.html @@ -2,7 +2,7 @@ <div class="sidebar-container"> {{ with ($.Scratch.Get "authorPicture") }} <div class="sidebar-profile"> - <a href="{{ if $.Site.Params.sidebar.profile.url }}{{ $.Site.Params.sidebar.profile.url }}{{ else }}{{ "/#about" }}{{ end }}"> + <a href="{{ if $.Site.Params.sidebar.profile.url }}{{ $.Site.Params.sidebar.profile.url }}{{ else }}{{ "/#about" }}{{ end }}" aria-label="{{ i18n "global.read_more_about_author"}}"> <img class="sidebar-profile-picture" src="{{ . }}{{ if in . "//www.gravatar.com/avatar/" }}?s=110{{ end }}" alt="{{ i18n "global.author_picture" }}" /> </a> <h4 class="sidebar-profile-name">{{ $.Site.Author.name }}</h4> |