From 5315ec8a2816dbf2ce01147b5f8c7de588e4d53d Mon Sep 17 00:00:00 2001 From: Nicolas MASSE Date: Sat, 3 Oct 2026 15:35:17 +0200 Subject: [PATCH] move the itix theme to the root of the site The theme was only used by this site. Having it at the root of the repository removes the need for a git submodule and the double commits. - layouts, assets, i18n and static files moved to the root - theme LICENSE kept as LICENSE-theme - ./hugo now generates chroma.css in assets/css - remove the obsolete static/css/.gitignore The generated site is identical, except for the stale /css/chroma.css and /css/.gitignore files that are no longer published. Closes #12 Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01YNHsWYTXPThURz6TbVS1j3 --- .gitmodules | 0 themes/itix/LICENSE => LICENSE-theme | 0 README.md | 19 +++++++++--------- {themes/itix/assets => assets}/css/.gitignore | 0 {themes/itix/assets => assets}/css/itix.css | 0 config.yaml | 4 ++-- hugo | 2 +- {themes/itix/i18n => i18n}/en.yaml | 0 {themes/itix/i18n => i18n}/fr.yaml | 0 {themes/itix/layouts => layouts}/404.html | 0 .../layouts => layouts}/_default/baseof.html | 0 .../layouts => layouts}/_default/search.html | 0 .../layouts => layouts}/_default/section.html | 0 .../layouts => layouts}/_default/single.html | 0 .../_default/taxonomy.html | 0 .../layouts => layouts}/_default/terms.html | 0 .../itix/layouts => layouts}/blog/list.html | 0 {themes/itix/layouts => layouts}/index.html | 0 .../partials/article-headline.html | 0 .../layouts => layouts}/partials/head.html | 0 .../layouts => layouts}/partials/icons/en.svg | 0 .../layouts => layouts}/partials/icons/fr.svg | 0 .../partials/icons/label.svg | 0 .../partials/icons/link.svg | 0 .../partials/icons/rss_feed.svg | 0 .../partials/icons/schedule.svg | 0 .../partials/icons/search.svg | 0 .../partials/icons/vertical_align_top.svg | 0 .../partials/lang-detection.html | 0 .../layouts => layouts}/partials/mathjax.html | 0 .../layouts => layouts}/partials/menu.html | 0 .../partials/post-metadata.html | 0 .../layouts => layouts}/partials/toolbar.html | 0 .../shortcodes/highlightFile.html | 0 .../shortcodes/highlightWithTitle.html | 0 .../shortcodes/internalLink.html | 0 .../layouts => layouts}/speaking/list.html | 0 .../layouts => layouts}/writing/list.html | 0 static/css/.gitignore | 1 - .../fonts/JetBrainsMono-Regular.ttf | Bin .../fonts/JetBrainsMono-Regular.woff | Bin .../fonts/JetBrainsMono-Regular.woff2 | Bin .../fonts/SourceSansPro-Regular.ttf | Bin .../fonts/SourceSerifPro-Regular.ttf | Bin .../fonts/material-icons.ttf | Bin .../fonts/material-icons.woff2 | Bin {themes/itix/static => static}/js/fuse.js | 0 themes/itix/README.md | 1 - themes/itix/theme.toml | 19 ------------------ 49 files changed, 13 insertions(+), 33 deletions(-) delete mode 100644 .gitmodules rename themes/itix/LICENSE => LICENSE-theme (100%) rename {themes/itix/assets => assets}/css/.gitignore (100%) rename {themes/itix/assets => assets}/css/itix.css (100%) rename {themes/itix/i18n => i18n}/en.yaml (100%) rename {themes/itix/i18n => i18n}/fr.yaml (100%) rename {themes/itix/layouts => layouts}/404.html (100%) rename {themes/itix/layouts => layouts}/_default/baseof.html (100%) rename {themes/itix/layouts => layouts}/_default/search.html (100%) rename {themes/itix/layouts => layouts}/_default/section.html (100%) rename {themes/itix/layouts => layouts}/_default/single.html (100%) rename {themes/itix/layouts => layouts}/_default/taxonomy.html (100%) rename {themes/itix/layouts => layouts}/_default/terms.html (100%) rename {themes/itix/layouts => layouts}/blog/list.html (100%) rename {themes/itix/layouts => layouts}/index.html (100%) rename {themes/itix/layouts => layouts}/partials/article-headline.html (100%) rename {themes/itix/layouts => layouts}/partials/head.html (100%) rename {themes/itix/layouts => layouts}/partials/icons/en.svg (100%) rename {themes/itix/layouts => layouts}/partials/icons/fr.svg (100%) rename {themes/itix/layouts => layouts}/partials/icons/label.svg (100%) rename {themes/itix/layouts => layouts}/partials/icons/link.svg (100%) rename {themes/itix/layouts => layouts}/partials/icons/rss_feed.svg (100%) rename {themes/itix/layouts => layouts}/partials/icons/schedule.svg (100%) rename {themes/itix/layouts => layouts}/partials/icons/search.svg (100%) rename {themes/itix/layouts => layouts}/partials/icons/vertical_align_top.svg (100%) rename {themes/itix/layouts => layouts}/partials/lang-detection.html (100%) rename {themes/itix/layouts => layouts}/partials/mathjax.html (100%) rename {themes/itix/layouts => layouts}/partials/menu.html (100%) rename {themes/itix/layouts => layouts}/partials/post-metadata.html (100%) rename {themes/itix/layouts => layouts}/partials/toolbar.html (100%) rename {themes/itix/layouts => layouts}/shortcodes/highlightFile.html (100%) rename {themes/itix/layouts => layouts}/shortcodes/highlightWithTitle.html (100%) rename {themes/itix/layouts => layouts}/shortcodes/internalLink.html (100%) rename {themes/itix/layouts => layouts}/speaking/list.html (100%) rename {themes/itix/layouts => layouts}/writing/list.html (100%) delete mode 100644 static/css/.gitignore rename {themes/itix/static => static}/fonts/JetBrainsMono-Regular.ttf (100%) rename {themes/itix/static => static}/fonts/JetBrainsMono-Regular.woff (100%) rename {themes/itix/static => static}/fonts/JetBrainsMono-Regular.woff2 (100%) rename {themes/itix/static => static}/fonts/SourceSansPro-Regular.ttf (100%) rename {themes/itix/static => static}/fonts/SourceSerifPro-Regular.ttf (100%) rename {themes/itix/static => static}/fonts/material-icons.ttf (100%) rename {themes/itix/static => static}/fonts/material-icons.woff2 (100%) rename {themes/itix/static => static}/js/fuse.js (100%) delete mode 100644 themes/itix/README.md delete mode 100644 themes/itix/theme.toml diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index e69de29..0000000 diff --git a/themes/itix/LICENSE b/LICENSE-theme similarity index 100% rename from themes/itix/LICENSE rename to LICENSE-theme diff --git a/README.md b/README.md index 58de874..a451a24 100644 --- a/README.md +++ b/README.md @@ -53,17 +53,18 @@ Delete the old branch: git branch -d "$(date +%F)-update" ``` -## How to update the theme +## Theme -You can update a theme to the latest version by executing the following command in the root directory of your project: +The theme lives directly in this repository (`layouts`, `assets`, `i18n` and +`static` directories). It was previously maintained as a git submodule in +[hugo-theme-itix](https://github.com/nmasse-itix/hugo-theme-itix), whose +history has been merged in this repository. -``` -git submodule update --rebase --remote -``` +It is derived from [hugo-theme-diary](https://github.com/amazingrise/hugo-theme-diary) +and released under the MIT license (see [LICENSE-theme](LICENSE-theme)). ## How to change the Chroma style for syntax highlighting -```sh -mkdir -p static/css -hugo gen chromastyles --style=perldoc > static/css/chroma.css -``` +The Chroma style sheet is generated by the `./hugo` script in +`assets/css/chroma.css`. To change the style, edit the `--style` argument +of the `hugo gen chromastyles` command in the `./hugo` script. diff --git a/themes/itix/assets/css/.gitignore b/assets/css/.gitignore similarity index 100% rename from themes/itix/assets/css/.gitignore rename to assets/css/.gitignore diff --git a/themes/itix/assets/css/itix.css b/assets/css/itix.css similarity index 100% rename from themes/itix/assets/css/itix.css rename to assets/css/itix.css diff --git a/config.yaml b/config.yaml index 49008f0..d2bb352 100644 --- a/config.yaml +++ b/config.yaml @@ -1,9 +1,9 @@ baseURL: "/" title: "Nicolas Massé" author: "Nicolas Massé" -theme: "itix" # pygmentsUseClasses implies a style sheet that can be generated as follow: -# hugo gen chromastyles --style=borland > static/css/chroma.css +# hugo gen chromastyles --style=borland > assets/css/chroma.css +# (this is done automatically by the ./hugo script) pygmentsUseClasses: true pygmentsCodefences: true enableRobotsTXT: true diff --git a/hugo b/hugo index 9921d3a..8d6be13 100755 --- a/hugo +++ b/hugo @@ -38,5 +38,5 @@ done # Remove dangling links find content/french -xtype l -exec rm -f {} \; -hugo gen chromastyles --style=borland > themes/itix/assets/css/chroma.css +hugo gen chromastyles --style=borland > assets/css/chroma.css hugo "$@" diff --git a/themes/itix/i18n/en.yaml b/i18n/en.yaml similarity index 100% rename from themes/itix/i18n/en.yaml rename to i18n/en.yaml diff --git a/themes/itix/i18n/fr.yaml b/i18n/fr.yaml similarity index 100% rename from themes/itix/i18n/fr.yaml rename to i18n/fr.yaml diff --git a/themes/itix/layouts/404.html b/layouts/404.html similarity index 100% rename from themes/itix/layouts/404.html rename to layouts/404.html diff --git a/themes/itix/layouts/_default/baseof.html b/layouts/_default/baseof.html similarity index 100% rename from themes/itix/layouts/_default/baseof.html rename to layouts/_default/baseof.html diff --git a/themes/itix/layouts/_default/search.html b/layouts/_default/search.html similarity index 100% rename from themes/itix/layouts/_default/search.html rename to layouts/_default/search.html diff --git a/themes/itix/layouts/_default/section.html b/layouts/_default/section.html similarity index 100% rename from themes/itix/layouts/_default/section.html rename to layouts/_default/section.html diff --git a/themes/itix/layouts/_default/single.html b/layouts/_default/single.html similarity index 100% rename from themes/itix/layouts/_default/single.html rename to layouts/_default/single.html diff --git a/themes/itix/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html similarity index 100% rename from themes/itix/layouts/_default/taxonomy.html rename to layouts/_default/taxonomy.html diff --git a/themes/itix/layouts/_default/terms.html b/layouts/_default/terms.html similarity index 100% rename from themes/itix/layouts/_default/terms.html rename to layouts/_default/terms.html diff --git a/themes/itix/layouts/blog/list.html b/layouts/blog/list.html similarity index 100% rename from themes/itix/layouts/blog/list.html rename to layouts/blog/list.html diff --git a/themes/itix/layouts/index.html b/layouts/index.html similarity index 100% rename from themes/itix/layouts/index.html rename to layouts/index.html diff --git a/themes/itix/layouts/partials/article-headline.html b/layouts/partials/article-headline.html similarity index 100% rename from themes/itix/layouts/partials/article-headline.html rename to layouts/partials/article-headline.html diff --git a/themes/itix/layouts/partials/head.html b/layouts/partials/head.html similarity index 100% rename from themes/itix/layouts/partials/head.html rename to layouts/partials/head.html diff --git a/themes/itix/layouts/partials/icons/en.svg b/layouts/partials/icons/en.svg similarity index 100% rename from themes/itix/layouts/partials/icons/en.svg rename to layouts/partials/icons/en.svg diff --git a/themes/itix/layouts/partials/icons/fr.svg b/layouts/partials/icons/fr.svg similarity index 100% rename from themes/itix/layouts/partials/icons/fr.svg rename to layouts/partials/icons/fr.svg diff --git a/themes/itix/layouts/partials/icons/label.svg b/layouts/partials/icons/label.svg similarity index 100% rename from themes/itix/layouts/partials/icons/label.svg rename to layouts/partials/icons/label.svg diff --git a/themes/itix/layouts/partials/icons/link.svg b/layouts/partials/icons/link.svg similarity index 100% rename from themes/itix/layouts/partials/icons/link.svg rename to layouts/partials/icons/link.svg diff --git a/themes/itix/layouts/partials/icons/rss_feed.svg b/layouts/partials/icons/rss_feed.svg similarity index 100% rename from themes/itix/layouts/partials/icons/rss_feed.svg rename to layouts/partials/icons/rss_feed.svg diff --git a/themes/itix/layouts/partials/icons/schedule.svg b/layouts/partials/icons/schedule.svg similarity index 100% rename from themes/itix/layouts/partials/icons/schedule.svg rename to layouts/partials/icons/schedule.svg diff --git a/themes/itix/layouts/partials/icons/search.svg b/layouts/partials/icons/search.svg similarity index 100% rename from themes/itix/layouts/partials/icons/search.svg rename to layouts/partials/icons/search.svg diff --git a/themes/itix/layouts/partials/icons/vertical_align_top.svg b/layouts/partials/icons/vertical_align_top.svg similarity index 100% rename from themes/itix/layouts/partials/icons/vertical_align_top.svg rename to layouts/partials/icons/vertical_align_top.svg diff --git a/themes/itix/layouts/partials/lang-detection.html b/layouts/partials/lang-detection.html similarity index 100% rename from themes/itix/layouts/partials/lang-detection.html rename to layouts/partials/lang-detection.html diff --git a/themes/itix/layouts/partials/mathjax.html b/layouts/partials/mathjax.html similarity index 100% rename from themes/itix/layouts/partials/mathjax.html rename to layouts/partials/mathjax.html diff --git a/themes/itix/layouts/partials/menu.html b/layouts/partials/menu.html similarity index 100% rename from themes/itix/layouts/partials/menu.html rename to layouts/partials/menu.html diff --git a/themes/itix/layouts/partials/post-metadata.html b/layouts/partials/post-metadata.html similarity index 100% rename from themes/itix/layouts/partials/post-metadata.html rename to layouts/partials/post-metadata.html diff --git a/themes/itix/layouts/partials/toolbar.html b/layouts/partials/toolbar.html similarity index 100% rename from themes/itix/layouts/partials/toolbar.html rename to layouts/partials/toolbar.html diff --git a/themes/itix/layouts/shortcodes/highlightFile.html b/layouts/shortcodes/highlightFile.html similarity index 100% rename from themes/itix/layouts/shortcodes/highlightFile.html rename to layouts/shortcodes/highlightFile.html diff --git a/themes/itix/layouts/shortcodes/highlightWithTitle.html b/layouts/shortcodes/highlightWithTitle.html similarity index 100% rename from themes/itix/layouts/shortcodes/highlightWithTitle.html rename to layouts/shortcodes/highlightWithTitle.html diff --git a/themes/itix/layouts/shortcodes/internalLink.html b/layouts/shortcodes/internalLink.html similarity index 100% rename from themes/itix/layouts/shortcodes/internalLink.html rename to layouts/shortcodes/internalLink.html diff --git a/themes/itix/layouts/speaking/list.html b/layouts/speaking/list.html similarity index 100% rename from themes/itix/layouts/speaking/list.html rename to layouts/speaking/list.html diff --git a/themes/itix/layouts/writing/list.html b/layouts/writing/list.html similarity index 100% rename from themes/itix/layouts/writing/list.html rename to layouts/writing/list.html diff --git a/static/css/.gitignore b/static/css/.gitignore deleted file mode 100644 index 10c9f55..0000000 --- a/static/css/.gitignore +++ /dev/null @@ -1 +0,0 @@ -chroma.css diff --git a/themes/itix/static/fonts/JetBrainsMono-Regular.ttf b/static/fonts/JetBrainsMono-Regular.ttf similarity index 100% rename from themes/itix/static/fonts/JetBrainsMono-Regular.ttf rename to static/fonts/JetBrainsMono-Regular.ttf diff --git a/themes/itix/static/fonts/JetBrainsMono-Regular.woff b/static/fonts/JetBrainsMono-Regular.woff similarity index 100% rename from themes/itix/static/fonts/JetBrainsMono-Regular.woff rename to static/fonts/JetBrainsMono-Regular.woff diff --git a/themes/itix/static/fonts/JetBrainsMono-Regular.woff2 b/static/fonts/JetBrainsMono-Regular.woff2 similarity index 100% rename from themes/itix/static/fonts/JetBrainsMono-Regular.woff2 rename to static/fonts/JetBrainsMono-Regular.woff2 diff --git a/themes/itix/static/fonts/SourceSansPro-Regular.ttf b/static/fonts/SourceSansPro-Regular.ttf similarity index 100% rename from themes/itix/static/fonts/SourceSansPro-Regular.ttf rename to static/fonts/SourceSansPro-Regular.ttf diff --git a/themes/itix/static/fonts/SourceSerifPro-Regular.ttf b/static/fonts/SourceSerifPro-Regular.ttf similarity index 100% rename from themes/itix/static/fonts/SourceSerifPro-Regular.ttf rename to static/fonts/SourceSerifPro-Regular.ttf diff --git a/themes/itix/static/fonts/material-icons.ttf b/static/fonts/material-icons.ttf similarity index 100% rename from themes/itix/static/fonts/material-icons.ttf rename to static/fonts/material-icons.ttf diff --git a/themes/itix/static/fonts/material-icons.woff2 b/static/fonts/material-icons.woff2 similarity index 100% rename from themes/itix/static/fonts/material-icons.woff2 rename to static/fonts/material-icons.woff2 diff --git a/themes/itix/static/js/fuse.js b/static/js/fuse.js similarity index 100% rename from themes/itix/static/js/fuse.js rename to static/js/fuse.js diff --git a/themes/itix/README.md b/themes/itix/README.md deleted file mode 100644 index c2ab83b..0000000 --- a/themes/itix/README.md +++ /dev/null @@ -1 +0,0 @@ -# Theme for www.itix.fr diff --git a/themes/itix/theme.toml b/themes/itix/theme.toml deleted file mode 100644 index c5214b5..0000000 --- a/themes/itix/theme.toml +++ /dev/null @@ -1,19 +0,0 @@ -name = "ITIX" -license = "MIT" -licenselink = "https://github.com/nmasse-itix/hugo-theme-itix/blob/master/LICENSE" -description = "Theme of my personal site: www.itix.fr" -homepage = "https://www.itix.fr/" -tags = ["blog"] -features = ["mobile","elegant"] -min_version = "0.59.0" - -[author] - name = "Nicolas Massé" - homepage = "https://www.itix.fr/" - - -# If porting an existing theme -[original] - name = "amazingrise" - homepage = "https://amazingrise.net/" - repo = "https://github.com/amazingrise/hugo-theme-diary"