diff options
| author | Paolo Tacconi <p.tacconi@giunti.it> | 2016-04-15 09:20:58 +0200 |
|---|---|---|
| committer | Paolo Tacconi <p.tacconi@giunti.it> | 2016-04-15 09:20:58 +0200 |
| commit | 45a854762b451dafb882bc56efce054b64420627 (patch) | |
| tree | 958fcd22f04546f40b6ac68bb58cfe1a1b1fb7f6 /view/theme/redbasic/php/style.php | |
| parent | 1806da0851dd5cf5978b19d12783ae3101a11257 (diff) | |
| parent | a29c0371f1f3cceb9a9af3a62e5ed67886869c40 (diff) | |
| download | volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.gz volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.bz2 volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.zip | |
Resolved conflict in view/it/hstrings.php
Diffstat (limited to 'view/theme/redbasic/php/style.php')
| -rw-r--r-- | view/theme/redbasic/php/style.php | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index a0da5e302..83c35935a 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -1,6 +1,6 @@ <?php -if(! $a->install) { +if(! App::$install) { // Get the UID of the channel owner $uid = get_theme_uid(); @@ -40,7 +40,6 @@ if(! $a->install) { $nav_min_opacity=get_pconfig($uid,'redbasic','nav_min_opacity'); $top_photo=get_pconfig($uid,'redbasic','top_photo'); $reply_photo=get_pconfig($uid,'redbasic','reply_photo'); - } // Now load the scheme. If a value is changed above, we'll keep the settings @@ -154,7 +153,7 @@ if(file_exists('view/theme/redbasic/css/style.css')) { $x = file_get_contents('view/theme/redbasic/css/style.css'); - $aside_width = 285; + $aside_width = 287; // left aside and right aside are 285px + converse width if($align_left) { @@ -216,3 +215,8 @@ if($align_left && file_exists('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') + set_pconfig(local_channel(), 'redbasic', 'schema', '---'); |