From e237dfc660b7f3e7115dfb995479492b5cd2337f Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 16 Jul 2016 12:32:22 +0200 Subject: check for variables in schemes --- view/theme/redbasic/php/style.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/theme/redbasic/php/style.php') diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 83c35935a..2d6ee38c5 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -213,7 +213,7 @@ if($align_left && file_exists('view/theme/redbasic/css/align_left.css')) { } if($schemecss) { - echo $schemecss; + echo str_replace(array_keys($options), array_values($options), $schemecss); } // Set the schema to the default schema in derived themes. See the documentation for creating derived themes how to override this. -- cgit v1.2.3 From f396b1bf735a7dc9eb3632e49c1269de54777c6d Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 16 Jul 2016 16:18:36 +0200 Subject: check for variables after schema files have been added --- view/theme/redbasic/php/style.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'view/theme/redbasic/php/style.php') diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 2d6ee38c5..2db0d4c44 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -153,6 +153,18 @@ if(file_exists('view/theme/redbasic/css/style.css')) { $x = file_get_contents('view/theme/redbasic/css/style.css'); + if($narrow_navbar && file_exists('view/theme/redbasic/css/narrow_navbar.css')) { + $x .= file_get_contents('view/theme/redbasic/css/narrow_navbar.css'); + } + + if($align_left && file_exists('view/theme/redbasic/css/align_left.css')) { + $x .= file_get_contents('view/theme/redbasic/css/align_left.css'); + } + + if($schemecss) { + $x .= $schemecss; + } + $aside_width = 287; // left aside and right aside are 285px + converse width @@ -204,18 +216,6 @@ if(file_exists('view/theme/redbasic/css/style.css')) { } -if($narrow_navbar && file_exists('view/theme/redbasic/css/narrow_navbar.css')) { - echo file_get_contents('view/theme/redbasic/css/narrow_navbar.css'); -} - -if($align_left && file_exists('view/theme/redbasic/css/align_left.css')) { - echo file_get_contents('view/theme/redbasic/css/align_left.css'); -} - -if($schemecss) { - echo str_replace(array_keys($options), array_values($options), $schemecss); -} - // Set the schema to the default schema in derived themes. See the documentation for creating derived themes how to override this. if(local_channel() && App::$channel && App::$channel['channel_theme'] != 'redbasic') -- cgit v1.2.3