diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-07-16 21:04:04 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-07-16 21:04:04 -0400 |
| commit | 99354ac57622002c0bbd820235d03321406f8d39 (patch) | |
| tree | f8ad698a1c901f757dfc4354721846c8be82ab7e /view/theme/redbasic/php | |
| parent | e7b853175154688d60d83ca5935650d1128973c6 (diff) | |
| parent | f396b1bf735a7dc9eb3632e49c1269de54777c6d (diff) | |
| download | volse-hubzilla-99354ac57622002c0bbd820235d03321406f8d39.tar.gz volse-hubzilla-99354ac57622002c0bbd820235d03321406f8d39.tar.bz2 volse-hubzilla-99354ac57622002c0bbd820235d03321406f8d39.zip | |
Merge remote-tracking branch 'upstream/dev' into website-import-remote
Diffstat (limited to 'view/theme/redbasic/php')
| -rw-r--r-- | view/theme/redbasic/php/style.php | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 83c35935a..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 $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') |