diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index c47404468926..fb01171151fd 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,3 +1,4 @@ # These are supported funding model platforms github: daattali +patreon: DeanAttali diff --git a/.github/issue_template.md b/.github/issue_template.md index b3a4ca817b88..2e25e5c9e57e 100644 --- a/.github/issue_template.md +++ b/.github/issue_template.md @@ -1 +1,3 @@ -Please only submit feature suggestions or bug reports if you believe something is broken. Please do not submit support requests and general help questions. +Please only submit feature suggestions or bug reports if you believe something is broken. + +If you need help, you can attend the [Office Hours](https://beautifuljekyll.com/officehours) (only available for [sponsors](https://beautifuljekyll.com/plans/)). diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dcb9d5a3b73a..c3573a9d8478 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,11 +5,11 @@ jobs: name: Build Jekyll runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - name: Build the site in the jekyll/builder container - run: | - export JEKYLL_VERSION=3.8 - docker run \ - -v ${{ github.workspace }}:/srv/jekyll -v ${{ github.workspace }}/_site:/srv/jekyll/_site \ - -e PAGES_REPO_NWO=${{ github.repository }} \ - jekyll/builder:$JEKYLL_VERSION /bin/bash -c "chmod 777 /srv/jekyll && jekyll build --future" + - uses: actions/checkout@v4 + - uses: ruby/setup-ruby@v1 + with: + ruby-version: '3.3' + - name: Install dependencies + run: bundle install && bundle exec appraisal install + - name: Build site + run: bundle exec appraisal jekyll build --future diff --git a/404.html b/404.html index 340fe9e48581..9bdd8eae7ec9 100644 --- a/404.html +++ b/404.html @@ -9,5 +9,5 @@

Whoops, this page doesn't exist.

Move along. (404 error)


- + Not found diff --git a/Appraisals b/Appraisals new file mode 100644 index 000000000000..dac8cfe0ffb0 --- /dev/null +++ b/Appraisals @@ -0,0 +1,6 @@ +appraise "jekyll-3" do + gem "jekyll", "3.9.4" +end +appraise "jekyll-4" do + gem "jekyll", "4.3.3" +end diff --git a/CHANGELOG.md b/CHANGELOG.md index edb1cbbb56f7..ca56a4255209 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,51 +1,162 @@ -## v4.0.1 2020-07-13 +## Unreleased version +- BREAKING CHANGE: Allow changing the order of the social network links that appear in the footer (#1152) +- BREAKING CHANGE: `google-scholar` social network link no longer requires the prefix `citations?user=`; if you previously set this parameter, it needs to be updated (#1189) +- Added `mathjax` YAML parameter to allow support for MathJax, used to write LaTeX expressions (#195) +- 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 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) +- Added `title-on-all-pages` config setting, that adds the website title to all page titles (#1272) + +## v6.0.1 (2023-06-08) + +This version has been in the works for a few years. It includes several new features that were highly requested, numerous bug fixes, new documentation, and aggresively encourages migrating from the old Google Universal Analytics to the new Analytics 4. + +#### Breaking changes + +- As of July 2023, Google Universal Analytics is going away and being replaced by Google Analytics 4. Beautiful Jekyll sites that still use the old analytics tag will show a warning to encourage them to move to Analytics 4 (#1096). +- 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. + +#### New parameters and settings + +- Added `navbar-var-length` config setting that allows the navigation menu to be the same length as the longest sub-menu, so that long words in the submenu are not cut off (#765) +- Added `post_search` config setting that creates a Search button in the navbar (#770) +- Added `edit_page_button` config setting that adds a "Edit page" button to the footer (to edit the current page on GitHub) (#1004) +- Added `footer-hover-col` config setting to customize the hover colour of links in the footer (#848) + +#### New features and improvements + +- Made the home page feed more accessible for screen readers (#950) +- Added support for giscus comments (#886) and CommentBox (#960) +- Added support for Cloudflare Analytics (#797) +- Added Reddit in share options of posts (#815) + +#### Bug fixes + +- Fixed page titles, subtitles, and excerpts rendering correctly when there are special characeters in them (#856) +- 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 bug where image thumbnails on the feed page were always forced into a square rather than maintaining a proper image aspect ratio +- Fixed bug where special characters in the title led to broken share tags (#744) +- 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) + +#### Small changes + +- Updated staticman from using v2 (public servers) to v3 (private servers) due to the public servers becoming obsolete (#775) +- Added social network links for Patreon, Medium, Itch.io, Discord, Kaggle, Hackerrank (#783, #788, #907, #961, #978) +- 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 + + +## v5.0.0 (2020-09-15) + +One of the major changes in this version is that a lot of time was spent on rethinking the entire SEO and social media sharing model (how a page looks on eg. Google, Twitter, Facebok). It was redesigned to be more simple and customizable. The new documentation has a section dedicated to SEO and social media sharing of a page. Unfortunately some changes that are not backwards-compatible had to be made. + +#### Breaking changes + +- Renamed `description` YAML parameter to `share-description` to be more clear +- Renamed `description` config setting to `rss-description` since it was only used in RSS (the FAQ explains the difference between YAML parameters and config settings if you're confused) +- Removed YAML parameter `use-site-title` (you can now specify the exact title using `share-title`) +- Removed undocumented YAML parameters `meta-title` and `meta-description` +- Removed `link-tags` config setting because it wasn't necessary. If you use tags, there will now always be a tags page created; if you don't use tags there won't be a tags page. +- The YAML parameter `show-avatar` is now true by default. This has always been the case for GitHub Pages users, but not for `remote_theme` users. For consistency, it's now the default for everyone. (#715) + +#### New parameters and settings + +- Added `full-width` YAML parameter to allow having full-width pages +- Added `feed_show_excerpt` config setting to show/hide the post excerpts on the feed page +- Added `feed_show_tags` config setting to show/hide the list of tags on post previews on the feed page +- Added `share-title` YAML parameter to give control over the search engine/social media title +- Added `last-updated` YAML parameter to show a "Last Updated on" date for blog posts +- Added `before-content` and `after-content` YAML parameters that allow you to add some common HTML before the main content of a page (below the title) or after the main content (above the footer). Works in a similar way to `footer-extra`. +- Added `head-extra` YAML parameter which is similar to `footer-extra` but is used to include custom HTML code in a page's `` tag +- Added `site-js` config setting to provide JavaScript files that are used on all pages in the site + +#### New features and improvements + +- Improved the `footer-extra` YAML parameter to support multiple files instead of only a single file +- Added automatic navbar color detection (#702) +- When `nav-short` is turned on, the avatar will also be shorter +- Changed navbar and footer background colour to be slightly darker, for better contrast with the default white page background for accessibility reasons +- Changed the behaviour of `site-css` to include site-wide CSS file **before** instead of after page-specific files +- Renamed internal css/js files from "main" to "beautifuljekyll" to make it easier for users to troubleshoot +- Added alt text to all images for better accessibility +- Made thumbnail images square instead of circles, as users reported that circles cut off important parts of images + +#### Bug fixes + +- Fixed rendering issues with `nav-short` parameter that caused the body of the page to start too low +- Fixed some CSS styles that broke during the bootstrap 4 migration (#716) + +#### Library upgrades + +- Upgraded kramdown to version 2.3.0 to fix security issues +- Upgraded jQuery to version 3.5.1 to fix a couple security vulnerabilities with the previous version + +## v4.1.0 (2020-08-08) + +- Added Open Graph `site_name` meta field to pages automatically +- Added `text-col` config setting for main text color (#694) +- Added `keywords` config setting to set the meta keywords on all pages (for SEO purposes) (#691) +- Added `mobile-theme-col` config setting to allow a mobile theme colour (#692) +- Added `site-css` config setting in the config file to provide CSS files that are used on all pages in the site (#695) +- Added YAML parameter `description`: creates the meta description on a page, intended to provide a brief description of the page for search engines and when the page is shared (#690) + +## v4.0.1 (2020-07-13) - Fixed staticman comments UI that was broken since the migration to bootstrap 4 -## v4.0.0 2020-07-12 +## v4.0.0 (2020-07-12) - **BREAKING CHANGE** Replace `image` YAML parameter with `thumbnail-img` to be more clear -- **MAJOR BEHAVIOUR CHANGE** Don't use the thumbnail as the avatar image +- **MAJOR BEHAVIOUR CHANGE** Don't use the thumbnail as the avatar image - Cover image will automatically be used as thumbnail if none is provided - Image to share on social media will use the cover image or thumbnail if none is provided - All images (social media share, thumbnail, cover) can use either relative or absoluate paths. - Fixed issue where if a dropdown menu was the last item in the menu bar, it did not have a proper margin on the right -- Add social network links: Mastodon (#646), Google Scholar, ORCID (#670) -- Add support for sharing pages on new social network: VK (#657) +- Added social network links: Mastodon (#646), Google Scholar, ORCID (#670) +- Added support for sharing pages on new social network: VK (#657) - Use Open Graph type 'article' for blog posts (#669) - Use Twitter's large sumary card (large image) when there is a cover image, thumbnail image, or share image specified (#668) -- Make post images in the feed page smaller on smaller devices +- Made post images in the feed page smaller on smaller devices - Fixed jQuery version in staticman (#671) -## v3.0.0 2020-05-07 +## v3.0.0 (2020-05-07) - **BREAKING CHANGE** Upgraded from Bootstrap 3.3.2 to 4.4.1. This involved a major rewrite of most components. This shouldn't affect any users unless you have custom HTML/CSS code which the new Bootstrap could have broken. - **BREAKING CHANGE** Renamed `bigimg` YAML parameter to `cover-img` - **BREAKING CHANGE** Removed `googlefonts` YAML parameter since googlefonts are just CSS so they can be loaded via `ext-css` - **BREAKING CHANGE** Upgraded from jQuery 1.11.2 to 3.4.2. This should not affect most people - Added `navbar-border-col` setting in the config file -- Add accessibility features where possible +- Added accessibility features where possible - Made the theme completely responsive by rewriting all CSS to use 'rem' instead of 'px' -- Rewrite and simplify some JavaScript code to use CSS or Bootstrap alternatives that weren't available in 2015 -- Remove most of the sample posts so that users only have two sample posts to learn from +- Rewrote and simplified some JavaScript code to use CSS or Bootstrap alternatives that weren't available in 2015 +- Removed most of the sample posts so that users only have two sample posts to learn from - Improvements to the README instructions -## v2.3.0 2020-04-29 +## v2.3.0 (2020-04-29) -- Add YAML option `footer-extra` for including custom content in the footer -- Fix issue: linking to a specific part of a page resulted in scrolling too far (#69) -- Add YAML option `nav-short` to have navbar permanently collapsed -- Add social network link: Calendly -- Fix bug where RSS link in footer was showing even when turned off +- Added YAML parameter `footer-extra` for including custom content in the footer +- Fixed issue: linking to a specific part of a page resulted in scrolling too far (#69) +- Added YAML parameter `nav-short` to have navbar permanently collapsed +- Added social network link: Calendly +- Fixed bug where RSS link in footer was showing even when turned off -## v2.2.0 2020-04-27 +## v2.2.0 (2020-04-27) -- Add social network link: Telegram (#625) (thanks @mashed-potatoes) -- Moved the demo site to an independent URL: https://beautifuljekyll.com -- Major documentation overhaul and cleanup of old files -- Fix a few bugs from the remote_theme migration +- Added social network link: Telegram (#625) (thanks @mashed-potatoes) +- Moved the demo site to an independent URL: https://beautifuljekyll.com +- Major documentation overhaul and cleanup of old files +- Fixed a few bugs from the remote_theme migration -## v2.0.0 2020-04-26 +## v2.0.0 (2020-04-26) - Beautiful-Jekyll v2.0.0 available as an official Ruby gem - Beautifull-Jekyll now supports the `remote_theme` config (#339) (thanks @gpotter2 and @skalee) @@ -130,3 +241,4 @@ ... Many small changes because the site was in its infancy **2015-03-12** Beautiful Jekyll version 0.0000001 is released! + diff --git a/LICENSE b/LICENSE index 27e2cdf65595..0b6ae57226ca 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020 Dean Attali +Copyright (c) 2023 Dean Attali Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index b823c5d0b47c..a61b233efd2b 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,4 @@ I have created this website using Beatiful Jekyll as the static site generator. It is very easy to set it up and get it running (Thanks to Dean for that). You can find it [here](https://beautifuljekyll.com) to create your own website similar to this -Please feel free to checkout the actual website at [skulshreshta.github.io](https://skulshreshtha.github.io/) \ No newline at end of file +Please feel free to checkout the actual website at [skulshreshta.github.io](https://skulshreshtha.github.io/) diff --git a/_config.yml b/_config.yml index 06315c20698d..998110580a4b 100644 --- a/_config.yml +++ b/_config.yml @@ -1,20 +1,30 @@ -# --- Basic options --- # +########################################################### +### Welcome to Beautiful Jekyll! +### This config file is meant for settings that affect your entire website. When you first +### set up your website you should go through all these settings and edit them, but after +### the initial set up you won't need to come back to this file often. +########################################################### + +############################ +# --- Required options --- # +############################ # Name of website title: Shobhit Kulshreshtha -# Short description of your site -description: Strategy Consultant | Data Scientist | Product Enthusiast - # Your name to show in the footer author: Shobhit Kulshreshtha +############################################### # --- List of links in the navigation bar --- # +############################################### navbar-links: About: "about" +################ # --- Logo --- # +################ # Image to show in the navigation bar - works best with a square image # Remove this parameter if you don't want an image in the navbar @@ -23,7 +33,7 @@ avatar: "/assets/img/my_pp.jpeg" # By default, the image is cut into a circle. You can disable this behaviour by setting 'round-avatar: false' round-avatar: true -# If you want to have an image logo in the top-left corner instead of the title text, +# If you want to have an image logo in the top-left corner instead of having the title of the website, # then specify the following parameter title-img: /assets/img/logo_sk.png @@ -31,36 +41,54 @@ title-img: /assets/img/logo_sk.png future: true -# --- Footer options --- # +##################################### +# --- Footer social media links --- # +##################################### # Select the social network links that you want to show in the footer. +# You can change the order that they show up on the page by changing the order here. # Uncomment the links you want to show and add your information to each one. -# If you don't want to show a link to an RSS feed, set rss to "false". social-network-links: email: "kulshreshtha.shobhit@gmail.com" - facebook: skul210 + # facebook: skul210 github: skulshreshtha -# twitter: daattali - rss: true -# reddit: yourname + rss: true # remove this line if you don't want to show an RSS link at the bottom + # twitter: daattali + # patreon: DeanAttali + # youtube: "@daattali" + # whatsapp: 15551212 + # medium: yourname + # reddit: yourname linkedin: shobhit-kulshreshtha -# xing: yourname -# stackoverflow: "3943160/daattali" -# snapchat: deanat78 -# instagram: deanat78 -# youtube: user/deanat78 -# spotify: yourname -# telephone: +14159998888 -# steam: deanat78 -# twitch: yourname -# yelp: yourname -# telegram: yourname -# calendly: yourname -# mastodon: instance.url/@username -# ORCID: your ORCID ID -# google-scholar: your google scholar - + # xing: yourname + # stackoverflow: "3943160/daattali" + # snapchat: deanat78 + # instagram: deanat78 + # spotify: yourname + # telephone: +14159998888 + # steam: deanat78 + # twitch: yourname + # yelp: yourname + # telegram: yourname + # calendly: yourname + # mastodon: instance.url/@username + # bluesky: yourname + # ORCID: your ORCID ID + # google-scholar: your google scholar + # discord: "invite_code" or "users/userid" or "invite/invite_code" + # kaggle: yourname + # hackerrank: yourname + # gitlab: yourname + # itchio: yourname + # untappd: yourname + +# 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: Collection of posts and thoughts by Shobhit Kulshreshtha + +########################### # --- General options --- # +########################### # Select which social network share links to show in posts share-links-active: @@ -73,40 +101,79 @@ share-links-active: # Remove this if you don't want a link in the footer # url-pretty: "skulshreshtha.github.io" -# Create a "tags" index page and make tags on each post clickable -link-tags: true +# Add the website title to the title of every page +title-on-all-pages: true -# Excerpt Word Length - Truncates the excerpt to the specified number of words on the index page +# Excerpt word length - Truncate the excerpt of each post on the feed page to the specified number of words excerpt_length: 50 +# Whether or not to show an excerpt for every blog post in the feed page +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 + +# Add a button in the footer to edit the current page. Only works if your website is hosted on GitHub +edit_page_button: true + +# Allow sub-menu items (second-level navigation menu items) to be longer than the top-level menu +# If this setting is off, then long sub-menu words might get cut off +# See https://github.com/daattali/beautiful-jekyll/issues/765 to understand the issue this setting can solve +navbar-var-length: false + +# The keywords to associate with your website, for SEO purposes +#keywords: "my,list,of,keywords" + +###################################### # --- Colours / background image --- # +###################################### -# Personalize the colors in your website. Colour values can be any valid CSS colour +# Personalize the colours in your website. Colour values can be any valid CSS colour -navbar-col: "#F5F5F5" -navbar-text-col: "#404040" -navbar-border-col: "#EAEAEA" page-col: "#FFFFFF" +text-col: "#404040" link-col: "#008AFF" hover-col: "#30BEB7" footer-col: "#F5F5F5" +navbar-col: "#EAEAEA" +navbar-text-col: "#404040" +navbar-border-col: "#DDDDDD" footer-text-col: "#777777" footer-link-col: "#404040" +footer-hover-col: "#0085A1" -# Alternatively, the navbar, footer, and page background can be set to use background images +# Alternatively, the navbar, footer, and page background can be set to an image # instead of colour #navbar-img: "/assets/img/bgimage.png" #footer-img: "/assets/img/bgimage.png" #page-img: "/assets/img/bgimage.png" -# --- Web Statistics Section --- # +# Suggest a colour for mobile browsers to use as the browser's theme. This is only supported by a few mobile browsers. +#mobile-theme-col: "#0085A1" -# Fill in your Google Analytics gtag.js ID to track your website using gtag -#gtag: "" +# For any extra visual customization, you can include additional CSS files in every page on your site. List any custom CSS files here +#site-css: +# - "/assets/css/custom-styles.css" # Fill in your Google Analytics ID to track your website using GA -google_analytics: "UA-170283072-1" +# google_analytics: "UA-170283072-1" +# If you have common JavaScript files that should be included in every page, list them here +#site-js: +# - "/assets/js/custom-script.js" + +################################# +# --- Web Analytics Section --- # +################################# + +# Fill in your Google Analytics tag ID (or "Measurement ID") to track your website usage +#gtag: "G-XXXXXXXXXX" + +# Fill in your Cloudflare Analytics beacon token to track your website using Cloudflare Analytics +#cloudflare_analytics: "" # Google Tag Manager ID gtm: "GTM-PPDRSV6" @@ -119,7 +186,14 @@ gtm: "GTM-PPDRSV6" # uri: "demo.wiki.pro" # opt-out: true +# Google Universal Analytics ID -- deprecated +# As of July 2023 this is no longer supported by Google! If you are still using `google_analytics`, +# you should switch to using the `gtag` field above instead. +#google_analytics: "UA-XXXXXXXX-X" + +#################### # --- Comments --- # +#################### # To use Disqus comments, sign up to https://disqus.com and fill in your Disqus shortname (NOT the userid) disqus: "d-d-c" @@ -127,6 +201,9 @@ disqus: "d-d-c" # To use Facebook Comments, create a Facebook app and fill in the Facebook App ID #fb_comment_id: "" +# To use CommentBox, sign up for a Project ID on https://commentbox.io +#commentbox: "" # Project ID, e.g. "5694267682979840-proj" + # To use Utterances comments: (0) uncomment the following section, (1) fill in # "repository" (make sure the repository is public), (2) Enable Issues in your repository, # (3) Install the Utterances app in your repository https://github.com/apps/utterances @@ -137,25 +214,39 @@ disqus: "d-d-c" # 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/ + +# To use giscus comments: +# (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 +# 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 +# repository: # GitHub username/repository eg. "daattali/beautiful-jekyll" +# repository-id: # ID of your repository, retrieve this info from https://giscus.app +# category: Announcements # Category name of your GitHub Discussion posts +# category-id: # ID of your category, retrieve this info from https://giscus.app +# mapping: pathname +# reactions-enabled: 1 +# emit-metadata: 0 +# theme: light + +################ # --- Misc --- # - -# Character used to separate site title and description in HTML document title -# and RSS feed title -title-separator: "-" +################ # Ruby Date Format to show dates of posts date_format: "%B %-d, %Y" @@ -163,8 +254,9 @@ date_format: "%B %-d, %Y" # Facebook App ID #fb_app_id: "" - +################################################################################# # --- You don't need to touch anything below here (but you can if you want) --- # +################################################################################# # Output options (more information on Jekyll's site) timezone: "Asia/Kolkata" @@ -189,10 +281,9 @@ defaults: readtime: true # add estimated reading time on all blog posts - scope: - path: "" # all files + path: "" # any file that's not a post will be a "page" layout by default values: layout: "page" - show-avatar: true # Exclude these files from production site exclude: @@ -211,3 +302,4 @@ plugins: # Beautiful Jekyll / Dean Attali # 2fc73a3a967e97599c9763d05e564189 + diff --git a/_data/ui-text.yml b/_data/ui-text.yml index 045513067e92..551f9953ac62 100644 --- a/_data/ui-text.yml +++ b/_data/ui-text.yml @@ -487,7 +487,7 @@ pa: &DEFAULT_PA comment_success_msg : "ਤੁਹਾਡੀਆਂ ਟਿੱਪਣੀਆਂ ਲਈ ਧੰਨਵਾਦ! ਇਹ ਮਨਜ਼ੂਰੀ ਮਿਲਣ ਦੇ ਬਾਅਦ ਸਾਈਟ 'ਤੇ ਦਿਖਾਇਆ ਜਾਵੇਗਾ।" comment_error_msg : "ਮੁਆਫ ਕਰਨਾ, ਤੁਹਾਡੀ ਅਧੀਨਗੀ ਵਿੱਚ ਕੋਈ ਗਲਤੀ ਹੋਈ ਸੀ ਕਿਰਪਾ ਕਰਕੇ ਯਕੀਨੀ ਬਣਾਓ ਕਿ ਸਾਰੇ ਲੋੜੀਂਦੇ ਖੇਤਰ ਪੂਰੇ ਹੋ ਗਏ ਹਨ ਅਤੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।" pa-IN: - <<: *DEFAULT_PA + <<: *DEFAULT_PA # Another locale # -------------- diff --git a/_includes/cloudflare_analytics.html b/_includes/cloudflare_analytics.html new file mode 100644 index 000000000000..bd63f8b27bb7 --- /dev/null +++ b/_includes/cloudflare_analytics.html @@ -0,0 +1,8 @@ +{% if site.cloudflare_analytics %} + + + +{% endif %} diff --git a/_includes/commentbox.html b/_includes/commentbox.html new file mode 100644 index 000000000000..e8019dadef62 --- /dev/null +++ b/_includes/commentbox.html @@ -0,0 +1,7 @@ +{% if site.commentbox %} + +
+ + + +{% endif %} diff --git a/_includes/comments.html b/_includes/comments.html index 5afdf393bca7..66242332a143 100644 --- a/_includes/comments.html +++ b/_includes/comments.html @@ -1,6 +1,8 @@ -{% if page.comments %} +{% if page.comments %} {% include disqus.html %} {% include fb-comment.html %} {% include staticman-comments.html %} {% include utterances-comment.html %} -{% endif %} \ No newline at end of file + {% include giscus-comment.html %} + {% include commentbox.html %} +{% endif %} diff --git a/_includes/footer-minimal.html b/_includes/footer-minimal.html index c6a5af5533aa..66b295a71db4 100644 --- a/_includes/footer-minimal.html +++ b/_includes/footer-minimal.html @@ -12,7 +12,7 @@ {% if site.url-pretty %}   •   - {{ site.url-pretty }} + {{ site.url-pretty }} {% endif %} diff --git a/_includes/footer-scripts.html b/_includes/footer-scripts.html index a87f0bed3cc0..bca6aede133f 100644 --- a/_includes/footer-scripts.html +++ b/_includes/footer-scripts.html @@ -19,6 +19,12 @@ {% endfor %} {% endif %} +{% if site.site-js %} + {% for js in site.site-js %} + + {% endfor %} +{% endif %} + {% if page.ext-js %} {% for js in page.ext-js %} {% include ext-js.html js=js %} diff --git a/_includes/footer.html b/_includes/footer.html index 91ff90d19a40..9bfaf547a326 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -5,7 +5,9 @@ {% include social-networks-links.html %} {% if page.footer-extra %}
- {% include {{ page.footer-extra }} %} + {% for file in page.footer-extra %} + {% include {{ file }} %} + {% endfor %}
{% endif %}

@@ -17,7 +19,9 @@ {% if site.url-pretty %}  •  - {{ site.url-pretty }} + + {{ site.url-pretty }} + {% endif %} {% if site.matomo %} @@ -26,12 +30,17 @@ Do-not-Track {% endif %} {% endif%} + + {% if site.edit_page_button and site.github.repository_url %} +  •  + Edit page + {% endif%} +

- -

- Theme by - beautiful-jekyll -

+ {% unless site.remove-ads %}

+ Powered by + Beautiful Jekyll +

{% endunless %} diff --git a/_includes/giscus-comment.html b/_includes/giscus-comment.html new file mode 100644 index 000000000000..b6e7fa164215 --- /dev/null +++ b/_includes/giscus-comment.html @@ -0,0 +1,16 @@ +{% if site.giscus.repository and site.giscus.hostname %} + + + +{% endif %} diff --git a/_includes/google_analytics.html b/_includes/google_analytics.html index 01f74066310d..6fb0698c93b4 100644 --- a/_includes/google_analytics.html +++ b/_includes/google_analytics.html @@ -1,5 +1,17 @@ {% if site.google_analytics %} +{% unless site.gtag %} +
+
×
+
+ This website is using outdated Google Analytics +
+ More info + As of July 2023, Google's Universal Analytics is going away and being replaced by Google Analytics 4. This website is still using the old Universal Analytics. In order to remove this message, the website owner must remove the google_analytics property in the website's config file, and optionally replace it with the new gtag property. +
+
+
+{% endunless %} + +{% endif %} diff --git a/_includes/nav.html b/_includes/nav.html index 1fed7f83c466..8293ca2e0962 100644 --- a/_includes/nav.html +++ b/_includes/nav.html @@ -1,9 +1,9 @@ -