From 52732a17b3247a04ffae0a3f5118e173afa98157 Mon Sep 17 00:00:00 2001 From: ana-oprea Date: Wed, 22 Nov 2023 16:41:53 +0200 Subject: [PATCH] chore: change the theme and alias to volto-spotlight and add volto-spotlight to package.json - refs #259794 --- package.json | 10 ++++++---- razzle.extend.js | 16 ++++++++-------- theme/theme.config | 20 ++++++++++---------- 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/package.json b/package.json index cf500f1..5de14a5 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,8 @@ "@eeacms/volto-datablocks", "@eeacms/volto-block-toc", "@eeacms/volto-eea-design-system", - "@eeacms/volto-eea-website-theme" + "@eeacms/volto-eea-website-theme", + "@eeacms/volto-spotlight" ], "repository": { "type": "git", @@ -27,6 +28,7 @@ "@eeacms/volto-datablocks": "*", "@eeacms/volto-eea-design-system": "*", "@eeacms/volto-eea-website-theme": "*", + "@eeacms/volto-spotlight": "*", "esri-loader": "3.7.0" }, "devDependencies": { @@ -34,10 +36,10 @@ "@plone/scripts": "*", "babel-plugin-transform-class-properties": "^6.24.1", "cypress-fail-fast": "^5.0.1", - "md5": "^2.3.0", - "react-plotly.js": "2.5.1", "husky": "^8.0.3", - "lint-staged": "^14.0.1" + "lint-staged": "^14.0.1", + "md5": "^2.3.0", + "react-plotly.js": "2.5.1" }, "lint-staged": { "src/**/*.{js,jsx,ts,tsx,json}": [ diff --git a/razzle.extend.js b/razzle.extend.js index 2b7f558..9f52288 100644 --- a/razzle.extend.js +++ b/razzle.extend.js @@ -8,17 +8,17 @@ const modify = (config, { target, dev }, webpack) => { config.resolve.alias['../../theme.config'] = themeConfigPath; config.resolve.alias['../../theme'] = `${__dirname}/theme`; const projectRootPath = path.resolve('.'); - const themeLessPath = `${projectRootPath}/node_modules/@eeacms/volto-eea-design-system/theme`; + const themeLessPath = `${projectRootPath}/node_modules/@eeacms/volto-spotlight/theme`; - config.resolve.alias['eea-design-system-theme'] = dev - ? `${projectRootPath}/src/addons/volto-eea-design-system/theme/themes/eea` - : `${themeLessPath}/themes/eea`; + config.resolve.alias['volto-spotlight-theme'] = dev + ? `${projectRootPath}/src/addons/volto-spotlight/theme/themes/spotlight` + : `${themeLessPath}/themes/spotlight`; const semanticLessPath = `${projectRootPath}/node_modules/semantic-ui-less`; - const hasDesignSystemInstalled = config.resolve.alias['eea-volto-themes']; - config.resolve.alias['eea-volto-theme-folder'] = hasDesignSystemInstalled - ? themeLessPath - : semanticLessPath; + const hasDesignSystemInstalled = + config.resolve.alias['volto-spotlight-themes']; + config.resolve.alias['volto-spotlight-theme-folder'] = + hasDesignSystemInstalled ? themeLessPath : semanticLessPath; return config; }; diff --git a/theme/theme.config b/theme/theme.config index 08fa2de..1f76acb 100644 --- a/theme/theme.config +++ b/theme/theme.config @@ -18,13 +18,13 @@ */ /* Global */ -@site : 'eea'; +@site : 'mirage'; @reset : 'eea'; -@mixins : 'eea'; +@mixins : 'mirage'; /* Elements */ @button : 'eea'; -@container : 'eea'; +@container : 'mirage'; @divider : 'eea'; @flag : 'eea'; @header : 'eea'; @@ -83,7 +83,7 @@ @banner : 'eea'; @timeline : 'eea'; @footer : 'eea'; -@header : 'eea'; +@header : 'mirage'; @tag : 'eea'; @tags : 'eea'; @tagList : 'eea'; @@ -95,7 +95,7 @@ @avatarGrid : 'eea'; @keyContent : 'eea'; @publicationCard : 'eea'; -@contentBox : 'eea'; +@contentBox : 'mirage'; @reverseCardGrid : 'eea'; @relatedContent : 'eea'; @share : 'eea'; @@ -109,10 +109,10 @@ @languageLabeledIcon : 'eea'; @callout : 'eea'; @quote : 'eea'; -@hero : 'eea'; +@hero : 'mirage'; @copyright : 'eea'; -@columns : 'eea'; -@spotlight : 'eea'; +@columns : 'mirage'; +@spotlight : 'mirage'; /******************************* Folders @@ -127,7 +127,7 @@ /******************************* Import Theme *******************************/ -@import (multiple) "~eea-volto-theme-folder/theme.less"; +@import (multiple) "~volto-spotlight-theme-folder/theme.less"; @fontPath: "~volto-themes/default/assets/fonts"; @@ -135,4 +135,4 @@ @import (optional) "@{siteFolder}/@{addon}/@{addontype}s/@{addonelement}.overrides"; } -/* End Config */ +/* End Config */ \ No newline at end of file