From f731a90a096cff386a19fd8f0087ac23adde540e Mon Sep 17 00:00:00 2001 From: Dean Attali Date: Sun, 17 Jan 2021 20:33:33 -0500 Subject: [PATCH 01/81] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index e4110ad..5589161 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,8 @@ Check out [*What's New?*](https://beautifuljekyll.com/updates/) to see the lates

Sponsors 🏆

+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/) - [\_hyp3ri0n](https://hyperiongray.com) From fe0a48eea01d0351c8bff7473b5d58482da47da9 Mon Sep 17 00:00:00 2001 From: Dean Attali Date: Sun, 17 Jan 2021 22:19:17 -0500 Subject: [PATCH 02/81] Update README.md --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 5589161..8c79583 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ Developing and maintaining Beautiful Jekyll takes a lot of time and effort - tha # Build your website in 3 steps -There's a very easy way to use this theme, and there's a hard way. For most people (including myself!), I suggest going the easy route. If you're an advanced user and want to tinker with the hard way (using ruby gems), then [skip the easy way](https://github.com/daattali/beautiful-jekyll#the-hard-way-using-ruby-gems) if you know what you're doing. +There's a very easy way to use this theme, and there's a hard way. For most people (including myself!), the easy route is recommended. If you're an advanced user and want to tinker with the hard way (using ruby gems), then [skip the easy way](https://github.com/daattali/beautiful-jekyll#the-hard-way-using-ruby-gems) if you know what you're doing. ## The easy way (recommended!) @@ -72,9 +72,9 @@ Click on __*Settings*__ at the top (the cog icon) and on that page you'll have a ### 3. Customize your website settings -Edit the `_config.yml` file to change any settings you want. To edit the file, click on it to view the file and then click on the pencil icon to edit it (watch the video tutorial above if you're confused). The settings in the file are self-explanatory and I added comments inside the file to help you understand what each setting does. Any line that begins with a hashtag (`#`) is a comment, and the other lines are actual settings. +Edit the `_config.yml` file to change any settings you want. To edit the file, click on it to view the file and then click on the pencil icon to edit it (watch the video tutorial above if you're confused). The settings in the file are self-explanatory and there are comments inside the file to help you understand what each setting does. Any line that begins with a hashtag (`#`) is a comment, and the other lines are actual settings. -Note that in the video above I only edited one setting in the `_config.yml` file. **You should actually go through the rest of the settings as well. Don't be lazy, go through all the settings!** +Note that in the video above only one setting in the `_config.yml` file is edited. **You should actually go through the rest of the settings as well. Don't be lazy, go through all the settings!** ### 4. Congratulations! You have a website! @@ -88,11 +88,11 @@ If you followed the easy method above, then you already have your site and you c # Plans -Beautiful Jekyll is, and always will be, free. But if you want to remove the Beautiful Jekyll ad from your website, use a Dark Mode skin, unlock other special rewards, or simply support my development efforts, [check out the different plans](https://beautifuljekyll.com/plans). +Beautiful Jekyll is, and always will be, free. But if you want to remove the Beautiful Jekyll ad from your website, use a Dark Mode skin, unlock other special rewards, or simply support the development efforts, [check out the different plans](https://beautifuljekyll.com/plans). # Add your own content -To add pages to your site, you can either write a markdown file (`.md`) or you can write an HTML file. It's much easier to write markdown than HTML, so I suggest you do that ([here's a great tutorial](https://markdowntutorial.com/) if you need to learn markdown in 5 minutes). +To add pages to your site, you can either write a markdown file (`.md`) or you can write an HTML file. It's much easier to write markdown than HTML, so that's the recommended approach ([here's a great tutorial](https://markdowntutorial.com/) if you need to learn markdown in 5 minutes). To see an example of a markdown file, click on any file that ends in `.md`, for example [`aboutme.md`](./aboutme.md). On that page you can see some nicely formatted text (there's a word in bold, a link, a few bullet points), and if you click on the pencil icon to edit the file, you'll see the markdown code that generated the pretty text. Very easy! From 17656775873962b51ff59d6815460ab518f19674 Mon Sep 17 00:00:00 2001 From: Vincent Tam Date: Thu, 4 Feb 2021 17:28:36 +0100 Subject: [PATCH 03/81] Remove references to any public Staticman API instance (#775) --- _config.yml | 20 ++++++++++---------- assets/js/staticman.js | 2 +- staticman.yml | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/_config.yml b/_config.yml index 9644d21..0bcd2a3 100644 --- a/_config.yml +++ b/_config.yml @@ -161,19 +161,19 @@ footer-link-col: "#404040" # theme: github-light # Utterances theme # label: blog-comments # Label that will be assigned to GitHub Issues created by Utterances -# To use Staticman comments, first invite `staticmanlab` as a collaborator to your repository and -# accept the invitation by going to `https://staticman3.herokuapp.com/v3/connect/github//`. -# Then uncomment the following section and fill in "repository" and "branch". -# If you want to use reCaptcha for staticman (optional for spam protection), then fill -# in the "siteKey" and "secret" parameters below and also in `staticman.yml`. -# See more details at https://staticman.net/ +# 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 +# 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 : # (optional) URL of your own deployment, with a trailing slash eg. https:///v3/entry/github/ (will fallback to a public GitLab instance) -# reCaptcha: -# siteKey : # Use your own site key, you need to apply for one on Google -# secret : # ENCRYPT your password by going to https://staticman3.herokuapp.com/v3/encrypt/ +# endpoint : # URL of your deployment, with a trailing slash eg. "https:///v3/entry/github/" +# 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/ # --- Misc --- # diff --git a/assets/js/staticman.js b/assets/js/staticman.js index 09422a6..e8bdfbe 100644 --- a/assets/js/staticman.js +++ b/assets/js/staticman.js @@ -11,7 +11,7 @@ layout: null $(form).addClass('disabled'); {% assign sm = site.staticman -%} - var endpoint = '{{ sm.endpoint | default: "https://staticman3.herokuapp.com/v3/entry/github/" }}'; + var endpoint = '{{ sm.endpoint }}'; var repository = '{{ sm.repository }}'; var branch = '{{ sm.branch }}'; diff --git a/staticman.yml b/staticman.yml index 8fe1bad..45e939b 100644 --- a/staticman.yml +++ b/staticman.yml @@ -5,7 +5,7 @@ # To encrypt strings use the following endpoint: # https://{STATICMAN API INSTANCE}/v3/encrypt/{TEXT TO BE ENCRYPTED} # {STATICMAN API INSTANCE} should match the `endpoint` in the theme config -# file. It defaults to "staticman3.herokuapp.com". +# file. comments: # (*) REQUIRED From a0cf83da4a1c6feefd153a0932a165ae0b14e36d Mon Sep 17 00:00:00 2001 From: Dean Attali Date: Thu, 4 Feb 2021 11:30:56 -0500 Subject: [PATCH 04/81] Update CHANGELOG.md --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 60fe0e5..374c031 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,12 +2,13 @@ - 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 te same colour as the primary navbar links +- Fixed bug where navbar secondary level dropdown items didn't inherit the same colour as the primary navbar links - Fixed bug where the navbar "burger" collapsed button didn't always revert back to a light colour - Fixed bug where using an image as a navbar title did not render in GitHub Project pages that did not have a custom domain - Fixed issue where image thumbnails on the feed page were always forced into a square rather than maintaining a proper image aspect ratio - Added support for Patreon in the social network links in the footer - Fixed bug where special characters in the title led to broken share tags (#744) +- Updated staticman from using v2 (public servers) to v3 (private servers) due to the public servers becoming obsolete (#775) ## v5.0.0 (2020-09-15) From 76cd649799b3612f52228a7a10e091b377aae3cf Mon Sep 17 00:00:00 2001 From: Diksha Verma <112dikshaverma@gmail.com> Date: Wed, 24 Feb 2021 22:09:39 +0530 Subject: [PATCH 05/81] Adding option for Medium Social Link at footer (#784) --- CHANGELOG.md | 2 +- _config.yml | 1 + _includes/social-networks-links.html | 12 ++++++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 374c031..a6b3aad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ - Fixed bug where the navbar "burger" collapsed button didn't always revert back to a light colour - Fixed bug where using an image as a navbar title did not render in GitHub Project pages that did not have a custom domain - Fixed issue where image thumbnails on the feed page were always forced into a square rather than maintaining a proper image aspect ratio -- Added support for Patreon in the social network links in the footer +- Added support for Patreon and Medium in the social network links in the footer (#783) - Fixed bug where special characters in the title led to broken share tags (#744) - Updated staticman from using v2 (public servers) to v3 (private servers) due to the public servers becoming obsolete (#775) diff --git a/_config.yml b/_config.yml index 0bcd2a3..4977a08 100644 --- a/_config.yml +++ b/_config.yml @@ -45,6 +45,7 @@ social-network-links: twitter: daattali patreon: DeanAttali youtube: c/daattali +# medium: yourname # reddit: yourname # linkedin: daattali # xing: yourname diff --git a/_includes/social-networks-links.html b/_includes/social-networks-links.html index 7825aba..e2f5768 100644 --- a/_includes/social-networks-links.html +++ b/_includes/social-networks-links.html @@ -275,5 +275,17 @@ {%- endif -%} + + {%- if site.social-network-links.medium -%} +
  • + + + Medium + +
    • +{%- endif -%} From 7248ed991199e7f9419169cb3c74bd6cdc240733 Mon Sep 17 00:00:00 2001 From: Emaleth Date: Thu, 11 Mar 2021 23:33:59 +0100 Subject: [PATCH 06/81] Itch.io social link (#788) --- CHANGELOG.md | 1 + _includes/social-networks-links.html | 14 +++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a6b3aad..fa0542d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Added support for Patreon and Medium in the social network links in the footer (#783) - Fixed bug where special characters in the title led to broken share tags (#744) - Updated staticman from using v2 (public servers) to v3 (private servers) due to the public servers becoming obsolete (#775) +- Added support for Itch.io in the social network links in the footer (#788) ## v5.0.0 (2020-09-15) diff --git a/_includes/social-networks-links.html b/_includes/social-networks-links.html index e2f5768..3f799eb 100644 --- a/_includes/social-networks-links.html +++ b/_includes/social-networks-links.html @@ -276,7 +276,7 @@ {%- endif -%} - {%- if site.social-network-links.medium -%} +{%- if site.social-network-links.medium -%}
    • {%- endif -%} +{%- if site.social-network-links.itchio -%} +
  • + + + Itchio + +
    • +{%- endif -%} + From d1806ad223be02a6b9edef2d76dfdccd783acc6d Mon Sep 17 00:00:00 2001 From: Dean Attali Date: Thu, 11 Mar 2021 17:34:41 -0500 Subject: [PATCH 07/81] Update CHANGELOG.md --- CHANGELOG.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fa0542d..8645051 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,10 +6,9 @@ - Fixed bug where the navbar "burger" collapsed button didn't always revert back to a light colour - Fixed bug where using an image as a navbar title did not render in GitHub Project pages that did not have a custom domain - Fixed issue where image thumbnails on the feed page were always forced into a square rather than maintaining a proper image aspect ratio -- Added support for Patreon and Medium in the social network links in the footer (#783) +- Added support for Patreon, Medium, and Itch.io in the social network links in the footer (#783, #788) - Fixed bug where special characters in the title led to broken share tags (#744) - Updated staticman from using v2 (public servers) to v3 (private servers) due to the public servers becoming obsolete (#775) -- Added support for Itch.io in the social network links in the footer (#788) ## v5.0.0 (2020-09-15) From a531737107167728c5fc8e25a4aadbd65d47533c Mon Sep 17 00:00:00 2001 From: Ari Kalfus Date: Tue, 20 Apr 2021 00:52:34 -0400 Subject: [PATCH 08/81] Add support for Cloudflare analytics (#798) --- CHANGELOG.md | 1 + _config.yml | 3 +++ _includes/cloudflare_analytics.html | 8 ++++++++ _includes/head.html | 1 + 4 files changed, 13 insertions(+) create mode 100644 _includes/cloudflare_analytics.html diff --git a/CHANGELOG.md b/CHANGELOG.md index 8645051..efa7296 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Added support for Patreon, Medium, and Itch.io in the social network links in the footer (#783, #788) - Fixed bug where special characters in the title led to broken share tags (#744) - 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) ## v5.0.0 (2020-09-15) diff --git a/_config.yml b/_config.yml index 4977a08..8bc1f89 100644 --- a/_config.yml +++ b/_config.yml @@ -133,6 +133,9 @@ footer-link-col: "#404040" # Fill in your Google Analytics ID to track your website using Google Analytics #google_analytics: "" +# Fill in your Cloudflare Analytics beacon token to track your website using Cloudflare Analytics +#cloudflare_analytics: "" + # Google Tag Manager ID #gtm: "" diff --git a/_includes/cloudflare_analytics.html b/_includes/cloudflare_analytics.html new file mode 100644 index 0000000..bd63f8b --- /dev/null +++ b/_includes/cloudflare_analytics.html @@ -0,0 +1,8 @@ +{% if site.cloudflare_analytics %} + + + +{% endif %} diff --git a/_includes/head.html b/_includes/head.html index 730e967..cf93eda 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -44,6 +44,7 @@ {% include gtag.html %} {% include gtm_head.html %} {% include google_analytics.html %} + {% include cloudflare_analytics.html %} {% if layout.common-ext-css %} {% for css in layout.common-ext-css %} From 99fdbbd59354193e51525910eee09c855512e176 Mon Sep 17 00:00:00 2001 From: Leedan Date: Mon, 17 May 2021 15:00:46 +0800 Subject: [PATCH 09/81] Include Reddit in share options of posts (#815) --- CHANGELOG.md | 1 + _includes/social-share.html | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index efa7296..33579fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - Fixed bug where special characters in the title led to broken share tags (#744) - 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) ## v5.0.0 (2020-09-15) diff --git a/_includes/social-share.html b/_includes/social-share.html index 2091c88..c04f445 100644 --- a/_includes/social-share.html +++ b/_includes/social-share.html @@ -42,6 +42,14 @@ {% endif %} + {% if site.share-links-active.reddit %} + + + Reddit + + {% endif %} + {% endif %} From 950c341739a876b0f73de23e59839b42e8869b69 Mon Sep 17 00:00:00 2001 From: Dean Attali Date: Sun, 30 May 2021 19:54:17 +0000 Subject: [PATCH 10/81] add search to the navbar using 'post_search' config param --- CHANGELOG.md | 1 + README.md | 5 +- _config.yml | 3 ++ _includes/nav.html | 10 ++++ _includes/search.html | 39 ++++++++++++++ assets/css/beautifuljekyll.css | 95 ++++++++++++++++++++++++++++++++++ assets/js/beautifuljekyll.js | 21 ++++++++ 7 files changed, 172 insertions(+), 2 deletions(-) create mode 100644 _includes/search.html diff --git a/CHANGELOG.md b/CHANGELOG.md index 33579fe..d87419b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ ## Unreleased version +- Added search to the navbar (can be turned off in the config file) (#770) - 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/README.md b/README.md index 8c79583..28f05b4 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ # Features -Check out [*What's New?*](https://beautifuljekyll.com/updates/) to see the latest features. +__Check out [*What's New?*](https://beautifuljekyll.com/updates/) to see the latest features.__ - **SIMPLE**: The primary goal of Beautiful Jekyll is to allow literally *anyone* to create a website in a few minutes. - **Modern**: Uses the latest best practices and technologies to achieve nearly perfect scores on Google Chrome's Audit. @@ -36,8 +36,9 @@ Check out [*What's New?*](https://beautifuljekyll.com/updates/) to see the lates - **Battle-tested**: By using Beautiful Jekyll, you'll be joining 50,000+ users enjoying this theme since 2015. - **SEO and social media support**: Customize how your site looks on Google and when shared on social media. - **Comments support**: Add comments to any page using either [Disqus](https://disqus.com/), [Facebook comments](https://developers.facebook.com/docs/plugins/comments), [Utterances](https://utteranc.es/), or [Staticman](https://staticman.net). -- **Tags**: Any blog post can be tagged with keywords, and an index page showing all the tags is automatically generated. +- **Tags**: Any blog post can be tagged with keywords, and an index page is automatically generated. - **Analytics**: Easily integrate Google Analytics, or other analytics platforms, to track visits to your website. +- **Search**: Let users easily find any page using a Search button in the navigation bar. - **Photos support**: Any page can have a full-width cover photo and thumbnail. - **RSS**: An RSS feed is automatically created, so you can even host a podcast easily with Beautiful Jekyll. diff --git a/_config.yml b/_config.yml index 8bc1f89..bf1783d 100644 --- a/_config.yml +++ b/_config.yml @@ -89,6 +89,9 @@ feed_show_excerpt: true # Whether or not to show a list of tags below each post preview in the feed page feed_show_tags: true +# Add a search button to the navbar +post_search: true + # The keywords to associate with your website, for SEO purposes #keywords: "my,list,of,keywords" diff --git a/_includes/nav.html b/_includes/nav.html index ae8294e..a1adfbc 100644 --- a/_includes/nav.html +++ b/_includes/nav.html @@ -30,6 +30,14 @@ {%- endif -%} {%- endfor -%} + {% if site.post_search %} +
  • + + + Search + +
    • + {%- endif -%} @@ -50,3 +58,5 @@ {% endif %} + +{% include search.html %} diff --git a/_includes/search.html b/_includes/search.html new file mode 100644 index 0000000..7924fd0 --- /dev/null +++ b/_includes/search.html @@ -0,0 +1,39 @@ +{% if site.post_search %} + +
    + + + +
      + + + +
      + +{% endif %} diff --git a/assets/css/beautifuljekyll.css b/assets/css/beautifuljekyll.css index f53097e..719dab3 100644 --- a/assets/css/beautifuljekyll.css +++ b/assets/css/beautifuljekyll.css @@ -993,3 +993,98 @@ pre { display: block; margin: 0 auto; } + +/* Search bar */ +#beautifuljekyll-search-overlay { + display: none; + z-index: 999999; + position: fixed; + background: rgba(0,0,0,0.9); + left: 0; + right: 0; + top: 0; + bottom: 0; + text-align: center; + padding: 1rem; +} +#nav-search-exit { + position: absolute; + top: 1.5rem; + cursor: pointer; + right: 25%; + margin-right: 2rem; + color: #555; + font-size: 2rem; + line-height: 2rem; + font-weight: bold; +} +#nav-search-exit:hover { + color: #000; +} +#nav-search-input { + text-align: center; + background: #e7edee; + margin: auto; + display: block; + font-size: 2rem; + width: 50%; + transition: width 300ms ease; + color: #222; + border-radius: 5rem; + outline: none; + border: none; + padding: 0 3rem; +} +@media (max-width: 1199px) { + #nav-search-input { + width: 75%; + } + #nav-search-exit { + right: 12.5%; + } +} +@media (max-width: 767px) { + #nav-search-input { + width: 100%; + } + #nav-search-exit { + right: 0; + } +} +#nav-search-input:focus { + background: #f3f8fe; + box-shadow: 0px 0.15rem 1rem #e7f4ff; + outline: none; +} + +#nav-search-input::placeholder { + color: #777; +} + +#search-results-container { + list-style: none; + padding-left: unset; + margin-top: 1.5rem; + color: #fff; + font-size: 1.5rem; +} +#search-results-container a, +#search-results-container a:hover { + color: #fff; +} + +#nav-search-icon { + display: inline-block; +} +#nav-search-text { + display: none; +} + +@media (max-width: 1199px) { + #nav-search-icon { + display: none; + } + #nav-search-text { + display: inline-block; + } +} diff --git a/assets/js/beautifuljekyll.js b/assets/js/beautifuljekyll.js index bcddc67..48a3ada 100644 --- a/assets/js/beautifuljekyll.js +++ b/assets/js/beautifuljekyll.js @@ -27,6 +27,8 @@ var BeautifulJekyllJS = { // show the big header image BeautifulJekyllJS.initImgs(); + + BeautifulJekyllJS.initSearch(); }, initNavbar : function() { @@ -108,6 +110,25 @@ var BeautifulJekyllJS = { } else { $(".img-desc").hide(); } + }, + + initSearch : function() { + if (!document.getElementById("beautifuljekyll-search-overlay")) { + return; + } + + $("#nav-search-link").click(function(e) { + e.preventDefault(); + $("#beautifuljekyll-search-overlay").show(); + $("#nav-search-input").focus().select(); + }); + $("#nav-search-exit").click(function(e) { + e.preventDefault(); + $("#beautifuljekyll-search-overlay").hide(); + }); + $(document).on('keyup', function(e) { + if (e.key == "Escape") $("#beautifuljekyll-search-overlay").hide(); + }); } }; From 711dd39059698f422ebf1a3cdb00b161f0871b9a Mon Sep 17 00:00:00 2001 From: Dean Attali Date: Sun, 30 May 2021 16:01:56 -0400 Subject: [PATCH 11/81] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d87419b..4aae898 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ ## Unreleased version -- Added search to the navbar (can be turned off in the config file) (#770) +- 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) - 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 From fd1e03ae06c7d03f5bdd49eb688007b9e55ba273 Mon Sep 17 00:00:00 2001 From: Dean Attali Date: Sun, 30 May 2021 16:06:02 -0400 Subject: [PATCH 12/81] ui: make sure search results dont have underline until hovered --- assets/css/beautifuljekyll.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/assets/css/beautifuljekyll.css b/assets/css/beautifuljekyll.css index 719dab3..5bcc5da 100644 --- a/assets/css/beautifuljekyll.css +++ b/assets/css/beautifuljekyll.css @@ -1068,9 +1068,13 @@ pre { color: #fff; font-size: 1.5rem; } -#search-results-container a, +#search-results-container a { + color: #fff; + text-decoration: none; +} #search-results-container a:hover { color: #fff; + text-decoration: underline; } #nav-search-icon { From 30a757de4741301dfefb2b20630eb5dece98b97a Mon Sep 17 00:00:00 2001 From: Dean Attali Date: Sun, 30 May 2021 20:19:44 +0000 Subject: [PATCH 13/81] search feature: make sure page scrollbar disappears when searching but a scrollbar for search items shows if needed --- assets/css/beautifuljekyll.css | 2 ++ assets/js/beautifuljekyll.js | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/assets/css/beautifuljekyll.css b/assets/css/beautifuljekyll.css index 5bcc5da..4e809c4 100644 --- a/assets/css/beautifuljekyll.css +++ b/assets/css/beautifuljekyll.css @@ -1067,6 +1067,8 @@ pre { margin-top: 1.5rem; color: #fff; font-size: 1.5rem; + max-height: calc(100vh - 6.5rem); + overflow-y: auto; } #search-results-container a { color: #fff; diff --git a/assets/js/beautifuljekyll.js b/assets/js/beautifuljekyll.js index 48a3ada..4a7ab7f 100644 --- a/assets/js/beautifuljekyll.js +++ b/assets/js/beautifuljekyll.js @@ -121,13 +121,18 @@ var BeautifulJekyllJS = { e.preventDefault(); $("#beautifuljekyll-search-overlay").show(); $("#nav-search-input").focus().select(); + $("body").addClass("overflow-hidden"); }); $("#nav-search-exit").click(function(e) { e.preventDefault(); $("#beautifuljekyll-search-overlay").hide(); + $("body").removeClass("overflow-hidden"); }); $(document).on('keyup', function(e) { - if (e.key == "Escape") $("#beautifuljekyll-search-overlay").hide(); + if (e.key == "Escape") { + $("#beautifuljekyll-search-overlay").hide(); + $("body").removeClass("overflow-hidden"); + } }); } }; From 419ade4a35ca37f4b14ae42f222f0f39880c17d3 Mon Sep 17 00:00:00 2001 From: Dean Attali Date: Wed, 25 Aug 2021 15:20:56 -0400 Subject: [PATCH 14/81] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 28f05b4..e633837 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 15/81] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e633837..66c6c13 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 16/81] add loadview sponsor --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 66c6c13..26f2a50 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 17/81] 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 e8bdfbe..b52708f 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 18/81] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4aae898..595251c 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 19/81] 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 595251c..90b6b9b 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 4e809c4..2b15f07 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 20/81] 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 90b6b9b..b853162 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 4c299b6..aa35a7a 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 @@
      -

      {% 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 7924fd0..becf37b 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 c04f445..4a7ca01 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 c97b27f..806aa7c 100644 --- a/_layouts/home.html +++ b/_layouts/home.html @@ -35,11 +35,11 @@ layout: page {% endif %} -

      {{ post.title }}

      +

      {{ post.title | strip_html }}

      {% if post.subtitle %}

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

      {% endif %}       @@ -68,7 +68,7 @@ layout: page
      {% 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 5358515..70d5ee4 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -67,12 +67,12 @@ layout: base 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 b9b550a..e8679f4 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 4ac869f..5c22376 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 57f7ad5..6148cf1 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 04c1939..55a3c6d 100644 --- a/tags.html +++ b/tags.html @@ -25,7 +25,7 @@ title: 'Tag Index'
      {%- 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 21/81] 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 e8679f4..b3ad9e3 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 5c22376..bf6c9a5 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 22/81] 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 b853162..8401feb 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 bf1783d..5270a9e 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 cf93eda..ac3e134 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 3f799eb..ac1599d 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 32/81] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 55b6539..e92cb3d 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 33/81] 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 617d9b7..2b8dc2b 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 38/81] 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 0a4d243..fa03af2 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 39/81] 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 4fb5aa9..9ea0b4a 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 cec2e84..8ca4c6d 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 40/81] add news item for hacerrank --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fa03af2..402abdb 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 41/81] 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 | 142 +++++++++++++++++---------------- assets/css/beautifuljekyll.css | 8 ++ 2 files changed, 83 insertions(+), 67 deletions(-) diff --git a/_layouts/home.html b/_layouts/home.html index 806aa7c..cab91a5 100644 --- a/_layouts/home.html +++ b/_layouts/home.html @@ -6,88 +6,96 @@ layout: page {% 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 %} - {% endcapture %} - {% assign thumbnail=thumbnail | strip %} - - {% if site.feed_show_excerpt == false %} - {% if thumbnail != "" %} -
        - - Post thumbnail - -
        - {% endif %} - {% endif %} - - -

        {{ post.title | strip_html }}

        - - {% if post.subtitle %} -

        - {{ post.subtitle | strip_html }} -

        {% endif %} -         -

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

        + +

        {{ post.title | strip_html }}

        - {% if thumbnail != "" %} -
        - - Post thumbnail + {% if post.subtitle %} +

        + {{ post.subtitle | strip_html }} +

        + {% endif %}         -
        - {% endif %} - {% unless site.feed_show_excerpt == false %} - {% if thumbnail != "" %} -
        - - Post thumbnail - -
        - {% endif %} +

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

        -
        - {% 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 thumbnail != "" %} +
        + + Post thumbnail + +
        {% endif %} -
        - {% endunless %} - {% if site.feed_show_tags != false and post.tags.size > 0 %} -
        - Tags: - {% for tag in post.tags %} - {{- tag -}} - {% endfor %} -
        - {% 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 %} + + {% 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 %}