diff --git a/.mokogitea/manifest.xml b/.mokogitea/manifest.xml index 4644951..4c38aa8 100644 --- a/.mokogitea/manifest.xml +++ b/.mokogitea/manifest.xml @@ -9,7 +9,7 @@ Template - MokoOnyx MokoConsulting MokoOnyx - Joomla site template (successor to MokoCassiopeia) - 02.13.00 + 02.13.01 GNU General Public License v3 diff --git a/.mokogitea/workflows/issue-branch.yml b/.mokogitea/workflows/issue-branch.yml index 272f31f..99da88e 100644 --- a/.mokogitea/workflows/issue-branch.yml +++ b/.mokogitea/workflows/issue-branch.yml @@ -5,7 +5,11 @@ # FILE INFORMATION # DEFGROUP: Gitea.Workflow # INGROUP: moko-platform.Automation +<<<<<<< HEAD +# VERSION: 02.13.01 +======= # VERSION: 02.13.00 +>>>>>>> origin/main # BRIEF: Auto-create feature branch when an issue is opened name: "Universal: Issue Branch" diff --git a/CHANGELOG.md b/CHANGELOG.md index 98763f7..de9e249 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,11 +8,19 @@ DEFGROUP: Joomla.Template.Site INGROUP: MokoOnyx.Documentation PATH: ./CHANGELOG.md +<<<<<<< HEAD + VERSION: 02.13.01 + BRIEF: Changelog file documenting version history of MokoOnyx + --> + +# Changelog — MokoOnyx (VERSION: 02.13.01) +======= VERSION: 02.13.00 BRIEF: Changelog file documenting version history of MokoOnyx --> # Changelog — MokoOnyx (VERSION: 02.13.00) +>>>>>>> origin/main ## [Unreleased] ## [02.13.00] --- 2026-05-30 diff --git a/SECURITY.md b/SECURITY.md index e30a9a3..7f33e4d 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -10,7 +10,11 @@ INGROUP: MokoOnyx.Governance REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx FILE: SECURITY.md +<<<<<<< HEAD + VERSION: 02.13.01 +======= VERSION: 02.13.00 +>>>>>>> origin/main BRIEF: Security policy and vulnerability reporting process for MokoOnyx. PATH: /SECURITY.md NOTE: This policy is process oriented and does not replace secure engineering practices. diff --git a/src/html/com_joomgallery/category/default.php b/src/html/com_joomgallery/category/default.php index fcd8163..d5950cd 100644 --- a/src/html/com_joomgallery/category/default.php +++ b/src/html/com_joomgallery/category/default.php @@ -11,7 +11,11 @@ * INGROUP: MokoOnyx * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx * PATH: /html/com_joomgallery/category/default.php +<<<<<<< HEAD + * VERSION: 02.13.01 +======= * VERSION: 02.13.00 +>>>>>>> origin/main * BRIEF: Category view override — password gate then loads default_cat sub-layout */ diff --git a/src/html/com_joomgallery/category/default_cat.php b/src/html/com_joomgallery/category/default_cat.php index b0de7d0..ebd1ba5 100644 --- a/src/html/com_joomgallery/category/default_cat.php +++ b/src/html/com_joomgallery/category/default_cat.php @@ -11,7 +11,11 @@ * INGROUP: MokoOnyx * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx * PATH: /html/com_joomgallery/category/default_cat.php +<<<<<<< HEAD + * VERSION: 02.13.01 +======= * VERSION: 02.13.00 +>>>>>>> origin/main * BRIEF: Category sub-layout — subcategories grid + images grid with pagination */ diff --git a/src/html/com_joomgallery/gallery/default.php b/src/html/com_joomgallery/gallery/default.php index 4f0c6dc..ce37b73 100644 --- a/src/html/com_joomgallery/gallery/default.php +++ b/src/html/com_joomgallery/gallery/default.php @@ -11,7 +11,11 @@ * INGROUP: MokoOnyx * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx * PATH: /html/com_joomgallery/gallery/default.php +<<<<<<< HEAD + * VERSION: 02.13.01 +======= * VERSION: 02.13.00 +>>>>>>> origin/main * BRIEF: Gallery view override — main image grid with masonry/justified layout */ diff --git a/src/html/com_joomgallery/image/default.php b/src/html/com_joomgallery/image/default.php index 1666976..5f75ae9 100644 --- a/src/html/com_joomgallery/image/default.php +++ b/src/html/com_joomgallery/image/default.php @@ -11,7 +11,11 @@ * INGROUP: MokoOnyx * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx * PATH: /html/com_joomgallery/image/default.php +<<<<<<< HEAD + * VERSION: 02.13.01 +======= * VERSION: 02.13.00 +>>>>>>> origin/main * BRIEF: Image detail view override — single image with metadata, tags, custom fields */ diff --git a/src/html/layouts/joomla/module/card.php b/src/html/layouts/joomla/module/card.php index fd8aef5..940a0fd 100644 --- a/src/html/layouts/joomla/module/card.php +++ b/src/html/layouts/joomla/module/card.php @@ -10,7 +10,11 @@ * INGROUP: MokoOnyx * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx * PATH: /html/layouts/joomla/module/card.php +<<<<<<< HEAD + * VERSION: 02.13.01 +======= * VERSION: 02.13.00 +>>>>>>> origin/main * BRIEF: Custom card module chrome — renders module titles for all modules */ diff --git a/src/html/layouts/mokoonyx/article-metadata.php b/src/html/layouts/mokoonyx/article-metadata.php index 5eb5be0..9b220ab 100644 --- a/src/html/layouts/mokoonyx/article-metadata.php +++ b/src/html/layouts/mokoonyx/article-metadata.php @@ -11,7 +11,11 @@ * INGROUP: MokoOnyx.Layouts * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx * PATH: /src/html/layouts/mokoonyx/article-metadata.php +<<<<<<< HEAD + * VERSION: 02.13.01 +======= * VERSION: 02.13.00 +>>>>>>> origin/main * BRIEF: Article metadata footer layout -- renders jcfields grouped by field group */ diff --git a/src/media/css/a11y-high-contrast.css b/src/media/css/a11y-high-contrast.css index 14c9458..8419edc 100644 --- a/src/media/css/a11y-high-contrast.css +++ b/src/media/css/a11y-high-contrast.css @@ -10,7 +10,11 @@ * INGROUP: MokoOnyx.Accessibility * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx * PATH: ./media/css/a11y-high-contrast.css +<<<<<<< HEAD + * VERSION: 02.13.01 +======= * VERSION: 02.13.00 +>>>>>>> origin/main * BRIEF: High-contrast stylesheet for accessibility toolbar */ diff --git a/src/media/css/template.css b/src/media/css/template.css index ea3033d..f019374 100644 --- a/src/media/css/template.css +++ b/src/media/css/template.css @@ -23528,4 +23528,3 @@ font-size: 0.8125rem; .fa-brands { margin-right: 0.25rem; } -.fa-light { margin-right: 0.25rem; } diff --git a/src/templateDetails.xml b/src/templateDetails.xml index 0633eb2..fa00eb0 100644 --- a/src/templateDetails.xml +++ b/src/templateDetails.xml @@ -36,7 +36,15 @@ mokoonyx +<<<<<<< HEAD +<<<<<<< HEAD + 02.13.01-dev +======= + 02.13.01-dev +>>>>>>> 14006b21d4476c6951926ea0db4f8979333552fd +======= 02.13.00 +>>>>>>> origin/main script.php 2026-05-16 Jonathan Miller || Moko Consulting