From 271d54a848f04626e89c0af29bb38f60302e6f82 Mon Sep 17 00:00:00 2001
From: Adam G-H <32250-phenaproxima@users.noreply.drupalcode.org>
Date: Fri, 25 Oct 2024 03:26:00 +0000
Subject: [PATCH] Issue #3482926 by phenaproxima: Add a new Olivero subtheme
component
---
.gitlab-ci.yml | 3 ++-
CODEOWNERS | 4 +++-
drupal_cms/composer.json | 1 +
drupal_cms/recipe.yml | 1 +
drupal_cms_olivero/composer.json | 8 ++++++++
drupal_cms_olivero/drupal_cms_olivero.info.yml | 4 ++++
6 files changed, 19 insertions(+), 2 deletions(-)
create mode 100644 drupal_cms_olivero/composer.json
create mode 100644 drupal_cms_olivero/drupal_cms_olivero.info.yml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7bb661ebb..cb2e2a6e8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,11 +36,12 @@ build project:
- composer config --global repositories.template path $CI_PROJECT_DIR/project_template
# Create the project.
- composer create-project drupal/drupal-cms-project $BUILD_DIR --stability=dev
- # Until they are available on Packagist, the recipes and installer need to NOT
+ # Until they are available on Packagist, the various components need to NOT
# be managed by Composer at all.
- .ddev/commands/web/unpack $BUILD_DIR
- cd $BUILD_DIR/$_WEB_ROOT
- mkdir -p ./profiles/contrib && mv $CI_PROJECT_DIR/drupal_cms_installer ./profiles/contrib
+ - mkdir -p ./themes/contrib && mv $CI_PROJECT_DIR/drupal_cms_olivero ./themes/contrib
- mkdir recipes && mv $CI_PROJECT_DIR/drupal_cms* recipes
# Turn the built project into an archive that can be downloaded by the public
# to spin up projects with Drupal CMS.
diff --git a/CODEOWNERS b/CODEOWNERS
index 832d81cab..f7c7aa7f5 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -39,9 +39,11 @@
[contact form track] @artinruins
/drupal_cms_forms/
+[front-end theme] @mherchel
+/drupal_cms_olivero/
+
# No track leads identified yet...
# /drupal_cms_anti_spam/
-# /drupal_cms_workflows/
[SEO track] @thejimbirch @doylejd
/drupal_cms_seo_basic/
diff --git a/drupal_cms/composer.json b/drupal_cms/composer.json
index ef6e981a2..a80d214cf 100644
--- a/drupal_cms/composer.json
+++ b/drupal_cms/composer.json
@@ -14,6 +14,7 @@
"drupal/drupal_cms_full_html_editor": "*",
"drupal/drupal_cms_image_media_type": "*",
"drupal/drupal_cms_media_tools": "*",
+ "drupal/drupal_cms_olivero": "*",
"drupal/drupal_cms_seo_basic": "*",
"drupal/drupal_cms_dashboard": "*",
"drupal/eca": "2.1.x-dev",
diff --git a/drupal_cms/recipe.yml b/drupal_cms/recipe.yml
index 50874039d..e5a8246ba 100644
--- a/drupal_cms/recipe.yml
+++ b/drupal_cms/recipe.yml
@@ -29,6 +29,7 @@ install:
- automatic_updates
- automatic_updates_extensions
- bpmn_io
+ - drupal_cms_olivero
- eca_base
- eca_misc
- eca_user
diff --git a/drupal_cms_olivero/composer.json b/drupal_cms_olivero/composer.json
new file mode 100644
index 000000000..7152d88e5
--- /dev/null
+++ b/drupal_cms_olivero/composer.json
@@ -0,0 +1,8 @@
+{
+ "name": "drupal/drupal_cms_olivero",
+ "version": "dev-main",
+ "type": "drupal-theme",
+ "require": {
+ "drupal/core": "^10"
+ }
+}
diff --git a/drupal_cms_olivero/drupal_cms_olivero.info.yml b/drupal_cms_olivero/drupal_cms_olivero.info.yml
new file mode 100644
index 000000000..f36886321
--- /dev/null
+++ b/drupal_cms_olivero/drupal_cms_olivero.info.yml
@@ -0,0 +1,4 @@
+name: 'Olivero for Drupal CMS'
+type: theme
+base theme: olivero
+core_version_requirement: ^10
--
GitLab