From 419ade4a35ca37f4b14ae42f222f0f39880c17d3 Mon Sep 17 00:00:00 2001 From: Dean Attali Date: Wed, 25 Aug 2021 15:20:56 -0400 Subject: [PATCH 001/141] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 28f05b47c29c..e633837be58a 100644 --- a/README.md +++ b/README.md @@ -46,8 +46,9 @@ __Check out [*What's New?*](https://beautifuljekyll.com/updates/) to see the lat Developing and maintaining Beautiful Jekyll takes a lot of time and effort - thank you to anyone who helps fund this effort! -- [Matt Artist](https://mja00.dev/) +- [DoFollow](https://dofollow.co.uk/) - [\_hyp3ri0n](https://hyperiongray.com) +- [GentianGashi](https://gentiangashi.co.uk/) [Become a sponsor for Beautiful Jekyll and unlock special rewards\!](https://github.com/sponsors/daattali/sponsorships?tier_id=39856) From 0fe5fabc9acbbf45f860eba34a62145f67451b99 Mon Sep 17 00:00:00 2001 From: Dean Attali Date: Wed, 25 Aug 2021 15:32:29 -0400 Subject: [PATCH 002/141] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e633837be58a..66c6c13631e4 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,8 @@ Developing and maintaining Beautiful Jekyll takes a lot of time and effort - tha - [DoFollow](https://dofollow.co.uk/) - [\_hyp3ri0n](https://hyperiongray.com) -- [GentianGashi](https://gentiangashi.co.uk/) +- [Gentian Gashi](https://gentiangashi.co.uk/) +- [Matthew Trontz](https://github.com/mtrontz-the-dev) [Become a sponsor for Beautiful Jekyll and unlock special rewards\!](https://github.com/sponsors/daattali/sponsorships?tier_id=39856) From 85444cbac5a66fcce871a8095a2543dec086f932 Mon Sep 17 00:00:00 2001 From: Dean Attali Date: Wed, 15 Sep 2021 13:26:08 -0700 Subject: [PATCH 003/141] add loadview sponsor --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 66c6c13631e4..26f2a50320f2 100644 --- a/README.md +++ b/README.md @@ -46,6 +46,7 @@ __Check out [*What's New?*](https://beautifuljekyll.com/updates/) to see the lat Developing and maintaining Beautiful Jekyll takes a lot of time and effort - thank you to anyone who helps fund this effort! +- [LoadView-Testing](https://www.loadview-testing.com/products/jmeter-load-testing/) - [DoFollow](https://dofollow.co.uk/) - [\_hyp3ri0n](https://hyperiongray.com) - [Gentian Gashi](https://gentiangashi.co.uk/) From 452f1e025ef9cca6fb9a7b9ed5a0362a8b76cd67 Mon Sep 17 00:00:00 2001 From: Vincent Tam Date: Sun, 10 Oct 2021 04:02:32 +0200 Subject: [PATCH 004/141] IE & jQuery slim compatible Staticman JS (#782) --- assets/js/staticman.js | 55 ++++++++++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 21 deletions(-) diff --git a/assets/js/staticman.js b/assets/js/staticman.js index e8bdfbe2e667..b52708ff0161 100644 --- a/assets/js/staticman.js +++ b/assets/js/staticman.js @@ -14,29 +14,42 @@ layout: null var endpoint = '{{ sm.endpoint }}'; var repository = '{{ sm.repository }}'; var branch = '{{ sm.branch }}'; + let url = endpoint + repository + '/' + branch + '/comments'; + let data = $(this).serialize(); - $.ajax({ - type: $(this).attr('method'), - url: endpoint + repository + '/' + branch + '/comments', - data: $(this).serialize(), - contentType: 'application/x-www-form-urlencoded', - success: function (data) { - $('#comment-form-submit').addClass('d-none'); - $('#comment-form-submitted').removeClass('d-none'); - $('.page__comments-form .js-notice').removeClass('alert-danger'); - $('.page__comments-form .js-notice').addClass('alert-success'); - showAlert('success'); - }, - error: function (err) { - console.log(err); - $('#comment-form-submitted').addClass('d-none'); - $('#comment-form-submit').removeClass('d-none'); - $('.page__comments-form .js-notice').removeClass('alert-success'); - $('.page__comments-form .js-notice').addClass('alert-danger'); - showAlert('failure'); - $(form).removeClass('disabled'); + var xhr = new XMLHttpRequest(); + xhr.open("POST", url); + xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); + xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest'); + xhr.onreadystatechange = function () { + if(xhr.readyState === XMLHttpRequest.DONE) { + var status = xhr.status; + if (status >= 200 && status < 400) { + formSubmitted(); + } else { + formError(); + } } - }); + }; + + function formSubmitted() { + $('#comment-form-submit').addClass('d-none'); + $('#comment-form-submitted').removeClass('d-none'); + $('.page__comments-form .js-notice').removeClass('alert-danger'); + $('.page__comments-form .js-notice').addClass('alert-success'); + showAlert('success'); + } + + function formError() { + $('#comment-form-submitted').addClass('d-none'); + $('#comment-form-submit').removeClass('d-none'); + $('.page__comments-form .js-notice').removeClass('alert-success'); + $('.page__comments-form .js-notice').addClass('alert-danger'); + showAlert('failure'); + $(form).removeClass('disabled'); + } + + xhr.send(data); return false; }); From f6dd3dca5e4bca8ae18632399add9b3801b20c92 Mon Sep 17 00:00:00 2001 From: Dean Attali Date: Sat, 9 Oct 2021 22:04:32 -0400 Subject: [PATCH 005/141] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4aae898c8d54..595251c771f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Updated staticman from using v2 (public servers) to v3 (private servers) due to the public servers becoming obsolete (#775) - Added support for Cloudflare Analytics (#797) - Added Reddit in share options of posts (#815) +- Fixed bug where staticman didn't work jQuery slim version is used (#766) ## v5.0.0 (2020-09-15) From 24e182b90ea080b3d38765818c3ebb0b8f868e6d Mon Sep 17 00:00:00 2001 From: Dean Attali Date: Sun, 10 Oct 2021 02:22:37 +0000 Subject: [PATCH 006/141] make long strings wrap lines instad of go offscreen; fix #787 --- CHANGELOG.md | 1 + assets/css/beautifuljekyll.css | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 595251c771f7..90b6b9b8d5ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ - Added support for Cloudflare Analytics (#797) - Added Reddit in share options of posts (#815) - Fixed bug where staticman didn't work jQuery slim version is used (#766) +- Fixed very long strings to wrap around the next line rather than go off-screen (#787) ## v5.0.0 (2020-09-15) diff --git a/assets/css/beautifuljekyll.css b/assets/css/beautifuljekyll.css index 4e809c4c1783..2b15f07e8adf 100644 --- a/assets/css/beautifuljekyll.css +++ b/assets/css/beautifuljekyll.css @@ -20,6 +20,7 @@ body { background-image: url({{ site.page-img | relative_url }}); background-attachment: fixed; {% endif %} + overflow-wrap: break-word; } p { line-height: 1.5; From 505305ebe7c1f1e8a2b11cdd6582619fd5f745ab Mon Sep 17 00:00:00 2001 From: Dean Attali Date: Sun, 10 Oct 2021 06:20:54 +0000 Subject: [PATCH 007/141] correctly escape titles subtitles and excerpts in all contexts; fixes #856 --- CHANGELOG.md | 1 + _includes/header.html | 12 ++++++------ _includes/search.html | 4 ++-- _includes/social-share.html | 2 +- _layouts/home.html | 6 +++--- _layouts/post.html | 4 ++-- _posts/2020-02-26-flake-it-till-you-make-it.md | 6 +++--- _posts/2020-02-28-test-markdown.md | 4 ++-- feed.xml | 4 ++-- tags.html | 2 +- 10 files changed, 23 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 90b6b9b8d5ba..b85316242f84 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## Unreleased version - Added `post_search` config setting that creates a Search button in the navbar (older websites need to set `post_search: true` to enable this feature) (#770) +- Fixed page titles, subtitles, and excerpts rendering correctly when there are special characeters in them (#856) - Slightly reworked margins and position for avatar image to resolve an alignment issue on Safari. - Changed the width at which the navbar collapses to a higher threshold because most modern non-mobile browsers are >1000px - Fixed bug where navbar secondary level dropdown items didn't inherit the same colour as the primary navbar links diff --git a/_includes/header.html b/_includes/header.html index 4c299b668d39..aa35a7aca85f 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -27,13 +27,13 @@
-

{% if page.title %}{{ page.title }}{% else %}
{% endif %}

+

{% if page.title %}{{ page.title | strip_html }}{% else %}
{% endif %}

{% if page.subtitle %} {% if include.type == "page" %}
- {{ page.subtitle }} + {{ page.subtitle | strip_html }} {% else %} -

{{ page.subtitle }}

+

{{ page.subtitle | strip_html }}

{% endif %} {% endif %} @@ -61,13 +61,13 @@

{{ page.subtitle }}

-

{% if page.title %}{{ page.title }}{% else %}
{% endif %}

+

{% if page.title %}{{ page.title | strip_html }}{% else %}
{% endif %}

{% if page.subtitle %} {% if include.type == "page" %}
- {{ page.subtitle }} + {{ page.subtitle | strip_html }} {% else %} -

{{ page.subtitle }}

+

{{ page.subtitle | strip_html }}

{% endif %} {% endif %} diff --git a/_includes/search.html b/_includes/search.html index 7924fd08b213..becf37b584c0 100644 --- a/_includes/search.html +++ b/_includes/search.html @@ -11,7 +11,7 @@ var searchjson = '[ \ {% for post in site.posts %} \ { \ - "title" : "{% if post.title != "" %}{{ post.title | escape }}{% else %}{{ post.excerpt | strip_html | escape | strip }}{%endif%}", \ + "title" : "{% if post.title != "" %}{{ post.title | strip_html | escape }}{% else %}{{ post.excerpt | strip_html | escape | strip }}{%endif%}", \ "category" : "{{ post.tags | join: \', \' }}", \ "url" : "{{ site.baseurl }}{{ post.url }}", \ "date" : "{{ post.date | date: "%B %e, %Y" | default: "January 1, 1970" }}" \ @@ -19,7 +19,7 @@ {% endfor %} \ {% for page in site.html_pages %}{% if page.title != "{title}" and page.title != "404 - Page not found" %} \ { \ - "title" : "{% if page.title != "" %}{{ page.title | escape }}{% else %}{{ page.excerpt | strip_html | escape | strip }}{% endif %}", \ + "title" : "{% if page.title != "" %}{{ page.title | strip_html | escape }}{% else %}{{ page.excerpt | strip_html | escape | strip }}{% endif %}", \ "category" : "{% if page.tags %}{{ page.tags | join: \', \' }}{% else %}page{% endif %}", \ "url" : "{{ site.baseurl }}{{ page.url }}", \ "date" : "{{ page.date | date: '%B %e, %Y' | default: "January 1, 1970" }}" \ diff --git a/_includes/social-share.html b/_includes/social-share.html index c04f445f833c..4a7ca01e5b7c 100644 --- a/_includes/social-share.html +++ b/_includes/social-share.html @@ -11,7 +11,7 @@ Share: {% if site.share-links-active.twitter %} - Twitter diff --git a/_layouts/home.html b/_layouts/home.html index c97b27faaff9..806aa7cf29e2 100644 --- a/_layouts/home.html +++ b/_layouts/home.html @@ -35,11 +35,11 @@ {% endif %} -

{{ post.title }}

+

{{ post.title | strip_html }}

{% if post.subtitle %}

- {{ post.subtitle }} + {{ post.subtitle | strip_html }}

{% endif %} @@ -68,7 +68,7 @@

{% assign excerpt_length = site.excerpt_length | default: 50 %} - {{ post.excerpt | strip_html | xml_escape | truncatewords: excerpt_length }} + {{ post.excerpt | strip_html | truncatewords: excerpt_length }} {% assign excerpt_word_count = post.excerpt | number_of_words %} {% if post.content != post.excerpt or excerpt_word_count > excerpt_length %} [Read More] diff --git a/_layouts/post.html b/_layouts/post.html index 5358515df87d..70d5ee4fcc28 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -67,12 +67,12 @@ diff --git a/_posts/2020-02-26-flake-it-till-you-make-it.md b/_posts/2020-02-26-flake-it-till-you-make-it.md index b9b550ae3be5..e8679f42d166 100644 --- a/_posts/2020-02-26-flake-it-till-you-make-it.md +++ b/_posts/2020-02-26-flake-it-till-you-make-it.md @@ -1,14 +1,14 @@ --- layout: post -title: Flake it till you make it -subtitle: Excerpt from Soulshaping by Jeff Brown +title: "Flake it & un + he`AA`y BB : per g > % cent ' till y\"ou make it" +subtitle: "Excerpt from \"SoulITTTshaping by Jeff Brown" cover-img: /assets/img/path.jpg thumbnail-img: /assets/img/thumb.png share-img: /assets/img/path.jpg tags: [books, test] --- -Under what circumstances should we step off a path? When is it essential that we finish what we start? If I bought a bag of peanuts and had an allergic reaction, no one would fault me if I threw it out. If I ended a relationship with a woman who hit me, no one would say that I had a commitment problem. But if I walk away from a seemingly secure route because my soul has other ideas, I am a flake? +Under what & f < d > g + g : `g`y sg e % t ' c " circusmstances should we step off a path? When is it essential that we finish what we start? If I bought a bag of peanuts and had an allergic reaction, no one would fault me if I threw it out. If I ended a relationship with a woman who hit me, no one would say that I had a commitment problem. But if I walk away from a seemingly secure route because my soul has other ideas, I am a flake? The truth is that no one else can definitively know the path we are here to walk. It’s tempting to listen—many of us long for the omnipotent other—but unless they are genuine psychic intuitives, they can’t know. All others can know is their own truth, and if they’ve actually done the work to excavate it, they will have the good sense to know that they cannot genuinely know anyone else’s. Only soul knows the path it is here to walk. Since you are the only one living in your temple, only you can know its scriptures and interpretive structure. diff --git a/_posts/2020-02-28-test-markdown.md b/_posts/2020-02-28-test-markdown.md index 4ac869f47ead..5c223764f75b 100644 --- a/_posts/2020-02-28-test-markdown.md +++ b/_posts/2020-02-28-test-markdown.md @@ -1,7 +1,7 @@ --- layout: post -title: Sample blog post -subtitle: Each post also has a subtitle +title: Sample blog fdspost +subtitle: Each post alITALso has a subtitle gh-repo: daattali/beautiful-jekyll gh-badge: [star, fork, follow] tags: [test] diff --git a/feed.xml b/feed.xml index 57f7ad56359a..6148cf15f5d6 100644 --- a/feed.xml +++ b/feed.xml @@ -15,9 +15,9 @@ layout: null {% assign excerpt_length = site.excerpt_length | default: 50 %} {% for post in site.posts limit:20 %} - {{ post.title | xml_escape }} + {{ post.title | strip_html | xml_escape }} - {% if post.subtitle %}{{ post.subtitle | xml_escape }} - {% endif %} + {% if post.subtitle %}{{ post.subtitle | strip_html | xml_escape }} - {% endif %} {{ post.content | strip_html | xml_escape | truncatewords: excerpt_length }} {{ post.date | date: "%a, %d %b %Y %H:%M:%S %z" }} diff --git a/tags.html b/tags.html index 04c193908ec9..55a3c6d4cb66 100644 --- a/tags.html +++ b/tags.html @@ -25,7 +25,7 @@

{%- for post in site.tags[tag] -%}
- {{- post.title -}} + {{- post.title | strip_html -}}
From ffb27515fe14ef7aa788351cd37516b18231e8fa Mon Sep 17 00:00:00 2001 From: Dean Attali Date: Sun, 10 Oct 2021 06:36:40 +0000 Subject: [PATCH 008/141] revert testing changes in posts --- _posts/2020-02-26-flake-it-till-you-make-it.md | 8 ++++---- _posts/2020-02-28-test-markdown.md | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/_posts/2020-02-26-flake-it-till-you-make-it.md b/_posts/2020-02-26-flake-it-till-you-make-it.md index e8679f42d166..b3ad9e398ab7 100644 --- a/_posts/2020-02-26-flake-it-till-you-make-it.md +++ b/_posts/2020-02-26-flake-it-till-you-make-it.md @@ -1,17 +1,17 @@ --- layout: post -title: "Flake it & un + he`AA`y BB : per g > % cent ' till y\"ou make it" -subtitle: "Excerpt from \"SoulITTTshaping by Jeff Brown" +title: Flake it till you make it +subtitle: Excerpt from Soulshaping by Jeff Brown cover-img: /assets/img/path.jpg thumbnail-img: /assets/img/thumb.png share-img: /assets/img/path.jpg tags: [books, test] --- -Under what & f < d > g + g : `g`y sg e % t ' c " circusmstances should we step off a path? When is it essential that we finish what we start? If I bought a bag of peanuts and had an allergic reaction, no one would fault me if I threw it out. If I ended a relationship with a woman who hit me, no one would say that I had a commitment problem. But if I walk away from a seemingly secure route because my soul has other ideas, I am a flake? +Under what circumstances should we step off a path? When is it essential that we finish what we start? If I bought a bag of peanuts and had an allergic reaction, no one would fault me if I threw it out. If I ended a relationship with a woman who hit me, no one would say that I had a commitment problem. But if I walk away from a seemingly secure route because my soul has other ideas, I am a flake? The truth is that no one else can definitively know the path we are here to walk. It’s tempting to listen—many of us long for the omnipotent other—but unless they are genuine psychic intuitives, they can’t know. All others can know is their own truth, and if they’ve actually done the work to excavate it, they will have the good sense to know that they cannot genuinely know anyone else’s. Only soul knows the path it is here to walk. Since you are the only one living in your temple, only you can know its scriptures and interpretive structure. At the heart of the struggle are two very different ideas of success—survival-driven and soul-driven. For survivalists, success is security, pragmatism, power over others. Success is the absence of material suffering, the nourishing of the soul be damned. It is an odd and ironic thing that most of the material power in our world often resides in the hands of younger souls. Still working in the egoic and material realms, they love the sensations of power and focus most of their energy on accumulation. Older souls tend not to be as materially driven. They have already played the worldly game in previous lives and they search for more subtle shades of meaning in this one—authentication rather than accumulation. They are often ignored by the culture at large, although they really are the truest warriors. -A soulful notion of success rests on the actualization of our innate image. Success is simply the completion of a soul step, however unsightly it may be. We have finished what we started when the lesson is learned. What a fear-based culture calls a wonderful opportunity may be fruitless and misguided for the soul. Staying in a passionless relationship may satisfy our need for comfort, but it may stifle the soul. Becoming a famous lawyer is only worthwhile if the soul demands it. It is an essential failure if you are called to be a monastic this time around. If you need to explore and abandon ten careers in order to stretch your soul toward its innate image, then so be it. Flake it till you make it. +A soulful notion of success rests on the actualization of our innate image. Success is simply the completion of a soul step, however unsightly it may be. We have finished what we started when the lesson is learned. What a fear-based culture calls a wonderful opportunity may be fruitless and misguided for the soul. Staying in a passionless relationship may satisfy our need for comfort, but it may stifle the soul. Becoming a famous lawyer is only worthwhile if the soul demands it. It is an essential failure if you are called to be a monastic this time around. If you need to explore and abandon ten careers in order to stretch your soul toward its innate image, then so be it. Flake it till you make it. \ No newline at end of file diff --git a/_posts/2020-02-28-test-markdown.md b/_posts/2020-02-28-test-markdown.md index 5c223764f75b..bf6c9a5f9349 100644 --- a/_posts/2020-02-28-test-markdown.md +++ b/_posts/2020-02-28-test-markdown.md @@ -1,7 +1,7 @@ --- layout: post -title: Sample blog fdspost -subtitle: Each post alITALso has a subtitle +title: Sample blog post +subtitle: Each post also has a subtitle gh-repo: daattali/beautiful-jekyll gh-badge: [star, fork, follow] tags: [test] @@ -75,4 +75,4 @@ You can add notification, warning and error boxes like this: ### Error {: .box-error} -**Error:** This is an error box. +**Error:** This is an error box. \ No newline at end of file From d0928cb455f03371def849584d146b3daa53a449 Mon Sep 17 00:00:00 2001 From: Dean Attali Date: Sun, 10 Oct 2021 07:12:58 +0000 Subject: [PATCH 009/141] breaking change: rss feed only generated if rss-description config exists; rss icon only shows if social-network-links.rss is true; closes #814 --- CHANGELOG.md | 1 + _config.yml | 5 +++-- _includes/head.html | 2 ++ _includes/social-networks-links.html | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b85316242f84..8401feb1800d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## Unreleased version - Added `post_search` config setting that creates a Search button in the navbar (older websites need to set `post_search: true` to enable this feature) (#770) +- BREAKING CHANGE: More control over RSS feed sharing: previously, an RSS feed was *always* generated, and if the config setting `rss-description` was set then there was an RSS icon in the footer. Now, an RSS feed is only generated when the config setting `rss-description` exists, and an RSS footer icon is only shown if `rss: true` is set in the `social-network-links` config settings - Fixed page titles, subtitles, and excerpts rendering correctly when there are special characeters in them (#856) - Slightly reworked margins and position for avatar image to resolve an alignment issue on Safari. - Changed the width at which the navbar collapses to a higher threshold because most modern non-mobile browsers are >1000px diff --git a/_config.yml b/_config.yml index bf1783da1928..5270a9e9601d 100644 --- a/_config.yml +++ b/_config.yml @@ -40,6 +40,7 @@ round-avatar: true # Uncomment the links you want to show and add your information to each one. social-network-links: email: "someone@example.com" + rss: true # remove this line if you don't want to show an RSS link at the bottom facebook: deanattali github: daattali twitter: daattali @@ -63,8 +64,8 @@ social-network-links: # ORCID: your ORCID ID # google-scholar: your google scholar -# If you want to show a link to an RSS in the footer, add the site description here. -# If you don't want to show an RSS link, remove the following line. +# If you want your website to generate an RSS feed, provide a description +# The URL for the feed will be https:///feed.xml rss-description: This website is a virtual proof that I'm awesome # --- General options --- # diff --git a/_includes/head.html b/_includes/head.html index cf93eda4afbe..ac3e13409c23 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -39,7 +39,9 @@ {% endif %} + {% if site.rss-description %} + {% endif %} {% include gtag.html %} {% include gtm_head.html %} diff --git a/_includes/social-networks-links.html b/_includes/social-networks-links.html index 3f799eb02de9..ac1599dbb2e3 100644 --- a/_includes/social-networks-links.html +++ b/_includes/social-networks-links.html @@ -1,6 +1,6 @@ From 4201212002550b38f23ebdef6bf18ac60a9e2444 Mon Sep 17 00:00:00 2001 From: Dean Attali Date: Mon, 29 Nov 2021 18:06:08 -0500 Subject: [PATCH 019/141] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 55b653924c51..e92cb3d0df61 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ - Fixed bug where staticman didn't work jQuery slim version is used (#766) - Fixed very long strings to wrap around the next line rather than go off-screen (#787) - Added `footer-hover-col` config setting to customize the hover colour of links in the footer (#848) +- Added social network link for Discord (#907) ## v5.0.0 (2020-09-15) From a29203e260c72443cff3dc2f8ee38c1897b925dd Mon Sep 17 00:00:00 2001 From: Stefan Leibfarth Date: Tue, 8 Feb 2022 21:14:45 +0100 Subject: [PATCH 020/141] Add Mastodon profile verification (#933) See https://docs.joinmastodon.org/user/profile/#fields --- _includes/social-networks-links.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/social-networks-links.html b/_includes/social-networks-links.html index 617d9b7dd758..2b8dc2b156eb 100644 --- a/_includes/social-networks-links.html +++ b/_includes/social-networks-links.html @@ -230,7 +230,7 @@ {%- if site.social-network-links.mastodon -%}
  • - +
    • {%- endif -%} + +{%- if site.social-network-links.kaggle -%} +
  • + + + Kaggle + +
    • +{%- endif -%} From 8df19d9bb1c8fae1c85a9fbd01178e84434f1fe0 Mon Sep 17 00:00:00 2001 From: Dean Attali Date: Sun, 3 Apr 2022 18:26:43 -0400 Subject: [PATCH 025/141] add news item for kaggle social media --- CHANGELOG.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a4d2437259d..fa03af28e3c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,12 +14,11 @@ - Updated staticman from using v2 (public servers) to v3 (private servers) due to the public servers becoming obsolete (#775) - Added support for Cloudflare Analytics (#797) - Added Reddit in share options of posts (#815) -- Added support for giscus comments (#886) +- Added support for giscus comments (#886) and CommentBox (#960) - Fixed bug where staticman didn't work jQuery slim version is used (#766) - Fixed very long strings to wrap around the next line rather than go off-screen (#787) - Added `footer-hover-col` config setting to customize the hover colour of links in the footer (#848) -- Added social network link for Discord (#907) -- Added CommentBox as comment option (#960) +- Added social network links for Discord (#907) and Kaggle (#961) ## v5.0.0 (2020-09-15) From 99d1a12a7324c4cd58465604739b27418fe3b16c Mon Sep 17 00:00:00 2001 From: tanersekmen <56790802+tanersekmen@users.noreply.github.com> Date: Mon, 2 May 2022 08:21:07 +0300 Subject: [PATCH 026/141] added hackerrank social media network (#978) --- _config.yml | 1 + _includes/social-networks-links.html | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/_config.yml b/_config.yml index 4fb5aa92637e..9ea0b4a4ca41 100644 --- a/_config.yml +++ b/_config.yml @@ -65,6 +65,7 @@ social-network-links: # google-scholar: your google scholar # discord: invite/invite_code or users/userid # kaggle: yourname +# hackerrank: yourname # If you want your website to generate an RSS feed, provide a description # The URL for the feed will be https:///feed.xml diff --git a/_includes/social-networks-links.html b/_includes/social-networks-links.html index cec2e84e27d9..8ca4c6d2a5e7 100644 --- a/_includes/social-networks-links.html +++ b/_includes/social-networks-links.html @@ -324,4 +324,16 @@ {%- endif -%} +{%- if site.social-network-links.hackerrank -%} +
  • + + + Hackerrank + +
    • +{%- endif -%} + From 5420dbd899bfeb37dce4f548267e1a8905d3249b Mon Sep 17 00:00:00 2001 From: Dean Attali Date: Mon, 2 May 2022 01:22:00 -0400 Subject: [PATCH 027/141] add news item for hacerrank --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fa03af28e3c5..402abdb1db7d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,7 +18,7 @@ - Fixed bug where staticman didn't work jQuery slim version is used (#766) - Fixed very long strings to wrap around the next line rather than go off-screen (#787) - Added `footer-hover-col` config setting to customize the hover colour of links in the footer (#848) -- Added social network links for Discord (#907) and Kaggle (#961) +- Added social network links for Discord (#907), Kaggle (#961), and Hackerrank (#978) ## v5.0.0 (2020-09-15) From 5253e3866c5e186552abcadc2769dbb1bab6662f Mon Sep 17 00:00:00 2001 From: Jefferson Bledsoe Date: Mon, 4 Jul 2022 16:51:19 +0100 Subject: [PATCH 028/141] Markup home page content lists and tags as lists (#950) * Markup home page content lists and tags as lists * Fix styling after markup changes * Fix typo * fix a couple visual issues * make sure the divider line between posts shows up Co-authored-by: Dean Attali --- _layouts/home.html | 140 +++++++++++++++++---------------- assets/css/beautifuljekyll.css | 8 ++ 2 files changed, 82 insertions(+), 66 deletions(-) diff --git a/_layouts/home.html b/_layouts/home.html index 806aa7cf29e2..cab91a52d623 100644 --- a/_layouts/home.html +++ b/_layouts/home.html @@ -6,88 +6,96 @@ {% assign posts = paginator.posts | default: site.posts %} -
    + +
      {% for post in posts %} -
      +
    • +
      - {%- capture thumbnail -%} - {% if post.thumbnail-img %} - {{ post.thumbnail-img }} - {% elsif post.cover-img %} - {% if post.cover-img.first %} - {{ post.cover-img[0].first.first }} + {%- capture thumbnail -%} + {% if post.thumbnail-img %} + {{ post.thumbnail-img }} + {% elsif post.cover-img %} + {% if post.cover-img.first %} + {{ post.cover-img[0].first.first }} + {% else %} + {{ post.cover-img }} + {% endif %} {% else %} - {{ post.cover-img }} {% endif %} - {% else %} + {% endcapture %} + {% assign thumbnail=thumbnail | strip %} + + {% if site.feed_show_excerpt == false %} + {% if thumbnail != "" %} +
      + + Post thumbnail + +
      + {% endif %} {% endif %} - {% endcapture %} - {% assign thumbnail=thumbnail | strip %} - {% if site.feed_show_excerpt == false %} - {% if thumbnail != "" %} -
      - - Post thumbnail + +

      {{ post.title | strip_html }}

      + + {% if post.subtitle %} +

      + {{ post.subtitle | strip_html }} +

      + {% endif %}       -
      - {% endif %} - {% endif %} - -

      {{ post.title | strip_html }}

      +

      + {% assign date_format = site.date_format | default: "%B %-d, %Y" %} + Posted on {{ post.date | date: date_format }} +

      - {% if post.subtitle %} -

      - {{ post.subtitle | strip_html }} -

      + {% if thumbnail != "" %} +
      + + Post thumbnail + +
      {% endif %} - - -

      - {% assign date_format = site.date_format | default: "%B %-d, %Y" %} - Posted on {{ post.date | date: date_format }} -

      - {% if thumbnail != "" %} -
      - - Post thumbnail - -
      - {% endif %} + {% unless site.feed_show_excerpt == false %} + {% if thumbnail != "" %} +
      + + Post thumbnail + +
      + {% endif %} - {% unless site.feed_show_excerpt == false %} - {% if thumbnail != "" %} -
      - - Post thumbnail - -
      - {% endif %} +
      + {% assign excerpt_length = site.excerpt_length | default: 50 %} + {{ post.excerpt | strip_html | truncatewords: excerpt_length }} + {% assign excerpt_word_count = post.excerpt | number_of_words %} + {% if post.content != post.excerpt or excerpt_word_count > excerpt_length %} + [Read More] + {% endif %} +
      + {% endunless %} -
      - {% assign excerpt_length = site.excerpt_length | default: 50 %} - {{ post.excerpt | strip_html | truncatewords: excerpt_length }} - {% assign excerpt_word_count = post.excerpt | number_of_words %} - {% if post.content != post.excerpt or excerpt_word_count > excerpt_length %} - [Read More] + {% if site.feed_show_tags != false and post.tags.size > 0 %} +
      + Tags: + +
        + {% for tag in post.tags %} +
      • + {{- tag -}} +
        • + {% endfor %} +
      +
      {% endif %} -
      - {% endunless %} - {% if site.feed_show_tags != false and post.tags.size > 0 %} -
      - Tags: - {% for tag in post.tags %} - {{- tag -}} - {% endfor %} -
      - {% endif %} - -
      +
      • + {% endfor %} -
    + {% if paginator.total_pages > 1 %} From 50de2a0c80625bf1b7ee046da57a1710a1a8b818 Mon Sep 17 00:00:00 2001 From: Dean Attali Date: Wed, 10 Apr 2024 00:21:56 -0400 Subject: [PATCH 119/141] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 600a4ffd77fc..6c60d09cc8ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ - The footer of a page always sticks to the bottom, even on short pages (#576) - Added `author` YAML parameter to allow specifying the author(s) of a post (#1220) - Fixed bug where hovering over search results showed the text "{desc}" (#1156) -- Added social network links for GitLab, Bluesky, Whatsapp (#1168, #1218, #1299) +- Added social network links for GitLab, Bluesky, Whatsapp, Untappd (#1168, #1218, #1299, #1307) - Added instructions and example on how to fix image links in project sites (#1171) - Pagination buttons: use nicer arrows, and don't show text on small screens (#1221) - Updated Yelp URL format - if you previously used the `yelp` social network config parameter, you might need to update the config value (#1259) From c07c3ea3be047d9bd347079ef659a84b931e4242 Mon Sep 17 00:00:00 2001 From: Dean Attali Date: Tue, 16 Apr 2024 12:47:00 -0400 Subject: [PATCH 120/141] Use CSS variables; fixes #661 (#1312) --- CHANGELOG.md | 1 + _config.yml | 6 +- assets/css/beautifuljekyll.css | 148 ++++++++++++++++++++------------- 3 files changed, 93 insertions(+), 62 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c60d09cc8ab..ca56a4255209 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Added `author` YAML parameter to allow specifying the author(s) of a post (#1220) - Fixed bug where hovering over search results showed the text "{desc}" (#1156) - Added social network links for GitLab, Bluesky, Whatsapp, Untappd (#1168, #1218, #1299, #1307) +- Use CSS variables (#661) - Added instructions and example on how to fix image links in project sites (#1171) - Pagination buttons: use nicer arrows, and don't show text on small screens (#1221) - Updated Yelp URL format - if you previously used the `yelp` social network config parameter, you might need to update the config value (#1259) diff --git a/_config.yml b/_config.yml index 861fa4cb3099..e3f871135f35 100644 --- a/_config.yml +++ b/_config.yml @@ -134,13 +134,13 @@ navbar-var-length: false # Personalize the colours in your website. Colour values can be any valid CSS colour -navbar-col: "#EAEAEA" -navbar-text-col: "#404040" -navbar-border-col: "#DDDDDD" page-col: "#FFFFFF" text-col: "#404040" link-col: "#008AFF" hover-col: "#0085A1" +navbar-col: "#EAEAEA" +navbar-text-col: "#404040" +navbar-border-col: "#DDDDDD" footer-col: "#EAEAEA" footer-text-col: "#777777" footer-link-col: "#404040" diff --git a/assets/css/beautifuljekyll.css b/assets/css/beautifuljekyll.css index e5d8b4ea82b1..9fac6b69fe83 100644 --- a/assets/css/beautifuljekyll.css +++ b/assets/css/beautifuljekyll.css @@ -4,6 +4,26 @@ layout: null @import url("pygment_highlights.css"); +:root { + /* config file CSS variables */ + --page-col: {{ site.page-col | default: "#FFFFFF" }}; + --text-col: {{ site.text-col | default: "#404040" }}; + --link-col: {{ site.link-col | default: "#008AFF" }}; + --hover-col: {{ site.hover-col | default: "#0085A1" }}; + --navbar-col: {{ site.navbar-col | default: "#EAEAEA" }}; + --navbar-text-col: {{ site.navbar-text-col | default: "#404040" }}; + --navbar-border-col: {{ site.navbar-border-col | default: "#DDDDDD" }}; + --footer-col: {{ site.footer-col | default: "#EAEAEA" }}; + --footer-text-col: {{ site.footer-text-col | default: "#777777" }}; + --footer-link-col: {{ site.footer-link-col | default: "#404040" }}; + --footer-hover-col: {{ site.footer-hover-col | default: "#0085A1" }}; + + /* common CSS variables */ + --body-font: 'Lora', 'Times New Roman', serif; + --header-font: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; + --mid-col: #808080; +} + /* --- General --- */ html { @@ -11,11 +31,11 @@ html { } body { - font-family: 'Lora', 'Times New Roman', serif; + font-family: var(--body-font); font-size: 1.125rem; - color: {{ site.text-col | default: "#404040" }}; + color: var(--text-col); position: relative; - background-color: {{ site.page-col | default: "#FFFFFF" }}; + background-color: var(--page-col); {% if site.page-img %} background-image: url({{ site.page-img | relative_url }}); background-attachment: fixed; @@ -33,7 +53,7 @@ p { margin: 1.875rem 0; } h1,h2,h3,h4,h5,h6 { - font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; + font-family: var(--header-font); font-weight: 800; line-height: 1.1; } @@ -53,19 +73,22 @@ h1, h2, h3, h4 { margin-top: 1.25rem; } a { - color: {{ site.link-col | default: "#008AFF" }}; + color: var(--link-col); } a:hover, a:focus { - color: {{ site.hover-col | default: "#0085A1" }}; + color: var(--hover-col) } blockquote { - color: #808080; + color: var(--mid-col); font-style: italic; } blockquote p:first-child { margin-top: 0; } +.jumbotron { + background: #EEE; +} hr.small { max-width: 6.25rem; margin: 1rem auto; @@ -87,21 +110,21 @@ hr.small { } ::-moz-selection { - color: #fff; + color: var(--page-col); + background-color: var(--hover-col); text-shadow: none; - background-color: {{ site.hover-col | default: "#0085A1" }}; } ::selection { - color: #fff; + color: var(--page-col); + background-color: var(--hover-col); text-shadow: none; - background-color: {{ site.hover-col | default: "#0085A1" }}; } img::selection { - color: #fff; + color: var(--hover-col); background: transparent; } img::-moz-selection { - color: #fff; + color: var(--hover-col); background: transparent; } @@ -129,9 +152,9 @@ img { /* --- Navbar --- */ .navbar-custom { - background-color: {{ site.navbar-col | default: "#EAEAEA" }}; - border-bottom: 1px solid {{ site.navbar-border-col | default: "#DDDDDD" }}; - font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; + background-color: var(--navbar-col); + border-bottom: 1px solid var(--navbar-border-col); + font-family: var(--header-font); {% if site.navbar-img %} background-image: url({{ site.navbar-img | relative_url }}); background-attachment: fixed; @@ -195,7 +218,7 @@ img { .navbar-custom .navbar-brand, .navbar-custom .navbar-nav .nav-link { font-weight: 800; - color: {{ site.navbar-text-col | default: "#404040" }}; + color: var(--navbar-text-col); } .navbar-toggler { @@ -266,10 +289,10 @@ img { .navbar-custom .nav-item.dropdown .dropdown-menu .dropdown-item { padding: 0.625rem; - background-color: {{ site.navbar-col | default: "#EAEAEA" }}; + background-color: var(--navbar-col); text-decoration: none !important; font-weight: normal; - color: {{ site.navbar-text-col | default: "#404040" }}; + color: var(--navbar-text-col); {% unless site.navbar-var-length %} white-space: normal; {% endunless %} @@ -282,7 +305,7 @@ img { .navbar-custom .nav-item.dropdown .dropdown-menu .dropdown-item { padding-left: 0.625rem; - border: 1px solid {{ site.navbar-border-col | default: "#DDDDDD" }}; + border: 1px solid var(--navbar-border-col); border-width: 0 1px 1px; } @@ -293,7 +316,7 @@ img { @media (max-width: 1199px) { .navbar-custom .navbar-collapse { - border-top: 1px solid {{ site.navbar-border-col | default: "#DDDDDD" }}; + border-top: 1px solid var(--navbar-border-col); margin: 0 -1rem; } @@ -319,7 +342,7 @@ img { .navbar-custom .navbar-nav .nav-link:focus, .navbar-custom .navbar-nav .dropdown-menu .dropdown-item:hover, .navbar-custom .navbar-nav .dropdown-menu .dropdown-item:focus { - color: {{ site.hover-col | default: "#0085A1" }}; + color: var(--hover-col) } .navbar-custom .avatar-container { @@ -385,10 +408,10 @@ img { footer { padding: 1.875rem 0; - border-top: 1px #EAEAEA solid; + border-top: 1px var(--footer-col) solid; margin-top: 3.125rem; font-size: 0.875rem; - background-color: {{ site.footer-col | default: "#EAEAEA" }}; + background-color: var(--footer-col); {% if site.footer-img %} background-image: url({{ site.footer-img | relative_url }}); background-attachment: fixed; @@ -396,16 +419,22 @@ footer { } footer p.text-muted { - color: {{ site.footer-text-col | default: "#777777" }} !important; + color: var(--footer-text-col) !important; } footer a { - color: {{ site.footer-link-col | default: "#404040" }}; + color: var(--footer-link-col); +} +footer .footer-links a { + color: var(--text-col); +} +footer .footer-links .fa-inverse { + color: var(--page-col); } footer a:hover, footer a:focus { - color: {{ site.footer-hover-col | default: "#0085A1" }}; + color: var(--footer-hover-col); } footer .list-inline { @@ -414,7 +443,7 @@ footer .list-inline { margin-bottom: 1.875rem; } footer .copyright { - font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; + font-family: var(--header-font); text-align: center; margin-bottom: 0; margin-top: 0; @@ -426,7 +455,7 @@ footer .theme-by { footer .footer-custom-content { text-align: center; margin-bottom: 0.9375rem; - font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; + font-family: var(--header-font); } @media (min-width: 768px) { @@ -468,14 +497,14 @@ footer .footer-custom-content { .post-preview a { text-decoration: none; - font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; - color: {{ site.text-col | default: "#404040" }}; + font-family: var(--header-font); + color: var(--text-col); } .post-preview a:focus, .post-preview a:hover { text-decoration: none; - color: {{ site.hover-col | default: "#0085A1" }}; + color: var(--hover-col) } .post-preview .post-title { @@ -489,11 +518,11 @@ footer .footer-custom-content { } .post-preview .post-meta, .post-heading .post-meta { - color: #808080; + color: var(--mid-col); font-size: 1.125rem; font-style: italic; margin: 0 0 0.625rem; - font-family: 'Lora', 'Times New Roman', serif; + font-family: var(--body-font); } .post-heading .post-meta { display: inline-block; @@ -570,13 +599,13 @@ footer .footer-custom-content { /* --- Tags --- */ .blog-tags { - font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; + font-family: var(--header-font); font-size: 0.9375rem; margin: 1.875rem 0; } .blog-tags span { - color: {{ site.text-col | default: "#404040" }}; + color: var(--text-col); opacity: 0.8; } @@ -585,7 +614,7 @@ footer .footer-custom-content { } .blog-tags a { - color: {{ site.text-col | default: "#404040" }}; + color: var(--text-col); text-decoration: none; padding: 0 0.3125rem; opacity: 0.8; @@ -595,8 +624,8 @@ footer .footer-custom-content { .blog-tags a:hover { opacity: 1; - color: {{ site.text-col | default: "#404040" }}; - border-color: {{ site.text-col | default: "#404040" }}; + color: var(--text-col); + border-color: var(--text-col); } .post-preview .blog-tags { @@ -617,7 +646,7 @@ footer .footer-custom-content { } #full-tags-list { - font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; + font-family: var(--header-font); } #full-tags-list .tag-entry { @@ -629,7 +658,7 @@ footer .footer-custom-content { } #full-tags-list .tag-entry .entry-date { - color: #808080; + color: var(--mid-col); font-style: italic; font-size: 1rem; } @@ -691,7 +720,7 @@ nav.top-nav-short-permanent ~ header > .intro-header.big-img { font-size: 1.6875rem; line-height: 1.1; display: block; - font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; + font-family: var(--header-font); font-weight: 300; margin: 0.625rem 0 0; } @@ -716,7 +745,7 @@ nav.top-nav-short-permanent ~ header > .intro-header.big-img { padding: 0.3125rem 0.625rem; font-size: 0.6875rem; color: #EEE; - font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; + font-family: var(--header-font); right: 0; bottom: 0; display: none; @@ -775,15 +804,15 @@ nav.top-nav-short-permanent ~ header > .intro-header.big-img { } .pagination .page-item .page-link { - font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; + font-family: var(--header-font); text-transform: uppercase; font-size: 0.875rem; font-weight: 800; letter-spacing: 1px; padding: 0.625rem 0.3125rem; - background-color: #FFF; + background-color: var(--page-col); border-radius: 0; - color: {{ site.text-col | default: "#404040" }}; + color: var(--text-col); padding: 0.75rem 1rem; } @media (min-width: 768px) { @@ -793,9 +822,9 @@ nav.top-nav-short-permanent ~ header > .intro-header.big-img { } .pagination .page-item .page-link:hover, .pagination .page-item .page-link:focus { - color: #FFF; - border: 1px solid {{ site.hover-col | default: "#0085A1" }}; - background-color: {{ site.hover-col | default: "#0085A1" }}; + color: var(--page-col); + border: 1px solid var(--hover-col) + background-color: var(--hover-col) } /* --- Tables --- */ @@ -805,26 +834,23 @@ table { } table tr { border-top: 1px solid #cccccc; - background-color: #ffffff; + background-color: var(--page-col); margin: 0; padding: 0; } table tr:nth-child(2n) { background-color: #f8f8f8; } -table tr th { - font-weight: bold; - border: 1px solid #cccccc; - text-align: left; - margin: 0; - padding: 0.375rem 0.8125rem; -} +table tr th, table tr td { border: 1px solid #cccccc; text-align: left; margin: 0; padding: 0.375rem 0.8125rem; } +table tr th { + font-weight: bold; +} table tr th :first-child, table tr td :first-child { margin-top: 0; @@ -913,6 +939,10 @@ pre { margin-top: 1.875rem; } +#social-share-section a { + color: #fff; +} + /* --- Notification boxes --- */ .box-note, .box-warning, @@ -971,7 +1001,7 @@ pre { max-width: 25%; border-width: 0.25rem; border-radius: 0.1875rem; - border-color: #808080; + border-color: var(--mid-col); } .blog-post blockquote { @@ -992,7 +1022,7 @@ pre { /* Search bar */ #beautifuljekyll-search-overlay { - font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; + font-family: var(--header-font); display: none; z-index: 999999; position: fixed; From b57d3d4a4abd3027edc8c39e2749a57b53f9a5e2 Mon Sep 17 00:00:00 2001 From: Dean Attali Date: Tue, 16 Apr 2024 13:45:29 -0400 Subject: [PATCH 121/141] add missing semicolons in css --- assets/css/beautifuljekyll.css | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/assets/css/beautifuljekyll.css b/assets/css/beautifuljekyll.css index 9fac6b69fe83..5e2abcde9b57 100644 --- a/assets/css/beautifuljekyll.css +++ b/assets/css/beautifuljekyll.css @@ -77,7 +77,7 @@ a { } a:hover, a:focus { - color: var(--hover-col) + color: var(--hover-col); } blockquote { color: var(--mid-col); @@ -342,7 +342,7 @@ img { .navbar-custom .navbar-nav .nav-link:focus, .navbar-custom .navbar-nav .dropdown-menu .dropdown-item:hover, .navbar-custom .navbar-nav .dropdown-menu .dropdown-item:focus { - color: var(--hover-col) + color: var(--hover-col); } .navbar-custom .avatar-container { @@ -504,7 +504,7 @@ footer .footer-custom-content { .post-preview a:focus, .post-preview a:hover { text-decoration: none; - color: var(--hover-col) + color: var(--hover-col); } .post-preview .post-title { @@ -823,8 +823,8 @@ nav.top-nav-short-permanent ~ header > .intro-header.big-img { .pagination .page-item .page-link:hover, .pagination .page-item .page-link:focus { color: var(--page-col); - border: 1px solid var(--hover-col) - background-color: var(--hover-col) + border: 1px solid var(--hover-col); + background-color: var(--hover-col); } /* --- Tables --- */ From dd16f4ab0516aa5d7aa1521b0a723bc04a46dfe3 Mon Sep 17 00:00:00 2001 From: Dean Attali Date: Wed, 29 May 2024 01:50:50 -0400 Subject: [PATCH 122/141] readme: add next step to read jekyll docs --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 1ecc6e559785..c2d1c5a39d6a 100644 --- a/README.md +++ b/README.md @@ -215,6 +215,8 @@ Congratulations on making it this far! You now have all the tools to easily buil - You can also check out the [advanced installation methods](https://beautifuljekyll.com/getstarted/#install-steps-hard) that give you a little more control but are harder to use. Keep in mind that Beautiful Jekyll was primarily designed to be used as a GitHub theme, so you will not get any support if you choose one of the Ruby installation methods. +- Remember that Beautiful Jekyll is built on top of Jekyll. This means that reading through the [Jekyll documentation](https://jekyllrb.com/) will introduce you to many more features that you might find useful! + # Getting help Visit the [FAQ page](https://beautifuljekyll.com/faq) for answers to commonly asked questions. From 4a9894966d454becb4b7ca847ac02e731c2b2305 Mon Sep 17 00:00:00 2001 From: Dean Attali Date: Fri, 14 Jun 2024 05:40:17 +0000 Subject: [PATCH 123/141] upgrade fontawesoem to 6.5.2; fixes 1330 --- CHANGELOG.md | 1 + _layouts/base.html | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ca56a4255209..95dff15f7af3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Pagination buttons: use nicer arrows, and don't show text on small screens (#1221) - Updated Yelp URL format - if you previously used the `yelp` social network config parameter, you might need to update the config value (#1259) - Added `title-on-all-pages` config setting, that adds the website title to all page titles (#1272) +- Upgraded font-awesome to 6.5.2 (#1330) ## v6.0.1 (2023-06-08) diff --git a/_layouts/base.html b/_layouts/base.html index 6d5503395f60..df2c16fd7d8a 100644 --- a/_layouts/base.html +++ b/_layouts/base.html @@ -5,7 +5,7 @@ common-ext-css: - href: "https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" sri: "sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" - - "https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.1/css/all.min.css" + - "https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.2/css/all.min.css" - "https://fonts.googleapis.com/css?family=Lora:400,700,400italic,700italic" - "https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800" common-ext-js: From a5b9bedcc3915b3e2b32e5ec675978fe28a38a5d Mon Sep 17 00:00:00 2001 From: Dean Attali Date: Fri, 14 Jun 2024 05:45:40 +0000 Subject: [PATCH 124/141] change twitter icon to X; fixes #1193 --- CHANGELOG.md | 1 + _includes/social-networks-links.html | 6 +++--- _includes/social-share.html | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 95dff15f7af3..13900d08b2ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Pagination buttons: use nicer arrows, and don't show text on small screens (#1221) - Updated Yelp URL format - if you previously used the `yelp` social network config parameter, you might need to update the config value (#1259) - Added `title-on-all-pages` config setting, that adds the website title to all page titles (#1272) +- Change Twitter icon to X (#1193) - Upgraded font-awesome to 6.5.2 (#1330) ## v6.0.1 (2023-06-08) diff --git a/_includes/social-networks-links.html b/_includes/social-networks-links.html index c80e232460ca..141b27c2297f 100644 --- a/_includes/social-networks-links.html +++ b/_includes/social-networks-links.html @@ -101,12 +101,12 @@ {%- if network[0] == "twitter" -%}
  • - + - Twitter + X (Twitter)
    • {%- endif -%} diff --git a/_includes/social-share.html b/_includes/social-share.html index 4a7ca01e5b7c..b2e07e4b64bf 100644 --- a/_includes/social-share.html +++ b/_includes/social-share.html @@ -12,9 +12,9 @@ {% if site.share-links-active.twitter %} - - Twitter + class="btn btn-social-icon btn-twitter" title="Share on X (Twitter)"> + + X (Twitter) {% endif %} From ac7d6024b3a917ccfc1ac54f8e6601d8becb5da6 Mon Sep 17 00:00:00 2001 From: Dean Attali Date: Wed, 10 Jul 2024 19:09:16 +0000 Subject: [PATCH 125/141] escpe backslash in search results; fixes #1279 --- CHANGELOG.md | 1 + _includes/search.html | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 13900d08b2ff..1fc13d826fa1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Added explicit support for favicons, you only need to add a `favicon.ico` file to the root directory - The footer of a page always sticks to the bottom, even on short pages (#576) - Added `author` YAML parameter to allow specifying the author(s) of a post (#1220) +- Fixed bug where search results broke if a post title had a backslash (#1279) - Fixed bug where hovering over search results showed the text "{desc}" (#1156) - Added social network links for GitLab, Bluesky, Whatsapp, Untappd (#1168, #1218, #1299, #1307) - Use CSS variables (#661) diff --git a/_includes/search.html b/_includes/search.html index 58b67be5ee5d..3a8536c0e81f 100644 --- a/_includes/search.html +++ b/_includes/search.html @@ -11,8 +11,8 @@ var searchjson = '[ \ {% for post in site.posts %} \ { \ - "title" : "{% if post.title != "" %}{{ post.title | strip_html | escape }}{% else %}{{ post.excerpt | strip_html | escape | strip }}{%endif%}", \ - "desc" : "{% if post.title != "" %}{{ post.title | strip_html | escape }}{% else %}{{ post.excerpt | strip_html | escape | strip }}{%endif%}", \ + "title" : "{% if post.title != "" %}{{ post.title | strip_html | escape | replace: "\", "\\\" }}{% else %}{{ post.excerpt | strip_html | escape | strip | replace: "\", "\\\" }}{%endif%}", \ + "desc" : "{% if post.title != "" %}{{ post.title | strip_html | escape | replace: "\", "\\\" }}{% else %}{{ post.excerpt | strip_html | escape | strip | replace: "\", "\\\" }}{%endif%}", \ "category" : "{{ post.tags | join: \', \' }}", \ "url" : "{{ site.baseurl }}{{ post.url | escape }}", \ "date" : "{{ post.date | date: "%B %e, %Y" | default: "January 1, 1970" }}" \ From e6fc968cbdd592ed73ed49eb622cbf32ed67728c Mon Sep 17 00:00:00 2001 From: Dean Attali Date: Wed, 18 Sep 2024 05:06:29 +0000 Subject: [PATCH 126/141] move search to its own file; fixes 1284 --- _includes/search.html | 26 ++------------------------ assets/data/searchcorpus.json | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 24 deletions(-) create mode 100644 assets/data/searchcorpus.json diff --git a/_includes/search.html b/_includes/search.html index 3a8536c0e81f..dc0f87f61f38 100644 --- a/_includes/search.html +++ b/_includes/search.html @@ -8,32 +8,10 @@
    diff --git a/assets/data/searchcorpus.json b/assets/data/searchcorpus.json new file mode 100644 index 000000000000..9b0aecfa8b49 --- /dev/null +++ b/assets/data/searchcorpus.json @@ -0,0 +1,23 @@ +--- +layout: null +--- +[ +{% for post in site.posts %} +{ +"title" : "{% if post.title != "" %}{{ post.title | strip_html | escape }}{% else %}{{ post.excerpt | strip_html | escape | strip }}{%endif%}", +"desc" : "{% if post.title != "" %}{{ post.title | strip_html | escape }}{% else %}{{ post.excerpt | strip_html | escape | strip }}{%endif%}", +"category" : "{{ post.tags | join: ', ' }}", +"url" : "{{ site.baseurl }}{{ post.url | escape }}", +"date" : "{{ post.date | date: "%B %e, %Y" | default: "January 1, 1970" }}" +}, +{% endfor %} +{% for page in site.html_pages %}{% if page.title != "{title}" and page.title != "404 - Page not found" %} +{ +"title" : "{% if page.title != "" %}{{ page.title | strip_html | escape }}{% else %}{{ page.excerpt | strip_html | escape | strip }}{% endif %}", +"desc" : "{% if page.title != "" %}{{ page.title | strip_html | escape }}{% else %}{{ page.excerpt | strip_html | escape | strip }}{% endif %}", +"category" : "{% if page.tags %}{{ page.tags | join: ', ' }}{% else %}page{% endif %}", +"url" : "{{ site.baseurl }}{{ page.url }}", +"date" : "{{ page.date | date: '%B %e, %Y' | default: "January 1, 1970" }}" +}{% unless forloop.last %},{% endunless %} +{% endif %}{% endfor %} +] From 716798e3db14a3d47389847d41cc8042f49e42d5 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Fri, 20 Sep 2024 01:20:26 -0400 Subject: [PATCH 127/141] feat(social-links): allow subreddit (#1371) --- _config.yml | 18 +++++++++--------- _includes/social-networks-links.html | 12 ++++++++---- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/_config.yml b/_config.yml index e3f871135f35..afd365060315 100644 --- a/_config.yml +++ b/_config.yml @@ -59,7 +59,7 @@ social-network-links: youtube: "@daattali" whatsapp: 15551212 # medium: yourname -# reddit: yourname +# reddit: yourname or r/yoursubreddit # linkedin: daattali # xing: yourname # stackoverflow: "3943160/daattali" @@ -76,7 +76,7 @@ social-network-links: # bluesky: yourname # ORCID: your ORCID ID # google-scholar: your google scholar -# discord: "invite_code" or "users/userid" or "invite/invite_code" +# discord: "invite_code" or "users/userid" or "invite/invite_code" # kaggle: yourname # hackerrank: yourname # gitlab: yourname @@ -214,23 +214,23 @@ footer-hover-col: "#0085A1" # label: blog-comments # Label that will be assigned to GitHub Issues created by Utterances # To use Staticman comments, uncomment the following section. You may leave the reCaptcha -# section commented if you aren't using reCaptcha for spam protection. -# Using Staticman requires advanced knowledge, please consult -# https://github.com/eduardoboucas/staticman/ and https://staticman.net/ for further -# instructions. For any support with staticman please direct questions to staticman and +# section commented if you aren't using reCaptcha for spam protection. +# Using Staticman requires advanced knowledge, please consult +# https://github.com/eduardoboucas/staticman/ and https://staticman.net/ for further +# instructions. For any support with staticman please direct questions to staticman and # not to BeautifulJekyll. #staticman: # repository : # GitHub username/repository eg. "daattali/beautiful-jekyll" # branch : master # If you're not using `master` branch, then you also need to update the `branch` parameter in `staticman.yml` # endpoint : # URL of your deployment, with a trailing slash eg. "https:///v3/entry/github/" -# reCaptcha: # (optional, set these parameters in `staticman.yml` as well) +# reCaptcha: # (optional, set these parameters in `staticman.yml` as well) # siteKey : # You need to apply for a site key on Google # secret : # Encrypt your password by going to https:///v3/encrypt/ # To use giscus comments: -# (0) Uncomment the following giscus section, (1) Enable Discussions in your GitHub repository, +# (0) Uncomment the following giscus section, (1) Enable Discussions in your GitHub repository, # (2) Install the giscus app in your repository (details at https://giscus.app), -# (3) Fill in *all* the parameters below +# (3) Fill in *all* the parameters below # See more details about giscus and each of the following parameters at https://giscus.app #giscus: # hostname: giscus.app # Replace with your giscus instance's hostname if self-hosting diff --git a/_includes/social-networks-links.html b/_includes/social-networks-links.html index 141b27c2297f..991ecb80ca4f 100644 --- a/_includes/social-networks-links.html +++ b/_includes/social-networks-links.html @@ -112,8 +112,12 @@ {%- endif -%} {%- if network[0] == "reddit" -%} + {% assign reddit_start = network[1] | split: "/" | first -%} + {% unless reddit_start == 'r' or reddit_start == 'u' -%} + {% assign reddit_url_prefix = 'u/' -%} + {% endunless -%}
  • - +
    • {%- endif -%} - + {%- if network[0] == "medium" -%}
  • @@ -338,7 +342,7 @@
    • {%- endif -%} - + {%- if network[0] == "discord" -%} {% assign discord_start = network[1] | split: "/" | first -%} {% unless discord_start == 'users' or discord_start == 'invite' -%} @@ -354,7 +358,7 @@ {%- endif -%} - + {%- if network[0] == "kaggle" -%}
  • From a7ca10e0e7e0fffa5c8a2621d71a7d0d75f87f72 Mon Sep 17 00:00:00 2001 From: Dean Attali Date: Fri, 20 Sep 2024 01:21:32 -0400 Subject: [PATCH 128/141] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1fc13d826fa1..8a03eeaabc06 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - Fixed bug where search results broke if a post title had a backslash (#1279) - Fixed bug where hovering over search results showed the text "{desc}" (#1156) - Added social network links for GitLab, Bluesky, Whatsapp, Untappd (#1168, #1218, #1299, #1307) +- Support reddit social network link to either be a subreddit or a user (#1371) - Use CSS variables (#661) - Added instructions and example on how to fix image links in project sites (#1171) - Pagination buttons: use nicer arrows, and don't show text on small screens (#1221) From 3920be6d2e79ca15f4c28b65e8af6cbdf1a76fe1 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sat, 21 Sep 2024 00:49:14 -0400 Subject: [PATCH 129/141] ci(workflow): ensure relative_url is used (#1374) --- .github/workflows/ci.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c3573a9d8478..e684fb8c84aa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,5 +11,16 @@ jobs: ruby-version: '3.3' - name: Install dependencies run: bundle install && bundle exec appraisal install + - name: Setup Pages + id: configure-pages + uses: actions/configure-pages@v5 + - name: Setup CI config + run: | + echo "---" > _config_ci.yml + echo "baseurl: ${{ steps.configure-pages.outputs.base_path }}" >> _config_ci.yml - name: Build site - run: bundle exec appraisal jekyll build --future + env: + JEKYLL_ENV: production + run: bundle exec appraisal jekyll build --future --config _config_ci.yml,_config.yml + - name: Upload artifact + uses: actions/upload-pages-artifact@v3 From b1b667e372acf5f602cca6fee64dd850af70f3da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Cabeza=20Garc=C3=ADa?= Date: Fri, 13 Dec 2024 07:54:20 +0000 Subject: [PATCH 130/141] Bluesky icon in font awesome (#1402) --- _includes/social-networks-links.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/social-networks-links.html b/_includes/social-networks-links.html index 991ecb80ca4f..be42622f9f6b 100644 --- a/_includes/social-networks-links.html +++ b/_includes/social-networks-links.html @@ -276,7 +276,7 @@ Bluesky From 39cfbf1d1756a315df41675f56231e413b579b8a Mon Sep 17 00:00:00 2001 From: Dean Attali Date: Sun, 2 Mar 2025 07:41:27 +0000 Subject: [PATCH 131/141] add example to show how to use details HTML tag with markdown inside itwq --- _posts/2020-02-28-sample-markdown.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/_posts/2020-02-28-sample-markdown.md b/_posts/2020-02-28-sample-markdown.md index 6a59d6a14aac..88200b715d66 100644 --- a/_posts/2020-02-28-sample-markdown.md +++ b/_posts/2020-02-28-sample-markdown.md @@ -93,3 +93,8 @@ When hosting a *project site* on GitHub Pages (for example, `https://USERNAME.gi If the above image is broken, then you'll need to follow the instructions [in the FAQ](https://beautifuljekyll.com/faq/#links-in-project-page). Here is proof that it can be fixed: ![Crepe]({{ '/assets/img/crepe.jpg' | relative_url }}) + +
    +Click here! +Here you can see an **expandable** section +
    From f052a6c95e24c8190842638525598705c9cb0204 Mon Sep 17 00:00:00 2001 From: Dean Attali Date: Mon, 3 Mar 2025 04:46:41 +0000 Subject: [PATCH 132/141] fix 1452: cause tables to scroll when wide --- assets/css/beautifuljekyll.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/assets/css/beautifuljekyll.css b/assets/css/beautifuljekyll.css index 5e2abcde9b57..a00e2f0f8cbc 100644 --- a/assets/css/beautifuljekyll.css +++ b/assets/css/beautifuljekyll.css @@ -831,6 +831,8 @@ nav.top-nav-short-permanent ~ header > .intro-header.big-img { table { padding: 0; + overflow-x: auto; + display: block; } table tr { border-top: 1px solid #cccccc; From 102b97fc7a77d175d6ddf9aad6b7d135ad9aa191 Mon Sep 17 00:00:00 2001 From: Dean Attali Date: Sun, 2 Mar 2025 23:50:01 -0500 Subject: [PATCH 133/141] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a03eeaabc06..e23746312e3b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ - Added `title-on-all-pages` config setting, that adds the website title to all page titles (#1272) - Change Twitter icon to X (#1193) - Upgraded font-awesome to 6.5.2 (#1330) +- Fixed tables not having a scroll bar when wider than the page (usually happened on mobile) (#1452) ## v6.0.1 (2023-06-08) From 46fc6bd4ab2f79dd4387c50a3901f9579ce6e08a Mon Sep 17 00:00:00 2001 From: Tim Angus Date: Sat, 15 Mar 2025 01:20:33 +0000 Subject: [PATCH 134/141] Add margin-bottom to social media links (#1441) --- assets/css/beautifuljekyll.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/assets/css/beautifuljekyll.css b/assets/css/beautifuljekyll.css index a00e2f0f8cbc..f2175c125669 100644 --- a/assets/css/beautifuljekyll.css +++ b/assets/css/beautifuljekyll.css @@ -440,7 +440,10 @@ footer a:focus { footer .list-inline { margin: 0; padding: 0; - margin-bottom: 1.875rem; + margin-bottom: 1.375rem; +} +footer .list-inline .list-inline-item { + margin-bottom: 0.5rem; } footer .copyright { font-family: var(--header-font); From 741acb7d36764a837ca91df8835b446a58fdbcbb Mon Sep 17 00:00:00 2001 From: Tim Angus Date: Sat, 15 Mar 2025 05:08:27 +0000 Subject: [PATCH 135/141] Add Strava social network link (#1443) --- _config.yml | 1 + _includes/social-networks-links.html | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/_config.yml b/_config.yml index afd365060315..56b424d11d0b 100644 --- a/_config.yml +++ b/_config.yml @@ -82,6 +82,7 @@ social-network-links: # gitlab: yourname # itchio: yourname # untappd: yourname +# strava: your userid # If you want your website to generate an RSS feed, provide a description # The URL for the feed will be https:///feed.xml diff --git a/_includes/social-networks-links.html b/_includes/social-networks-links.html index be42622f9f6b..d3f323a4d192 100644 --- a/_includes/social-networks-links.html +++ b/_includes/social-networks-links.html @@ -395,6 +395,18 @@
    • {%- endif -%} + {%- if network[0] == "strava" -%} +
  • + + + Strava + +
    • + {%- endif -%} + {%- endfor -%} From f29a9eea6255f6e0b4cc3fafeefa539309772258 Mon Sep 17 00:00:00 2001 From: Dean Attali Date: Sat, 15 Mar 2025 01:09:01 -0400 Subject: [PATCH 136/141] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e23746312e3b..af054b7bce37 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ - Added `author` YAML parameter to allow specifying the author(s) of a post (#1220) - Fixed bug where search results broke if a post title had a backslash (#1279) - Fixed bug where hovering over search results showed the text "{desc}" (#1156) -- Added social network links for GitLab, Bluesky, Whatsapp, Untappd (#1168, #1218, #1299, #1307) +- Added social network links for GitLab, Bluesky, Whatsapp, Untappd, Strava (#1168, #1218, #1299, #1307, #1443) - Support reddit social network link to either be a subreddit or a user (#1371) - Use CSS variables (#661) - Added instructions and example on how to fix image links in project sites (#1171) From e6c97625659c58dc8de8772fd86820b8e37d40a4 Mon Sep 17 00:00:00 2001 From: Dean Attali Date: Sat, 15 Mar 2025 01:21:45 -0400 Subject: [PATCH 137/141] Update _config.yml --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index 56b424d11d0b..a2bdf5ccb531 100644 --- a/_config.yml +++ b/_config.yml @@ -82,7 +82,7 @@ social-network-links: # gitlab: yourname # itchio: yourname # untappd: yourname -# strava: your userid +# strava: youruserid # If you want your website to generate an RSS feed, provide a description # The URL for the feed will be https:///feed.xml From 4d26620fae941123feb603e7e1c3746d5e99280e Mon Sep 17 00:00:00 2001 From: Tim Angus Date: Sun, 16 Mar 2025 12:53:32 +0000 Subject: [PATCH 138/141] Add author to RSS feed (#1442) --- feed.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/feed.xml b/feed.xml index 527816ea75fc..a39486c15b8b 100644 --- a/feed.xml +++ b/feed.xml @@ -2,7 +2,7 @@ layout: null --- - + {% if site.title %} {{ site.title | xml_escape }} @@ -16,6 +16,11 @@ layout: null {% for post in site.posts limit:20 %} {{ post.title | strip_html | xml_escape }} + {% if post.author %} + + {% elsif site.author %} + + {% endif %} {% if post.subtitle %}{{ post.subtitle | strip_html | xml_escape }} - {% endif %} {{ post.content | strip_html | xml_escape | truncatewords: excerpt_length }} From fad7e83558d72eb345422308dd4bd31aea134369 Mon Sep 17 00:00:00 2001 From: Dean Attali Date: Sun, 16 Mar 2025 08:54:27 -0400 Subject: [PATCH 139/141] Update CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index af054b7bce37..54a1c79014d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ - Change Twitter icon to X (#1193) - Upgraded font-awesome to 6.5.2 (#1330) - Fixed tables not having a scroll bar when wider than the page (usually happened on mobile) (#1452) +- Add author name to RSS feed (#1442) ## v6.0.1 (2023-06-08) From b7ab5267d9c8490c44bfec996b850e8a81e9ca4f Mon Sep 17 00:00:00 2001 From: Dean Attali Date: Sun, 16 Mar 2025 13:10:01 -0400 Subject: [PATCH 140/141] remove hardcoding of social-share-section and expose reddit option in config file; fixes #1440 --- _config.yml | 1 + assets/css/beautifuljekyll.css | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/_config.yml b/_config.yml index a2bdf5ccb531..572fd5ff5146 100644 --- a/_config.yml +++ b/_config.yml @@ -98,6 +98,7 @@ share-links-active: facebook: true linkedin: true vk: false + reddit: false # How to display the link to your website in the footer # Remove this if you don't want a link in the footer diff --git a/assets/css/beautifuljekyll.css b/assets/css/beautifuljekyll.css index f2175c125669..42c595635a4d 100644 --- a/assets/css/beautifuljekyll.css +++ b/assets/css/beautifuljekyll.css @@ -944,10 +944,6 @@ pre { margin-top: 1.875rem; } -#social-share-section a { - color: #fff; -} - /* --- Notification boxes --- */ .box-note, .box-warning, From 476d4a4144bdc62cc57f5d69f72903d299a7c0df Mon Sep 17 00:00:00 2001 From: Daniel Cazzulino Date: Sun, 23 Mar 2025 14:57:20 -0300 Subject: [PATCH 141/141] Allow development on Windows from Gemfile (#1390) --- Gemfile | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Gemfile b/Gemfile index d1d370852a7c..abae4defafe5 100644 --- a/Gemfile +++ b/Gemfile @@ -2,5 +2,15 @@ source "https://rubygems.org" +# Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem +# and associated library. +platforms :mingw, :x64_mingw, :mswin, :jruby do + gem "tzinfo", ">= 1", "< 3" + gem "tzinfo-data" +end + +# Performance-booster for watching directories on Windows +gem "wdm", "~> 0.1", :platforms => [:mingw, :x64_mingw, :mswin] + gemspec