aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-07-16 16:18:36 +0200
committerMario Vavti <mario@mariovavti.com>2016-07-16 16:18:36 +0200
commitf396b1bf735a7dc9eb3632e49c1269de54777c6d (patch)
treea3d3e953c27f19c79be70efc838a13d583ab58e9 /view/theme
parente237dfc660b7f3e7115dfb995479492b5cd2337f (diff)
downloadvolse-hubzilla-f396b1bf735a7dc9eb3632e49c1269de54777c6d.tar.gz
volse-hubzilla-f396b1bf735a7dc9eb3632e49c1269de54777c6d.tar.bz2
volse-hubzilla-f396b1bf735a7dc9eb3632e49c1269de54777c6d.zip
check for variables after schema files have been added
Diffstat (limited to 'view/theme')
-rw-r--r--view/theme/redbasic/php/style.php24
1 files changed, 12 insertions, 12 deletions
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')