Skip to content

Commit

Permalink
respect inheritance
Browse files Browse the repository at this point in the history
Signed-off-by: Dimitris Grammatikogiannis <dg@dgrammatiko.dev>
  • Loading branch information
dgrammatiko committed Nov 5, 2023
1 parent c9b3181 commit ea72d4d
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 10 deletions.
2 changes: 1 addition & 1 deletion templates/cassiopeia/component.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
// Color Theme
$paramsColorName = $this->params->get('colorName', 'colors_standard');
$assetColorName = 'theme.' . $paramsColorName;
$wa->registerAndUseStyle($assetColorName, 'media/templates/site/cassiopeia/css/global/' . $paramsColorName . '.css');
$wa->registerAndUseStyle($assetColorName, 'global/' . $paramsColorName . '.css', ['relative' => true]);

// Use a font scheme if set in the template style options
$paramsFontScheme = $this->params->get('useFontScheme', false);
Expand Down
5 changes: 1 addition & 4 deletions templates/cassiopeia/error.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,10 @@
$menu = $app->getMenu()->getActive();
$pageclass = $menu !== null ? $menu->getParams()->get('pageclass_sfx', '') : '';

// Template path
$templatePath = 'media/templates/site/cassiopeia';

// Color Theme
$paramsColorName = $this->params->get('colorName', 'colors_standard');
$assetColorName = 'theme.' . $paramsColorName;
$wa->registerAndUseStyle($assetColorName, $templatePath . '/css/global/' . $paramsColorName . '.css');
$wa->registerAndUseStyle($assetColorName, 'global/' . $paramsColorName . '.css', ['relative' => true]);

// Use a font scheme if set in the template style options
$paramsFontScheme = $this->params->get('useFontScheme', false);
Expand Down
2 changes: 1 addition & 1 deletion templates/cassiopeia/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
// Color Theme
$paramsColorName = $this->params->get('colorName', 'colors_standard');
$assetColorName = 'theme.' . $paramsColorName;
$wa->registerAndUseStyle($assetColorName, 'media/templates/site/cassiopeia/css/global/' . $paramsColorName . '.css');
$wa->registerAndUseStyle($assetColorName, 'global/' . $paramsColorName . '.css', ['relative' => true]);

// Use a font scheme if set in the template style options
$paramsFontScheme = $this->params->get('useFontScheme', false);
Expand Down
5 changes: 1 addition & 4 deletions templates/cassiopeia/offline.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,10 @@

$fullWidth = 1;

// Template path
$templatePath = 'media/templates/site/cassiopeia';

// Color Theme
$paramsColorName = $this->params->get('colorName', 'colors_standard');
$assetColorName = 'theme.' . $paramsColorName;
$wa->registerAndUseStyle($assetColorName, $templatePath . '/css/global/' . $paramsColorName . '.css');
$wa->registerAndUseStyle($assetColorName, 'global/' . $paramsColorName . '.css', ['relative' => true]);

// Use a font scheme if set in the template style options
$paramsFontScheme = $this->params->get('useFontScheme', false);
Expand Down

0 comments on commit ea72d4d

Please sign in to comment.