Merge pull request #59 from richard67/development-color-switcher-mod-1

- Add new scss files to css build script so that css and css.min will be built. - Correct typo "autumm" to "autumn" in file name, language string names and values andin the option value. - Change "color" (en-US) to "colour" (en-GB) in language string values. - Simplify option labels.
bembelimen · Sep 5, 2020 · 98fd6cf · 98fd6cf
2 parents 46ff5ae + 6d40362
commit 98fd6cf
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/build/build-modules-js/compilecss.es6.js b/build/build-modules-js/compilecss.es6.js
@@ -44,6 +44,10 @@ module.exports.compile = (options, path) => {
           `${RootPath}/templates/cassiopeia/scss/offline.scss`,
           `${RootPath}/templates/cassiopeia/scss/template.scss`,
           `${RootPath}/templates/cassiopeia/scss/template-rtl.scss`,
+          `${RootPath}/templates/cassiopeia/scss/global/autumn.scss`,
+          `${RootPath}/templates/cassiopeia/scss/global/spring.scss`,
+          `${RootPath}/templates/cassiopeia/scss/global/summer.scss`,
+          `${RootPath}/templates/cassiopeia/scss/global/winter.scss`,
           `${RootPath}/templates/cassiopeia/scss/system/searchtools/searchtools.scss`,
           `${RootPath}/templates/cassiopeia/scss/vendor/choicesjs/choices.scss`,
           `${RootPath}/templates/cassiopeia/scss/vendor/joomla-custom-elements/joomla-alert.scss`,

diff --git a/language/en-GB/tpl_cassiopeia.ini b/language/en-GB/tpl_cassiopeia.ini
@@ -5,11 +5,11 @@
 
 TPL_CASSIOPEIA_BACKTOTOP="Back to Top"
 TPL_CASSIOPEIA_BACKTOTOP_LABEL="Back-to-top Link"
-TPL_CASSIOPEIA_COLOR_NAME_LABEL="Color Theme"
-TPL_CASSIOPEIA_COLOR_NAME_AUTUMM="Autumm colors"
-TPL_CASSIOPEIA_COLOR_NAME_SPRING="Spring colors"
-TPL_CASSIOPEIA_COLOR_NAME_SUMMER="Summer colors"
-TPL_CASSIOPEIA_COLOR_NAME_WINTER="Winter colors"
+TPL_CASSIOPEIA_COLOR_NAME_LABEL="Colour Theme"
+TPL_CASSIOPEIA_COLOR_NAME_AUTUMN="Autumn"
+TPL_CASSIOPEIA_COLOR_NAME_SPRING="Spring"
+TPL_CASSIOPEIA_COLOR_NAME_SUMMER="Summer"
+TPL_CASSIOPEIA_COLOR_NAME_WINTER="Winter"
 TPL_CASSIOPEIA_FLUID="Fluid"
 TPL_CASSIOPEIA_FLUID_LABEL="Fluid Layout"
 TPL_CASSIOPEIA_LOGO_LABEL="Logo"

diff --git a/templates/cassiopeia/scss/global/autumm.scss → templates/cassiopeia/scss/global/autumn.scss b/templates/cassiopeia/scss/global/autumm.scss → templates/cassiopeia/scss/global/autumn.scss
diff --git a/templates/cassiopeia/templateDetails.xml b/templates/cassiopeia/templateDetails.xml
@@ -88,7 +88,7 @@
 					>
 					<option value="spring">TPL_CASSIOPEIA_COLOR_NAME_SPRING</option>
 					<option value="summer">TPL_CASSIOPEIA_COLOR_NAME_SUMMER</option>
-					<option value="autumm">TPL_CASSIOPEIA_COLOR_NAME_AUTUMM</option>
+					<option value="autumn">TPL_CASSIOPEIA_COLOR_NAME_AUTUMN</option>
 					<option value="winter">TPL_CASSIOPEIA_COLOR_NAME_WINTER</option>
 				</field>