From daeffaf258c9ccdec41bcd8ff9fc0495734355b3 Mon Sep 17 00:00:00 2001 From: Paolo Mainardi Date: Sun, 16 Feb 2020 23:11:47 +0100 Subject: [PATCH 01/11] Ensure text remains visible during webfont load (#269) * Ensure text remains visible during webfont load As specified here: https://web.dev/font-display/?utm_source=lighthouse&utm_medium=unknown#google-fonts * Update CONTRIBUTORS.md --- CONTRIBUTORS.md | 1 + layouts/_default/baseof.html | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 8873dc6..d57bfe2 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -57,3 +57,4 @@ - [Michael Lynch](https://github.com/mtlynch) - [FIGBERT](https://figbert.com/) - [Yash Mehrotra](https://yashmehrotra.com) +- [Paolo Mainardi](https://paolomainardi.com) diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index a497e5d..2c6f232 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -21,7 +21,7 @@ {{ end }} - + From fb2dc89b45b4ba61f6d66cca4c8f3062b4e94314 Mon Sep 17 00:00:00 2001 From: voroskoi <60064214+voroskoi@users.noreply.github.com> Date: Thu, 20 Feb 2020 14:17:11 +0100 Subject: [PATCH 02/11] Justify (#267) * Paragraph style changes Add text-align: justify to make text justified. Add text-justify: auto, so the browser can decide if inter-word or inter-character space is adjusted. Add hyphens: auto, so browser can hyphenate words. * Regenerate scss files --- assets/scss/_content.scss | 5 +++++ .../scss/coder.scss_5e1eb8e37c42cdfb6215b61e44dcfa5f.content | 2 +- .../scss/coder.scss_5e1eb8e37c42cdfb6215b61e44dcfa5f.json | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/assets/scss/_content.scss b/assets/scss/_content.scss index 33193ed..1f95356 100644 --- a/assets/scss/_content.scss +++ b/assets/scss/_content.scss @@ -26,6 +26,11 @@ } } } + p { + text-align: justify; + text-justify: auto; + hyphens: auto; + } } .post { .post-title { diff --git a/resources/_gen/assets/scss/scss/coder.scss_5e1eb8e37c42cdfb6215b61e44dcfa5f.content b/resources/_gen/assets/scss/scss/coder.scss_5e1eb8e37c42cdfb6215b61e44dcfa5f.content index f6481e4..727cd38 100644 --- a/resources/_gen/assets/scss/scss/coder.scss_5e1eb8e37c42cdfb6215b61e44dcfa5f.content +++ b/resources/_gen/assets/scss/scss/coder.scss_5e1eb8e37c42cdfb6215b61e44dcfa5f.content @@ -1 +1 @@ -*,*:after,*:before{box-sizing:inherit}html{box-sizing:border-box;font-size:62.5%}body{color:#212121;background-color:#fafafa;font-family:Merriweather,Georgia,serif;font-size:1.6em;font-weight:300;line-height:1.8em}@media only screen and (max-width:768px){body{font-size:1.6em;line-height:1.6em}}a{font-weight:300;color:#1565c0;text-decoration:none}a:focus,a:hover{text-decoration:underline}p{margin:2rem 0}h1,h2,h3,h4,h5,h6{font-family:Lato,Helvetica,sans-serif;font-weight:700;color:#000;margin:6.4rem 0 3.2rem}h1{font-size:3.2rem;line-height:3.6rem}@media only screen and (max-width:768px){h1{font-size:3rem;line-height:3.4rem}}h2{font-size:2.8rem;line-height:3.2rem}@media only screen and (max-width:768px){h2{font-size:2.6rem;line-height:3rem}}h3{font-size:2.4rem;line-height:2.8rem}@media only screen and (max-width:768px){h3{font-size:2.2rem;line-height:2.6rem}}h4{font-size:2.2rem;line-height:2.6rem}@media only screen and (max-width:768px){h4{font-size:2rem;line-height:2.4rem}}h5{font-size:2rem;line-height:2.4rem}@media only screen and (max-width:768px){h5{font-size:1.8rem;line-height:2.2rem}}h6{font-size:1.8rem;line-height:2.2rem}@media only screen and (max-width:768px){h6{font-size:1.6rem;line-height:2rem}}b,strong{font-weight:700}.highlight>div,.highlight>pre{margin:0 0 2rem;padding:1rem;border-radius:1rem}pre{display:block;font-family:source code pro,lucida console,monospace;font-size:1.6rem;font-weight:400;line-height:2.6rem;overflow-x:auto;margin:0}pre code{display:inline-block;background-color:inherit;color:inherit}code{font-family:source code pro,lucida console,monospace;font-size:1.6rem;font-weight:400;background-color:#e0e0e0;color:#212121}blockquote{border-left:2px solid #e0e0e0;padding-left:2rem;line-height:2.2rem;font-weight:400;font-style:italic}th,td{padding:1.6rem}table{border-collapse:collapse}table td,table th{border:2px solid #000}table tr:first-child th{border-top:0}table tr:last-child td{border-bottom:0}table tr td:first-child,table tr th:first-child{border-left:0}table tr td:last-child,table tr th:last-child{border-right:0}img{max-width:100%}figure{text-align:center}.wrapper{display:flex;flex-direction:column;min-height:100vh;width:100%}.container{margin:0 auto;max-width:90rem;width:100%;padding-left:2rem;padding-right:2rem}.fab{font-weight:400}.fas{font-weight:700}.float-right{float:right}.float-left{float:left}.fab{font-weight:400}.fas{font-weight:900}.content{flex:1;display:flex;margin-top:1.6rem;margin-bottom:3.2rem}.content article header{margin-top:6.4rem;margin-bottom:3.2rem}.content article header h1{font-size:4.2rem;line-height:4.6rem;margin:0}@media only screen and (max-width:768px){.content article header h1{font-size:4rem;line-height:4.4rem}}.content article footer{margin-top:4rem}.content article footer .see-also{margin:3.2rem 0}.content article footer .see-also h3{margin:3.2rem 0}.content .post .post-title{margin-bottom:.75em}.content .post .post-meta i{text-align:center;width:1.6rem;margin-left:0;margin-right:.5rem}.content .post .post-meta .date .posted-on{margin-left:0;margin-right:1.5rem}.content figure{margin:0;padding:0}.content figcaption p{text-align:center;font-style:italic;font-size:1.6rem;margin:0}.avatar img{width:20rem;height:auto;border-radius:50%}@media only screen and (max-width:768px){.avatar img{width:10rem}}.list ul{margin:3.2rem 0;list-style:none;padding:0}.list ul li{font-size:1.8rem}@media only screen and (max-width:768px){.list ul li{margin:1.6rem 0}}.list ul li .date{display:inline-block;width:20rem;text-align:right;margin-right:3rem}@media only screen and (max-width:768px){.list ul li .date{display:block;text-align:left}}.list ul li .title{font-size:1.8rem;color:#212121;font-family:Lato,Helvetica,sans-serif;font-weight:700}.list ul li .title:hover,.list ul li .title:focus{color:#1565c0}.centered{display:flex;align-items:center;justify-content:center}.centered .about{text-align:center}.centered .about h1{margin-top:2rem;margin-bottom:.5rem}.centered .about h2{margin-top:1rem;margin-bottom:.5rem;font-size:2.4rem}@media only screen and (max-width:768px){.centered .about h2{font-size:2rem}}.centered .about ul{list-style:none;margin:3rem 0 1rem;padding:0}.centered .about ul li{display:inline-block;position:relative}.centered .about ul li a{color:#212121;text-transform:uppercase;margin-left:1rem;margin-right:1rem;font-size:1.6rem}.centered .about ul li a:hover,.centered .about ul li a:focus{color:#1565c0}@media only screen and (max-width:768px){.centered .about ul li a{font-size:1.4rem}}.centered .about ul li a i{font-size:3.2rem}.centered .error{text-align:center}.centered .error h1{margin-top:2rem;margin-bottom:.5rem;font-size:4.6rem}@media only screen and (max-width:768px){.centered .error h1{font-size:3.2rem}}.centered .error h2{margin-top:2rem;margin-bottom:3.2rem;font-size:3.2rem}@media only screen and (max-width:768px){.centered .error h2{font-size:2.8rem}}.navigation{height:6rem;width:100%}.navigation a,.navigation span{display:inline;font-size:1.6rem;font-family:Lato,Helvetica,sans-serif;font-weight:700;line-height:6rem;color:#212121}.navigation a:hover,.navigation a:focus{color:#1565c0}.navigation .navigation-title{letter-spacing:.1rem;text-transform:uppercase}.navigation .navigation-list{float:right;list-style:none;margin-bottom:0;margin-top:0}@media only screen and (max-width:768px){.navigation .navigation-list{position:absolute;top:6rem;right:0;z-index:5;visibility:hidden;opacity:0;padding:0;max-height:0;width:100%;background-color:#fafafa;border-top:solid 2px #e0e0e0;border-bottom:solid 2px #e0e0e0;transition:opacity .25s,max-height .15s linear}}.navigation .navigation-list .navigation-item{float:left;margin:0;position:relative}@media only screen and (max-width:768px){.navigation .navigation-list .navigation-item{float:none!important;text-align:center}.navigation .navigation-list .navigation-item a,.navigation .navigation-list .navigation-item span{line-height:5rem}}.navigation .navigation-list .navigation-item a,.navigation .navigation-list .navigation-item span{margin-left:1rem;margin-right:1rem}@media only screen and (max-width:768px){.navigation .navigation-list .menu-separator{border-top:2px solid #212121;margin:0 8rem}.navigation .navigation-list .menu-separator span{display:none}}.navigation #menu-toggle{display:none}@media only screen and (max-width:768px){.navigation #menu-toggle:checked+label{color:#e0e0e0}.navigation #menu-toggle:checked+label+ul{visibility:visible;opacity:1;max-height:100rem}}.navigation .menu-button{display:none}@media only screen and (max-width:768px){.navigation .menu-button{display:block;font-size:2.4rem;font-weight:400;line-height:6rem;color:#212121;cursor:pointer}.navigation .menu-button:hover,.navigation .menu-button:focus{color:#1565c0}}.pagination{margin-top:6rem;text-align:center;font-family:Lato,Helvetica,sans-serif}.pagination li{display:inline;text-align:center;font-weight:700}.pagination li span{margin:0;text-align:center;width:3.2rem}.pagination li a{font-weight:300}.pagination li a span{margin:0;text-align:center;width:3.2rem}.footer{width:100%;text-align:center;line-height:2rem;margin-bottom:1rem}.footer a{color:#1565c0} \ No newline at end of file +*,*:after,*:before{box-sizing:inherit}html{box-sizing:border-box;font-size:62.5%}body{color:#212121;background-color:#fafafa;font-family:Merriweather,Georgia,serif;font-size:1.6em;font-weight:300;line-height:1.8em}@media only screen and (max-width:768px){body{font-size:1.6em;line-height:1.6em}}a{font-weight:300;color:#1565c0;text-decoration:none}a:focus,a:hover{text-decoration:underline}p{margin:2rem 0}h1,h2,h3,h4,h5,h6{font-family:Lato,Helvetica,sans-serif;font-weight:700;color:#000;margin:6.4rem 0 3.2rem}h1{font-size:3.2rem;line-height:3.6rem}@media only screen and (max-width:768px){h1{font-size:3rem;line-height:3.4rem}}h2{font-size:2.8rem;line-height:3.2rem}@media only screen and (max-width:768px){h2{font-size:2.6rem;line-height:3rem}}h3{font-size:2.4rem;line-height:2.8rem}@media only screen and (max-width:768px){h3{font-size:2.2rem;line-height:2.6rem}}h4{font-size:2.2rem;line-height:2.6rem}@media only screen and (max-width:768px){h4{font-size:2rem;line-height:2.4rem}}h5{font-size:2rem;line-height:2.4rem}@media only screen and (max-width:768px){h5{font-size:1.8rem;line-height:2.2rem}}h6{font-size:1.8rem;line-height:2.2rem}@media only screen and (max-width:768px){h6{font-size:1.6rem;line-height:2rem}}b,strong{font-weight:700}.highlight>div,.highlight>pre{margin:0 0 2rem;padding:1rem;border-radius:1rem}pre{display:block;font-family:source code pro,lucida console,monospace;font-size:1.6rem;font-weight:400;line-height:2.6rem;overflow-x:auto;margin:0}pre code{display:inline-block;background-color:inherit;color:inherit}code{font-family:source code pro,lucida console,monospace;font-size:1.6rem;font-weight:400;background-color:#e0e0e0;color:#212121}blockquote{border-left:2px solid #e0e0e0;padding-left:2rem;line-height:2.2rem;font-weight:400;font-style:italic}th,td{padding:1.6rem}table{border-collapse:collapse}table td,table th{border:2px solid #000}table tr:first-child th{border-top:0}table tr:last-child td{border-bottom:0}table tr td:first-child,table tr th:first-child{border-left:0}table tr td:last-child,table tr th:last-child{border-right:0}img{max-width:100%}figure{text-align:center}.wrapper{display:flex;flex-direction:column;min-height:100vh;width:100%}.container{margin:0 auto;max-width:90rem;width:100%;padding-left:2rem;padding-right:2rem}.fab{font-weight:400}.fas{font-weight:700}.float-right{float:right}.float-left{float:left}.fab{font-weight:400}.fas{font-weight:900}.content{flex:1;display:flex;margin-top:1.6rem;margin-bottom:3.2rem}.content article header{margin-top:6.4rem;margin-bottom:3.2rem}.content article header h1{font-size:4.2rem;line-height:4.6rem;margin:0}@media only screen and (max-width:768px){.content article header h1{font-size:4rem;line-height:4.4rem}}.content article footer{margin-top:4rem}.content article footer .see-also{margin:3.2rem 0}.content article footer .see-also h3{margin:3.2rem 0}.content article p{text-align:justify;text-justify:auto;hyphens:auto}.content .post .post-title{margin-bottom:.75em}.content .post .post-meta i{text-align:center;width:1.6rem;margin-left:0;margin-right:.5rem}.content .post .post-meta .date .posted-on{margin-left:0;margin-right:1.5rem}.content figure{margin:0;padding:0}.content figcaption p{text-align:center;font-style:italic;font-size:1.6rem;margin:0}.avatar img{width:20rem;height:auto;border-radius:50%}@media only screen and (max-width:768px){.avatar img{width:10rem}}.list ul{margin:3.2rem 0;list-style:none;padding:0}.list ul li{font-size:1.8rem}@media only screen and (max-width:768px){.list ul li{margin:1.6rem 0}}.list ul li .date{display:inline-block;width:20rem;text-align:right;margin-right:3rem}@media only screen and (max-width:768px){.list ul li .date{display:block;text-align:left}}.list ul li .title{font-size:1.8rem;color:#212121;font-family:Lato,Helvetica,sans-serif;font-weight:700}.list ul li .title:hover,.list ul li .title:focus{color:#1565c0}.centered{display:flex;align-items:center;justify-content:center}.centered .about{text-align:center}.centered .about h1{margin-top:2rem;margin-bottom:.5rem}.centered .about h2{margin-top:1rem;margin-bottom:.5rem;font-size:2.4rem}@media only screen and (max-width:768px){.centered .about h2{font-size:2rem}}.centered .about ul{list-style:none;margin:3rem 0 1rem;padding:0}.centered .about ul li{display:inline-block;position:relative}.centered .about ul li a{color:#212121;text-transform:uppercase;margin-left:1rem;margin-right:1rem;font-size:1.6rem}.centered .about ul li a:hover,.centered .about ul li a:focus{color:#1565c0}@media only screen and (max-width:768px){.centered .about ul li a{font-size:1.4rem}}.centered .about ul li a i{font-size:3.2rem}.centered .error{text-align:center}.centered .error h1{margin-top:2rem;margin-bottom:.5rem;font-size:4.6rem}@media only screen and (max-width:768px){.centered .error h1{font-size:3.2rem}}.centered .error h2{margin-top:2rem;margin-bottom:3.2rem;font-size:3.2rem}@media only screen and (max-width:768px){.centered .error h2{font-size:2.8rem}}.navigation{height:6rem;width:100%}.navigation a,.navigation span{display:inline;font-size:1.6rem;font-family:Lato,Helvetica,sans-serif;font-weight:700;line-height:6rem;color:#212121}.navigation a:hover,.navigation a:focus{color:#1565c0}.navigation .navigation-title{letter-spacing:.1rem;text-transform:uppercase}.navigation .navigation-list{float:right;list-style:none;margin-bottom:0;margin-top:0}@media only screen and (max-width:768px){.navigation .navigation-list{position:absolute;top:6rem;right:0;z-index:5;visibility:hidden;opacity:0;padding:0;max-height:0;width:100%;background-color:#fafafa;border-top:solid 2px #e0e0e0;border-bottom:solid 2px #e0e0e0;transition:opacity .25s,max-height .15s linear}}.navigation .navigation-list .navigation-item{float:left;margin:0;position:relative}@media only screen and (max-width:768px){.navigation .navigation-list .navigation-item{float:none!important;text-align:center}.navigation .navigation-list .navigation-item a,.navigation .navigation-list .navigation-item span{line-height:5rem}}.navigation .navigation-list .navigation-item a,.navigation .navigation-list .navigation-item span{margin-left:1rem;margin-right:1rem}@media only screen and (max-width:768px){.navigation .navigation-list .menu-separator{border-top:2px solid #212121;margin:0 8rem}.navigation .navigation-list .menu-separator span{display:none}}.navigation #menu-toggle{display:none}@media only screen and (max-width:768px){.navigation #menu-toggle:checked+label{color:#e0e0e0}.navigation #menu-toggle:checked+label+ul{visibility:visible;opacity:1;max-height:100rem}}.navigation .menu-button{display:none}@media only screen and (max-width:768px){.navigation .menu-button{display:block;font-size:2.4rem;font-weight:400;line-height:6rem;color:#212121;cursor:pointer}.navigation .menu-button:hover,.navigation .menu-button:focus{color:#1565c0}}.pagination{margin-top:6rem;text-align:center;font-family:Lato,Helvetica,sans-serif}.pagination li{display:inline;text-align:center;font-weight:700}.pagination li span{margin:0;text-align:center;width:3.2rem}.pagination li a{font-weight:300}.pagination li a span{margin:0;text-align:center;width:3.2rem}.footer{width:100%;text-align:center;line-height:2rem;margin-bottom:1rem}.footer a{color:#1565c0} \ No newline at end of file diff --git a/resources/_gen/assets/scss/scss/coder.scss_5e1eb8e37c42cdfb6215b61e44dcfa5f.json b/resources/_gen/assets/scss/scss/coder.scss_5e1eb8e37c42cdfb6215b61e44dcfa5f.json index 0320806..8ba0c81 100644 --- a/resources/_gen/assets/scss/scss/coder.scss_5e1eb8e37c42cdfb6215b61e44dcfa5f.json +++ b/resources/_gen/assets/scss/scss/coder.scss_5e1eb8e37c42cdfb6215b61e44dcfa5f.json @@ -1 +1 @@ -{"Target":"css/coder.min.ab11da33926aff1bbed738198c81361e84bf702098a3e97ed5b24126bde6c9ba.css","MediaType":"text/css","Data":{"Integrity":"sha256-qxHaM5Jq/xu+1zgZjIE2HoS/cCCYo+l+1bJBJr3mybo="}} \ No newline at end of file +{"Target":"css/coder.min.a4f332213a21ce8eb521670c614470c58923aaaf385e2a73982c31dd7642decb.css","MediaType":"text/css","Data":{"Integrity":"sha256-pPMyITohzo61IWcMYURwxYkjqq84XipzmCwx3XZC3ss="}} \ No newline at end of file From e613e3ba00469dfb92a914ee0b0a4e489b1489cf Mon Sep 17 00:00:00 2001 From: Ka-Wai Lin Date: Mon, 2 Mar 2020 18:54:33 +0100 Subject: [PATCH 03/11] Adding gravatar support (#268) * Gravatar support Adding gravatar as alternative avatar * Update CONTRIBUTORS.md --- CONTRIBUTORS.md | 1 + exampleSite/config.toml | 1 + layouts/partials/home.html | 9 +++++++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index d57bfe2..8cfe97d 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -58,3 +58,4 @@ - [FIGBERT](https://figbert.com/) - [Yash Mehrotra](https://yashmehrotra.com) - [Paolo Mainardi](https://paolomainardi.com) +- [Ka-Wai Lin](https://github.com/kwlin) \ No newline at end of file diff --git a/exampleSite/config.toml b/exampleSite/config.toml index 3f02c74..823c28a 100644 --- a/exampleSite/config.toml +++ b/exampleSite/config.toml @@ -21,6 +21,7 @@ disqusShortname = "yourdiscussshortname" keywords = "blog,developer,personal" info = "Full Stack DevOps and Magician" avatarurl = "images/avatar.jpg" + #gravatar = "john.doe@example.com" footercontent = "Enter a text here." dateformat = "January 2, 2006" diff --git a/layouts/partials/home.html b/layouts/partials/home.html index 1c17468..a911ec8 100644 --- a/layouts/partials/home.html +++ b/layouts/partials/home.html @@ -1,7 +1,12 @@
- {{ with .Site.Params.avatarurl }} -
avatar
+ {{ if and (isset .Site.Params "avatarurl") (not (isset .Site.Params "gravatar")) }} + {{ with .Site.Params.avatarurl }} +
avatar
+ {{ end }} + {{ end }} + {{ with .Site.Params.gravatar }} +
gravatar
{{ end }}

{{ .Site.Params.author }}

{{ .Site.Params.info }}

From c40cd0d302d9d4c7abd0a5993fa58b6e8c0ff341 Mon Sep 17 00:00:00 2001 From: Piotr Orzechowski Date: Fri, 13 Mar 2020 13:45:13 +0100 Subject: [PATCH 04/11] Polish i18n (#275) * Add Polish translation * Add Piotr Orzechowski to contributor list * Add unit to reading time in Polish translation --- CONTRIBUTORS.md | 3 ++- i18n/pl.toml | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 i18n/pl.toml diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 8cfe97d..c949275 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -58,4 +58,5 @@ - [FIGBERT](https://figbert.com/) - [Yash Mehrotra](https://yashmehrotra.com) - [Paolo Mainardi](https://paolomainardi.com) -- [Ka-Wai Lin](https://github.com/kwlin) \ No newline at end of file +- [Ka-Wai Lin](https://github.com/kwlin) +- [Piotr Orzechowski](https://orzechowski.tech) diff --git a/i18n/pl.toml b/i18n/pl.toml new file mode 100644 index 0000000..886841a --- /dev/null +++ b/i18n/pl.toml @@ -0,0 +1,23 @@ +[category] +other = "kategoria" + +[tag] +other = "tag" + +[series] +other = "seria" + +[reading_time] +other = "czas czytania: {{ .Count }} min" + +[page_not_found] +other = "Nie znaleziono strony" + +[page_does_not_exist] +other = "Wybacz, ta strona nie istnieje." + +[head_back] +other = "Możesz wrócić na stronę domową." + +[powered_by] +other = "Napędzane przez" From bba24e0bbd721bfc7378623ebd2de411953556d6 Mon Sep 17 00:00:00 2001 From: a1x42 Date: Wed, 18 Mar 2020 19:10:38 +0100 Subject: [PATCH 05/11] Slovak translation (#276) * Slovak translation * Update i18n/sk.toml Co-Authored-By: Martin Kiesel <2067589+Kyslik@users.noreply.github.com> Co-authored-by: a1x42 Co-authored-by: Martin Kiesel <2067589+Kyslik@users.noreply.github.com> --- i18n/sk.toml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 i18n/sk.toml diff --git a/i18n/sk.toml b/i18n/sk.toml new file mode 100644 index 0000000..7fd4d23 --- /dev/null +++ b/i18n/sk.toml @@ -0,0 +1,24 @@ +[category] +other = "kategória" + +[tag] +other = "téma" + +[series] +other = "diel" + +[reading_time] +one = "Prečítate si za minútu" +other = "Prečítate si do {{ .Count }} minút" + +[page_not_found] +other = "Stránka nebola nájdená" + +[page_does_not_exist] +other = "Prepáčte, ale táto stránka neexistuje." + +[head_back] +other = "Späť na domácu stránku." + +[powered_by] +other = "Táto stránka bola vytvorená cez" From 17fe8de72b97d0b91143afbb7b08b610292166d3 Mon Sep 17 00:00:00 2001 From: Glenn Feunteun Date: Wed, 18 Mar 2020 20:33:04 +0100 Subject: [PATCH 06/11] Rework commit info display in footer (#277) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Rework commit info display in footer Use Hugo .GitInfo to get Hash and AbbreviatedHash Remove leading · because it renders as .· when credits are displayed * Update CONTRIBUTORS.md --- CONTRIBUTORS.md | 1 + layouts/partials/footer.html | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index c949275..0ce358d 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -60,3 +60,4 @@ - [Paolo Mainardi](https://paolomainardi.com) - [Ka-Wai Lin](https://github.com/kwlin) - [Piotr Orzechowski](https://orzechowski.tech) +- [Glenn Feunteun](https://github.com/gfeun) diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 1677656..6c2d72c 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -16,8 +16,9 @@ {{ i18n "powered_by" }} Hugo & Coder. {{ end }} {{ if .Site.Params.commit }} - {{ if or (not .Site.Params.hideCredits) (not .Site.Params.hideCopyright) }} · {{ end }} - [{{ getenv "GIT_COMMIT_SHA_SHORT" }}] + {{ if .GitInfo }} + [{{ .GitInfo.AbbreviatedHash }}] + {{ end }} {{ end }}
From 64b827d3b46aef8644d98b5e301bbdc32d09ade3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santiago=20Gonz=C3=A1lez?= <48886164+netrules@users.noreply.github.com> Date: Mon, 30 Mar 2020 09:30:23 -0300 Subject: [PATCH 07/11] Stackbit fix for import (#283) * Making changes in order to fix STACKBIT integration * Small typo in yaml * Added self to CONTRIBUTORS.md --- CONTRIBUTORS.md | 1 + stackbit.yaml | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 0ce358d..41918ba 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -61,3 +61,4 @@ - [Ka-Wai Lin](https://github.com/kwlin) - [Piotr Orzechowski](https://orzechowski.tech) - [Glenn Feunteun](https://github.com/gfeun) +- [Santiago González](https://github.com/netrules) diff --git a/stackbit.yaml b/stackbit.yaml index a026d04..6a4bfbd 100644 --- a/stackbit.yaml +++ b/stackbit.yaml @@ -64,6 +64,8 @@ models: name: hideCredits - type: boolean name: hideCopyright + - type: number + name: since - type: string name: commit - type: boolean @@ -94,6 +96,22 @@ models: - type: string name: url label: URL + - type: string + name: rel + label: Rel + - type: string + name: type + label: Type + - type: object + name: fathomAnalytics + label: Fathom Analytics (optional) + fields: + - type: string + name: siteID + label: ID for Fathom Analytics + - type: string + name: serverURL + label: URL for Fathom Analytics - type: object name: languages fields: @@ -164,6 +182,10 @@ models: name: images items: type: string + - type: image + name: featured_image + label: Featured Image + description: Image featured in post display language_config: type: object label: Language Config @@ -185,6 +207,8 @@ models: name: keywords - type: string name: footercontent + - type: number + name: since - type: object label: Menu name: menu From 911a39528b036e8f367cf3741b2842259da4db69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Codru=C8=9B=20Constantin=20Gu=C8=99oi?= Date: Thu, 2 Apr 2020 14:10:43 +0100 Subject: [PATCH 08/11] Adds `.Content` to list.html partial (#290) --- CONTRIBUTORS.md | 1 + exampleSite/content/snippets/_index.md | 5 +++++ exampleSite/content/snippets/first/index.md | 9 +++++++++ exampleSite/content/snippets/second/index.md | 9 +++++++++ layouts/partials/list.html | 1 + 5 files changed, 25 insertions(+) create mode 100644 exampleSite/content/snippets/_index.md create mode 100644 exampleSite/content/snippets/first/index.md create mode 100644 exampleSite/content/snippets/second/index.md diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 41918ba..7b0b26e 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -62,3 +62,4 @@ - [Piotr Orzechowski](https://orzechowski.tech) - [Glenn Feunteun](https://github.com/gfeun) - [Santiago González](https://github.com/netrules) +- [Codruț Constantin Gușoi](https://www.sdwolfz.pro) diff --git a/exampleSite/content/snippets/_index.md b/exampleSite/content/snippets/_index.md new file mode 100644 index 0000000..5166c00 --- /dev/null +++ b/exampleSite/content/snippets/_index.md @@ -0,0 +1,5 @@ +--- +title: "Snippets" +--- + +This content is in `content/snippets/_index.md` diff --git a/exampleSite/content/snippets/first/index.md b/exampleSite/content/snippets/first/index.md new file mode 100644 index 0000000..0d423e5 --- /dev/null +++ b/exampleSite/content/snippets/first/index.md @@ -0,0 +1,9 @@ +--- +title: "First snippet" +--- + +This content is in `snippets/first/index.md` + +```sh +pwd +``` diff --git a/exampleSite/content/snippets/second/index.md b/exampleSite/content/snippets/second/index.md new file mode 100644 index 0000000..e1ca4d1 --- /dev/null +++ b/exampleSite/content/snippets/second/index.md @@ -0,0 +1,9 @@ +--- +title: "Second snippet" +--- + +This content is in `snippets/second/index.md` + +```sh +ls -la +``` diff --git a/layouts/partials/list.html b/layouts/partials/list.html index 0eaed26..d56a9bf 100644 --- a/layouts/partials/list.html +++ b/layouts/partials/list.html @@ -7,6 +7,7 @@ {{- .Title -}} + {{ .Content }}
    {{ range .Paginator.Pages }}
  • From 5a10cb7e6c4c3036b4cc87806a7242d78fdca45d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Pannetier?= <35581688+clement-pannetier@users.noreply.github.com> Date: Thu, 2 Apr 2020 15:12:42 +0200 Subject: [PATCH 09/11] feature to fix issue #288 (#289) * fix for issue #288 * refactor some conditionnal statements * adding hideFooter parameter to exampleSite config --- exampleSite/config.toml | 1 + layouts/partials/footer.html | 46 +++++++++++++++++++----------------- 2 files changed, 25 insertions(+), 22 deletions(-) diff --git a/exampleSite/config.toml b/exampleSite/config.toml index 823c28a..a930053 100644 --- a/exampleSite/config.toml +++ b/exampleSite/config.toml @@ -26,6 +26,7 @@ disqusShortname = "yourdiscussshortname" dateformat = "January 2, 2006" + hideFooter = false hideCredits = false hideCopyright = false since = 2019 diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 6c2d72c..b2048ee 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,24 +1,26 @@ -
    -
    - {{ with .Site.Params.footercontent | safeHTML }} -

    {{.}}

    - {{ end }} - {{ if not .Site.Params.hideCopyright }} - {{ with .Site.Params.since }} - © {{ if lt . now.Year }}{{ . }} - {{ end }}{{ now.Year }} - {{ else }} - © {{ now.Year }} +{{ if not .Site.Params.hideFooter | default false }} +
    +
    + {{ with .Site.Params.footercontent | safeHTML }} +

    {{ . }}

    {{ end }} - {{ if .Site.Params.Author }} {{ .Site.Params.Author }} {{ end }} - {{ end }} - {{ if not .Site.Params.hideCredits }} - {{ if not .Site.Params.hideCopyright }} · {{ end }} - {{ i18n "powered_by" }} Hugo & Coder. - {{ end }} - {{ if .Site.Params.commit }} - {{ if .GitInfo }} - [{{ .GitInfo.AbbreviatedHash }}] + {{ if not .Site.Params.hideCopyright }} + © + {{ if (and (.Site.Params.since) (lt .Site.Params.since now.Year)) }} + {{ .Site.Params.since }} - + {{ end }} + {{ now.Year }} + {{ with .Site.Params.Author }} {{ . }} {{ end }} {{ end }} - {{ end }} -
    -
    + {{ if not .Site.Params.hideCredits }} + {{ if not .Site.Params.hideCopyright }} · {{ end }} + {{ i18n "powered_by" }} Hugo & Coder. + {{ end }} + {{ if .Site.Params.commit }} + {{ if .GitInfo }} + [{{ .GitInfo.AbbreviatedHash }}] + {{ end }} + {{ end }} +
    +
    +{{ end }} \ No newline at end of file From acb4bf6f2dcce51a27dc0e1f1008afb369d378d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Pannetier?= <35581688+clement-pannetier@users.noreply.github.com> Date: Thu, 2 Apr 2020 20:57:20 +0200 Subject: [PATCH 10/11] Fix Stackbit import (#292) * fix stackbit import * addition to contributors --- CONTRIBUTORS.md | 1 + stackbit.yaml | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 7b0b26e..2254e57 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -63,3 +63,4 @@ - [Glenn Feunteun](https://github.com/gfeun) - [Santiago González](https://github.com/netrules) - [Codruț Constantin Gușoi](https://www.sdwolfz.pro) +- [Clément Pannetier](https://clementpannetier.dev) diff --git a/stackbit.yaml b/stackbit.yaml index 6a4bfbd..dd3592f 100644 --- a/stackbit.yaml +++ b/stackbit.yaml @@ -56,6 +56,8 @@ models: name: info - type: string name: avatarurl + - type: boolean + name: hideFooter - type: string name: footercontent - type: string @@ -186,6 +188,14 @@ models: name: featured_image label: Featured Image description: Image featured in post display + snippets: + type: page + label: Snippets + folder: snippets + fields: + - type: string + name: title + label: Title language_config: type: object label: Language Config From ee91020af5591457ba4d2822e0316550e67a5f47 Mon Sep 17 00:00:00 2001 From: a1x42 Date: Wed, 8 Apr 2020 22:11:07 +0200 Subject: [PATCH 11/11] navigation to different language version remains on page (#294) Co-authored-by: a1x42 --- layouts/partials/header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 8043bea..20e6c98 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -17,7 +17,7 @@ {{ if .Site.IsMultiLingual }} {{ $node := . }} {{ .Scratch.Set "separator" true }} - {{ range .Site.Home.AllTranslations }} + {{ range .Translations }} {{ if ne $.Site.Language .Language }} {{ if $node.Scratch.Get "separator" }}