From 1e3cb374998a807dd6a7a941c4efd6401f53fd2b Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Tue, 15 Sep 2026 17:34:21 +0300 Subject: [PATCH 01/28] Remove unused layout code Drop the navigation option, site subtitle and RTL styles. --- _config.yml | 9 +-------- src/_includes/header.html | 6 +----- src/_layouts/default.html | 31 +++++++------------------------ src/_sass/_base.scss | 32 -------------------------------- 4 files changed, 9 insertions(+), 69 deletions(-) diff --git a/_config.yml b/_config.yml index 5d23da7..83c4cf6 100644 --- a/_config.yml +++ b/_config.yml @@ -1,6 +1,5 @@ -# Site title and subtitle. This is used in _includes/header.html +# Site title, used in _includes/header.html title: BleachBit Documentation -#subtitle: 'Documentation for BleachBit' url: "https://docs.bleachbit.org" # if you wish to integrate disqus on pages set your shortname here @@ -9,12 +8,6 @@ disqus_shortname: '' # if you use google analytics, add your tracking id here google_analytics_id: '' -# Enable/show navigation. There are there options: -# 0 - always hide -# 1 - always show -# 2 - show only if docs are present -navigation: 2 - # URL to source code, used in _includes/footer.html #codeurl: 'https://github.com/bruth/jekyll-docs-template' diff --git a/src/_includes/header.html b/src/_includes/header.html index 89ab61f..9226d06 100644 --- a/src/_includes/header.html +++ b/src/_includes/header.html @@ -1,8 +1,4 @@ -

{{ site.title }} -{%- if site.subtitle %} - {{ site.subtitle }} -{%- endif %} -

+

{{ site.title }}

Main site | Download diff --git a/src/_layouts/default.html b/src/_layouts/default.html index 93fb046..839a24f 100644 --- a/src/_layouts/default.html +++ b/src/_layouts/default.html @@ -3,9 +3,6 @@ - {%- if site.subtitle %} - - {%- endif %} @@ -21,34 +18,20 @@

- {%- assign doc_count = site.docs | size %} - {%- if site.navigation != 0 and site.navigation == 1 or doc_count > 0 %} - + -
- {{ content }} -
- {%- else %} -
- {{ content }} -
- {%- endif %} +
+ {{ content }} +
{%- if page.disqus == 1 %}
- {%- if site.navigation == 1 or doc_count > 0 %} - -
- {% include disqus.html %} -
- {%- else %} -
+
{% include disqus.html %}
- {%- endif %}
{%- endif %} diff --git a/src/_sass/_base.scss b/src/_sass/_base.scss index 9c5a625..e3075bf 100644 --- a/src/_sass/_base.scss +++ b/src/_sass/_base.scss @@ -108,14 +108,6 @@ h2 { } } -#content > .page-header:first-child { - margin-top: 0; - - h2 { - margin-top: 0; - } -} - /* ── Code ──────────────────────────────────────────────────── */ pre, code { border: none; @@ -193,30 +185,6 @@ blockquote { text-align: center; } -/* ── RTL support ───────────────────────────────────────────── */ -body.rtl { - direction: rtl; - - #header .brand { - float: right; - margin-left: 5px; - } - - .row-fluid [class*="span"] { - float: right !important; - margin-left: 0; - margin-right: 2.564102564102564%; - - &:first-child { - margin-right: 0; - } - } - - ul, ol { - margin: 0 25px 10px 0; - } -} - /* ── Copy button ───────────────────────────────────────────── */ div.highlighter-rouge { position: relative; From bbd2195d2232aeb74a424320b0418b0d26b96f7b Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Tue, 15 Sep 2026 17:35:01 +0300 Subject: [PATCH 02/28] Use front matter defaults for the docs layout --- _config.yml | 7 +++++++ bin/jekyll-page | 1 - src/_docs/audit.md | 1 - src/_docs/chaff.md | 1 - src/_docs/cleanerml.md | 1 - src/_docs/command-line-interface.md | 1 - src/_docs/contributing.md | 1 - src/_docs/cookie-manager.md | 1 - src/_docs/expert-mode.md | 1 - src/_docs/finding-files-to-delete.md | 1 - src/_docs/frequently-asked-questions.md | 1 - src/_docs/general-usage.md | 1 - src/_docs/install-on-linux.md | 1 - src/_docs/install-on-windows.md | 1 - src/_docs/preferences.md | 1 - src/_docs/running-from-source-code.md | 1 - src/_docs/shred-files-and-wipe-disks.md | 1 - src/_docs/testing.md | 1 - src/_docs/troubleshooting.md | 1 - src/_docs/variables.md | 1 - src/_docs/winapp2ini.md | 1 - 21 files changed, 7 insertions(+), 20 deletions(-) diff --git a/_config.yml b/_config.yml index 83c4cf6..399fd0a 100644 --- a/_config.yml +++ b/_config.yml @@ -31,6 +31,13 @@ collections: output: true permalink: /:categories/:name/ +defaults: + - scope: + path: "" + type: docs + values: + layout: page + # Syntax highlighting highlighter: rouge diff --git a/bin/jekyll-page b/bin/jekyll-page index 9fe0340..4daf3a1 100755 --- a/bin/jekyll-page +++ b/bin/jekyll-page @@ -57,7 +57,6 @@ end content = < Date: Tue, 15 Sep 2026 17:37:55 +0300 Subject: [PATCH 03/28] Clean up _config.yml Drop default and stale settings, enable strict Liquid parsing. --- _config.yml | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/_config.yml b/_config.yml index 399fd0a..ee84260 100644 --- a/_config.yml +++ b/_config.yml @@ -3,13 +3,10 @@ title: BleachBit Documentation url: "https://docs.bleachbit.org" # if you wish to integrate disqus on pages set your shortname here -disqus_shortname: '' +disqus_shortname: "" # if you use google analytics, add your tracking id here -google_analytics_id: '' - -# URL to source code, used in _includes/footer.html -#codeurl: 'https://github.com/bruth/jekyll-docs-template' +google_analytics_id: "" # Navigation sections, in order. Key is the page's `category`. sections: @@ -20,9 +17,7 @@ sections: dev: Developers post: Posts -# Keep as an empty string if served up at the root. If served up at a specific -# path (e.g. on GitHub pages) leave off the trailing slash, e.g. /my-project -baseurl: '' +baseurl: "" permalink: pretty @@ -38,38 +33,29 @@ defaults: values: layout: page -# Syntax highlighting -highlighter: rouge - -encoding: "utf-8" timezone: UTC strict_front_matter: true liquid: - error_mode: warn - strict_filters: false - strict_variables: false + error_mode: strict + strict_filters: true # Sass sass: - style: compressed + style: compressed -# Since these are pages, it doesn't really matter +# Docs have dates, so don't skip ones dated in the future future: true # Site files live in src/, repo tooling stays in the root source: src -# Use the kramdown Markdown renderer -markdown: kramdown - # Netlify preview rules include: - _redirects plugins: - jekyll-last-modified-at - # https://help.github.com/articles/redirects-on-github-pages/ - jekyll-redirect-from - jekyll-seo-tag - jekyll-sitemap From ccaed577d4e6ff299429238613c8761b35cc1e66 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Tue, 15 Sep 2026 17:39:05 +0300 Subject: [PATCH 04/28] Fix home page title and add a site description --- _config.yml | 3 +++ src/index.md | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/_config.yml b/_config.yml index ee84260..282c98d 100644 --- a/_config.yml +++ b/_config.yml @@ -1,5 +1,8 @@ # Site title, used in _includes/header.html title: BleachBit Documentation +# Used by jekyll-seo-tag for the home page title and default meta description +tagline: Official user and developer guides +description: Official user and developer guides for BleachBit, a free and open-source system cleaner. url: "https://docs.bleachbit.org" # if you wish to integrate disqus on pages set your shortname here diff --git a/src/index.md b/src/index.md index 0afb164..92f75eb 100644 --- a/src/index.md +++ b/src/index.md @@ -1,7 +1,6 @@ --- layout: default -title: "BleachBit Documentation – Official User & Developer Guides" -nav_title: "Home" +title: "BleachBit Documentation" redirect_from: "/doc/install.html" --- From 5f03f96dd37f70191ce2ad4a336ac560ffe8993c Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Tue, 15 Sep 2026 17:39:38 +0300 Subject: [PATCH 05/28] Use relative_url in layouts and includes --- src/404.md | 2 +- src/_includes/header.html | 2 +- src/_includes/navigation.html | 4 ++-- src/_layouts/default.html | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/404.md b/src/404.md index 317b58a..83a993a 100644 --- a/src/404.md +++ b/src/404.md @@ -14,5 +14,5 @@ sitemap: false ## Options -- [Return to Home]({{ site.baseurl }}/) +- [Return to Home]({{ '/' | relative_url }}) - [Report a Problem](https://www.bleachbit.org/contact/): If you believe this is an error, please let us know so we can fix it. diff --git a/src/_includes/header.html b/src/_includes/header.html index 9226d06..05977e2 100644 --- a/src/_includes/header.html +++ b/src/_includes/header.html @@ -1,4 +1,4 @@ -

{{ site.title }}

+

{{ site.title }}

Main site | Download diff --git a/src/_includes/navigation.html b/src/_includes/navigation.html index 8c01798..a3f19a4 100644 --- a/src/_includes/navigation.html +++ b/src/_includes/navigation.html @@ -1,5 +1,5 @@

    -
  • Home
    • +
  • Home
    • {%- for section in site.sections %} {%- assign attr = section[0] %} {%- assign label = section[1] %} @@ -7,7 +7,7 @@ {%- if pages.size > 0 %}
  • {{ label }}
    • {%- for page in pages %} -
  • {{ page.nav_title | default: page.title }}
    • +
  • {{ page.nav_title | default: page.title }}
    • {%- endfor %} {%- endif %} {%- endfor %} diff --git a/src/_layouts/default.html b/src/_layouts/default.html index 839a24f..5a4d3b8 100644 --- a/src/_layouts/default.html +++ b/src/_layouts/default.html @@ -4,8 +4,8 @@ - - + + {% seo %} @@ -43,7 +43,7 @@
- + {%- if site.google_analytics_id != "" %} {% include google_analytics.html %} {%- endif %} From 2814d554511f9e15cd48b6f20414da5e04d8d871 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Tue, 15 Sep 2026 17:41:44 +0300 Subject: [PATCH 06/28] Highlight the current page in the navigation Use Bootstrap nav pills instead of the old nav-list styles. --- src/_includes/navigation.html | 24 ++++++++++++------------ src/_sass/_base.scss | 31 ++++++++++--------------------- 2 files changed, 22 insertions(+), 33 deletions(-) diff --git a/src/_includes/navigation.html b/src/_includes/navigation.html index a3f19a4..d40e26d 100644 --- a/src/_includes/navigation.html +++ b/src/_includes/navigation.html @@ -1,18 +1,18 @@ -