From 56fc9db9b534198fa54576600dcb7ee0e64213b0 Mon Sep 17 00:00:00 2001 From: Benjamin Franzke Date: Thu, 17 Oct 2024 17:47:41 +0200 Subject: [PATCH] [TASK] Move all categories into the categories set --- Configuration/Sets/Boostrap5/config.yaml | 2 + .../Sets/Boostrap5/settings.definitions.yaml | 25 ------- .../Sets/Categories/settings.definitions.yaml | 67 +++++++++++++++++++ .../Sets/ContentElements/config.yaml | 2 + .../ContentElements/settings.definitions.yaml | 40 ----------- Configuration/Sets/CookieConsent/config.yaml | 2 + .../CookieConsent/settings.definitions.yaml | 7 -- .../Sets/GoogleFont/settings.definitions.yaml | 5 -- .../settings.definitions.yaml | 5 -- 9 files changed, 73 insertions(+), 82 deletions(-) diff --git a/Configuration/Sets/Boostrap5/config.yaml b/Configuration/Sets/Boostrap5/config.yaml index 0a6ff7de5..c3e47add5 100644 --- a/Configuration/Sets/Boostrap5/config.yaml +++ b/Configuration/Sets/Boostrap5/config.yaml @@ -1,3 +1,5 @@ name: bootstrap-package/bootstrap-5 label: 'Bootstrap Package: Bootstrap 5' hidden: true +dependencies: + - bootstrap-package/base diff --git a/Configuration/Sets/Boostrap5/settings.definitions.yaml b/Configuration/Sets/Boostrap5/settings.definitions.yaml index 5476a4d7f..9c08d3ea3 100644 --- a/Configuration/Sets/Boostrap5/settings.definitions.yaml +++ b/Configuration/Sets/Boostrap5/settings.definitions.yaml @@ -1,28 +1,3 @@ -categories: - BootstrapPackage: - label: 'Bootstrap Package' - BootstrapPackage.scss: - label: 'SCSS' - parent: BootstrapPackage - BootstrapPackage.scss.colors: - label: 'Colors' - parent: BootstrapPackage.scss - BootstrapPackage.scss.contrast: - label: 'Contrast' - parent: BootstrapPackage.scss - BootstrapPackage.scss.body: - label: 'Body' - parent: BootstrapPackage.scss - BootstrapPackage.scss.links: - label: 'Links' - parent: BootstrapPackage.scss - BootstrapPackage.scss.fonts: - label: 'Fonts' - parent: BootstrapPackage.scss - BootstrapPackage.scss.options: - label: 'Options' - parent: BootstrapPackage.scss - settings: # Colors diff --git a/Configuration/Sets/Categories/settings.definitions.yaml b/Configuration/Sets/Categories/settings.definitions.yaml index f5fb1cf6d..a292ced2e 100644 --- a/Configuration/Sets/Categories/settings.definitions.yaml +++ b/Configuration/Sets/Categories/settings.definitions.yaml @@ -67,4 +67,71 @@ categories: BootstrapPackage.settings: label: 'Settings' parent: BootstrapPackage + BootstrapPackage.cookie-consent: + label: 'Cookie Consent' + parent: BootstrapPackage + BootstrapPackage.google-font: + label: 'Google Font' + parent: BootstrapPackage + BootstrapPackage.google-tag-manager: + label: 'Google Tag Manager' + parent: BootstrapPackage + BootstrapPackage.content-elements: + label: 'Content Elements' + parent: BootstrapPackage + BootstrapPackage.content-elements.templates: + label: 'Templates' + parent: BootstrapPackage.content-elements + BootstrapPackage.content-elements.header: + label: 'Header' + parent: BootstrapPackage.content-elements + BootstrapPackage.content-elements.subheader: + label: 'Subheader' + parent: BootstrapPackage.content-elements + BootstrapPackage.content-elements.lightbox: + label: 'Lightbox' + parent: BootstrapPackage.content-elements + BootstrapPackage.content-elements.media: + label: 'Media' + parent: BootstrapPackage.content-elements + BootstrapPackage.content-elements.gallery: + label: 'Gallery' + parent: BootstrapPackage.content-elements + BootstrapPackage.content-elements.menu-thumbnail: + label: 'Menu Thumbnail' + parent: BootstrapPackage.content-elements + BootstrapPackage.content-elements.menu-card: + label: 'Menu Card' + parent: BootstrapPackage.content-elements + BootstrapPackage.content-elements.text-and-icon: + label: 'Text and Icon' + parent: BootstrapPackage.content-elements + BootstrapPackage.content-elements.timeline: + label: 'Timeline' + parent: BootstrapPackage.content-elements + BootstrapPackage.content-elements.uploads: + label: 'Uploads' + parent: BootstrapPackage.content-elements + BootstrapPackage.scss: + label: 'SCSS' + parent: BootstrapPackage + BootstrapPackage.scss.colors: + label: 'Colors' + parent: BootstrapPackage.scss + BootstrapPackage.scss.contrast: + label: 'Contrast' + parent: BootstrapPackage.scss + BootstrapPackage.scss.body: + label: 'Body' + parent: BootstrapPackage.scss + BootstrapPackage.scss.links: + label: 'Links' + parent: BootstrapPackage.scss + BootstrapPackage.scss.fonts: + label: 'Fonts' + parent: BootstrapPackage.scss + BootstrapPackage.scss.options: + label: 'Options' + parent: BootstrapPackage.scss +settings: [] diff --git a/Configuration/Sets/ContentElements/config.yaml b/Configuration/Sets/ContentElements/config.yaml index 2eaddc6c3..0cc2bf693 100644 --- a/Configuration/Sets/ContentElements/config.yaml +++ b/Configuration/Sets/ContentElements/config.yaml @@ -1,2 +1,4 @@ name: bootstrap-package/content-elements label: 'Bootstrap Package: Content Elements' +dependencies: + - bootstrap-package/base diff --git a/Configuration/Sets/ContentElements/settings.definitions.yaml b/Configuration/Sets/ContentElements/settings.definitions.yaml index 39a564283..a89aabdc2 100644 --- a/Configuration/Sets/ContentElements/settings.definitions.yaml +++ b/Configuration/Sets/ContentElements/settings.definitions.yaml @@ -1,43 +1,3 @@ -categories: - BootstrapPackage: - label: 'Bootstrap Package' - BootstrapPackage.content-elements: - label: 'Content Elements' - parent: BootstrapPackage - BootstrapPackage.content-elements.templates: - label: 'Templates' - parent: BootstrapPackage.content-elements - BootstrapPackage.content-elements.header: - label: 'Header' - parent: BootstrapPackage.content-elements - BootstrapPackage.content-elements.subheader: - label: 'Subheader' - parent: BootstrapPackage.content-elements - BootstrapPackage.content-elements.lightbox: - label: 'Lightbox' - parent: BootstrapPackage.content-elements - BootstrapPackage.content-elements.media: - label: 'Media' - parent: BootstrapPackage.content-elements - BootstrapPackage.content-elements.gallery: - label: 'Gallery' - parent: BootstrapPackage.content-elements - BootstrapPackage.content-elements.menu-thumbnail: - label: 'Menu Thumbnail' - parent: BootstrapPackage.content-elements - BootstrapPackage.content-elements.menu-card: - label: 'Menu Card' - parent: BootstrapPackage.content-elements - BootstrapPackage.content-elements.text-and-icon: - label: 'Text and Icon' - parent: BootstrapPackage.content-elements - BootstrapPackage.content-elements.timeline: - label: 'Timeline' - parent: BootstrapPackage.content-elements - BootstrapPackage.content-elements.uploads: - label: 'Uploads' - parent: BootstrapPackage.content-elements - settings: # Templates diff --git a/Configuration/Sets/CookieConsent/config.yaml b/Configuration/Sets/CookieConsent/config.yaml index 106459422..b75278b40 100644 --- a/Configuration/Sets/CookieConsent/config.yaml +++ b/Configuration/Sets/CookieConsent/config.yaml @@ -1,3 +1,5 @@ name: bootstrap-package/cookie-consent label: 'Bootstrap Package: Cookie Consent' hidden: true +dependencies: + - bootstrap-package/base diff --git a/Configuration/Sets/CookieConsent/settings.definitions.yaml b/Configuration/Sets/CookieConsent/settings.definitions.yaml index 2f17837c1..78c466b90 100644 --- a/Configuration/Sets/CookieConsent/settings.definitions.yaml +++ b/Configuration/Sets/CookieConsent/settings.definitions.yaml @@ -1,10 +1,3 @@ -categories: - BootstrapPackage: - label: 'Bootstrap Package' - BootstrapPackage.cookie-consent: - label: 'Cookie Consent' - parent: BootstrapPackage - settings: page.theme.cookieconsent.enable: diff --git a/Configuration/Sets/GoogleFont/settings.definitions.yaml b/Configuration/Sets/GoogleFont/settings.definitions.yaml index 574d2a5aa..239887949 100644 --- a/Configuration/Sets/GoogleFont/settings.definitions.yaml +++ b/Configuration/Sets/GoogleFont/settings.definitions.yaml @@ -1,8 +1,3 @@ -categories: - BootstrapPackage.google-font: - label: 'Google Font' - parent: BootstrapPackage - settings: page.theme.googleFont.enable: diff --git a/Configuration/Sets/GoogleTagManager/settings.definitions.yaml b/Configuration/Sets/GoogleTagManager/settings.definitions.yaml index f51ae904f..c2b134941 100644 --- a/Configuration/Sets/GoogleTagManager/settings.definitions.yaml +++ b/Configuration/Sets/GoogleTagManager/settings.definitions.yaml @@ -1,8 +1,3 @@ -categories: - BootstrapPackage.google-tag-manager: - label: 'Google Tag Manager' - parent: BootstrapPackage - settings: page.tracking.google.tagManagerContainerId: