MokoConsulting/MokoCassiopeia
1
1
Fork 0
Code Issues 2 Pull Requests Actions Packages Releases 1 Activity

Complete template system overhaul: CSS variables, theme management, and UI improvements #74

Merged
Copilot merged 47 commits from copilot/fix-language-constants-display into main 2026-02-07 17:49:30 +00:00
Conversation 2 Commits 47 Files Changed 29 +13 -13
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b10bff1ab6 - Show all commits

8
src/templates/component.php
View File

@@ -79,22 +79,22 @@ $darkKey = 'template.dark.' . $colorDarkKey;
try { try {
$wa->useStyle('template.light.colors_standard'); $wa->useStyle('template.light.colors_standard');
} catch (\Throwable $e) { } catch (\Throwable $e) {
$wa->registerAndUseStyle('template.light.colors_standard', $templatePath . '/css/global/light/colors_standard.css'); $wa->registerAndUseStyle('template.light.colors_standard', $templatePath . '/css/colors/light/colors_standard.css');
} }
try { try {
$wa->useStyle('template.dark.colors_standard'); $wa->useStyle('template.dark.colors_standard');
} catch (\Throwable $e) { } catch (\Throwable $e) {
$wa->registerAndUseStyle('template.dark.colors_standard', $templatePath . '/css/global/dark/colors_standard.css'); $wa->registerAndUseStyle('template.dark.colors_standard', $templatePath . '/css/colors/dark/colors_standard.css');
} }
try { try {
$wa->useStyle($lightKey); $wa->useStyle($lightKey);
} catch (\Throwable $e) { } catch (\Throwable $e) {
$wa->registerAndUseStyle('template.light.dynamic', $templatePath . '/css/global/light/' . $colorLightKey . '.css'); $wa->registerAndUseStyle('template.light.dynamic', $templatePath . '/css/colors/light/' . $colorLightKey . '.css');
} }
try { try {
$wa->useStyle($darkKey); $wa->useStyle($darkKey);
} catch (\Throwable $e) { } catch (\Throwable $e) {
$wa->registerAndUseStyle('template.dark.dynamic', $templatePath . '/css/global/dark/' . $colorDarkKey . '.css'); $wa->registerAndUseStyle('template.dark.dynamic', $templatePath . '/css/colors/dark/' . $colorDarkKey . '.css');
} }
// Scripts // Scripts

8
src/templates/error.php
View File

@@ -66,22 +66,22 @@ $darkKey = 'template.dark.' . $colorDarkKey;
try { try {
$wa->useStyle('template.light.colors_standard'); $wa->useStyle('template.light.colors_standard');
} catch (\Throwable $e) { } catch (\Throwable $e) {
$wa->registerAndUseStyle('template.light.colors_standard', $templatePath . '/css/global/light/colors_standard.css'); $wa->registerAndUseStyle('template.light.colors_standard', $templatePath . '/css/colors/light/colors_standard.css');
copilot-pull-request-reviewer[bot] commented 2026-02-07 17:55:42 +00:00 (Migrated from github.com)
Review
Copy Link

$wrapper is computed from fluidContainer but never used anywhere in this file. Either apply it in the error page markup (as done in index.php) or remove it to avoid dead code.
`$wrapper` is computed from `fluidContainer` but never used anywhere in this file. Either apply it in the error page markup (as done in index.php) or remove it to avoid dead code. ```suggestion ```
} }
try { try {
$wa->useStyle('template.dark.colors_standard'); $wa->useStyle('template.dark.colors_standard');
} catch (\Throwable $e) { } catch (\Throwable $e) {
$wa->registerAndUseStyle('template.dark.colors_standard', $templatePath . '/css/global/dark/colors_standard.css'); $wa->registerAndUseStyle('template.dark.colors_standard', $templatePath . '/css/colors/dark/colors_standard.css');
} }
try { try {
$wa->useStyle($lightKey); $wa->useStyle($lightKey);
} catch (\Throwable $e) { } catch (\Throwable $e) {
$wa->registerAndUseStyle('template.light.dynamic', $templatePath . '/css/global/light/' . $colorLightKey . '.css'); $wa->registerAndUseStyle('template.light.dynamic', $templatePath . '/css/colors/light/' . $colorLightKey . '.css');
} }
try { try {
$wa->useStyle($darkKey); $wa->useStyle($darkKey);
} catch (\Throwable $e) { } catch (\Throwable $e) {
$wa->registerAndUseStyle('template.dark.dynamic', $templatePath . '/css/global/dark/' . $colorDarkKey . '.css'); $wa->registerAndUseStyle('template.dark.dynamic', $templatePath . '/css/colors/dark/' . $colorDarkKey . '.css');
} }
// Scripts // Scripts

8
src/templates/index.php
View File

@@ -97,25 +97,25 @@ $darkKey = 'template.dark.' . $colorDarkKey;
try { try {
$wa->useStyle('template.light.colors_standard'); $wa->useStyle('template.light.colors_standard');
} catch (\Throwable $e) { } catch (\Throwable $e) {
$wa->registerAndUseStyle('template.light.colors_standard', $templatePath . '/css/global/light/colors_standard.css'); $wa->registerAndUseStyle('template.light.colors_standard', $templatePath . '/css/colors/light/colors_standard.css');
} }
try { try {
$wa->useStyle('template.dark.colors_standard'); $wa->useStyle('template.dark.colors_standard');
} catch (\Throwable $e) { } catch (\Throwable $e) {
$wa->registerAndUseStyle('template.dark.colors_standard', $templatePath . '/css/global/dark/colors_standard.css'); $wa->registerAndUseStyle('template.dark.colors_standard', $templatePath . '/css/colors/dark/colors_standard.css');
} }
try { try {
$wa->useStyle($lightKey); $wa->useStyle($lightKey);
} catch (\Throwable $e) { } catch (\Throwable $e) {
$wa->registerAndUseStyle('template.light.dynamic', $templatePath . '/css/global/light/' . $colorLightKey . '.css'); $wa->registerAndUseStyle('template.light.dynamic', $templatePath . '/css/colors/light/' . $colorLightKey . '.css');
} }
try { try {
$wa->useStyle($darkKey); $wa->useStyle($darkKey);
} catch (\Throwable $e) { } catch (\Throwable $e) {
$wa->registerAndUseStyle('template.dark.dynamic', $templatePath . '/css/global/dark/' . $colorDarkKey . '.css'); $wa->registerAndUseStyle('template.dark.dynamic', $templatePath . '/css/colors/dark/' . $colorDarkKey . '.css');
} }
// Scripts // Scripts

2
src/templates/templateDetails.xml
View File

@@ -205,7 +205,7 @@
<field name="useFontScheme" type="groupedlist" label="TPL_MOKOCASSIOPEIA_FONT_LABEL" default="0"> <field name="useFontScheme" type="groupedlist" label="TPL_MOKOCASSIOPEIA_FONT_LABEL" default="0">
<option value="0">JNONE</option> <option value="0">JNONE</option>
<group label="TPL_MOKOCASSIOPEIA_FONT_GROUP_LOCAL"> <group label="TPL_MOKOCASSIOPEIA_FONT_GROUP_LOCAL">
<option value="media/templates/site/mokocassiopeia/css/global/fonts-local_roboto.css">Roboto (local)</option> <option value="media/templates/site/mokocassiopeia/css/colors/fonts-local_roboto.css">Roboto (local)</option>
</group> </group>
<group label="TPL_MOKOCASSIOPEIA_FONT_GROUP_WEB"> <group label="TPL_MOKOCASSIOPEIA_FONT_GROUP_WEB">
<option value="https://fonts.googleapis.com/css2?family=Fira+Sans:wght@100;300;400;700&amp;display=swap">Fira Sans (web)</option> <option value="https://fonts.googleapis.com/css2?family=Fira+Sans:wght@100;300;400;700&amp;display=swap">Fira Sans (web)</option>