From 55510371b9d73f375ab00f2ec412aa5ef59e382a Mon Sep 17 00:00:00 2001 From: rgaunt Date: Thu, 18 Sep 2025 17:55:38 +1000 Subject: [PATCH 1/2] Removed component namespaces. --- .../contrib/civictheme/civictheme.info.yml | 23 ------------------- .../civictheme_starter_kit.info.yml | 13 ----------- 2 files changed, 36 deletions(-) diff --git a/web/themes/contrib/civictheme/civictheme.info.yml b/web/themes/contrib/civictheme/civictheme.info.yml index f5cb843b84..393a6cd339 100644 --- a/web/themes/contrib/civictheme/civictheme.info.yml +++ b/web/themes/contrib/civictheme/civictheme.info.yml @@ -68,29 +68,6 @@ regions: features: - favicon -components: - namespaces: - base: - - components/00-base - atoms: - - components/01-atoms - molecules: - - components/02-molecules - organisms: - - components/03-organisms - templates: - - components/04-templates - ct-base: - - components/00-base - ct-atoms: - - components/01-atoms - ct-molecules: - - components/02-molecules - ct-organisms: - - components/03-organisms - ct-templates: - - components/04-templates - ckeditor5-stylesheets: - dist/civictheme.editor.css - dist/civictheme.variables.css diff --git a/web/themes/contrib/civictheme/civictheme_starter_kit/civictheme_starter_kit.info.yml b/web/themes/contrib/civictheme/civictheme_starter_kit/civictheme_starter_kit.info.yml index 4e3dbd798d..8e7e41a30f 100644 --- a/web/themes/contrib/civictheme/civictheme_starter_kit/civictheme_starter_kit.info.yml +++ b/web/themes/contrib/civictheme/civictheme_starter_kit/civictheme_starter_kit.info.yml @@ -61,16 +61,3 @@ ckeditor5-stylesheets: # below is resolved. # @see https://www.drupal.org/project/drupal/issues/3406959 # - /sites/default/files/css-variables.civictheme_starter_kit.css - -components: - namespaces: - base: - - components/00-base - atoms: - - components/01-atoms - molecules: - - components/02-molecules - organisms: - - components/03-organisms - templates: - - components/04-templates From b30876155db4a4fb9e0b9da6d969dfc319a4baf0 Mon Sep 17 00:00:00 2001 From: Joshua Fernandes Date: Thu, 2 Oct 2025 07:58:22 +0530 Subject: [PATCH 2/2] Fixed include page template. --- web/themes/contrib/civictheme/templates/layout/page.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/themes/contrib/civictheme/templates/layout/page.html.twig b/web/themes/contrib/civictheme/templates/layout/page.html.twig index bba131a2b9..637662305c 100644 --- a/web/themes/contrib/civictheme/templates/layout/page.html.twig +++ b/web/themes/contrib/civictheme/templates/layout/page.html.twig @@ -9,7 +9,7 @@ # variables without the need to change this template. #} -{% include '@templates/page/page.twig' %} +{% include 'civictheme:page' %} {# Hidden region #} {% block hidden_block %}