From f1245206ceadd60fec4bd00948c115f74ad6dbd7 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 2 Feb 2016 12:40:40 +0100 Subject: change aside width to reflect recent widget style changes --- 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 a0da5e302..443ebb1fb 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -154,7 +154,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) { -- cgit v1.2.3 From 48963f62f974ce4f2d8e26c344b65e87f704e4d6 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 8 Feb 2016 22:19:38 +0100 Subject: avoid collapsing only above the viewport --- view/theme/redbasic/php/style.php | 1 - 1 file changed, 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 443ebb1fb..0ca47b1fb 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -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 -- cgit v1.2.3 From 7a5213cc8e7aee131df4347442b05c56c47a3fac Mon Sep 17 00:00:00 2001 From: Jeroen van Riet Paap Date: Mon, 7 Mar 2016 17:03:02 +0100 Subject: Set the schema to the default schema in derived themes. See the documentation for creating derived themes how to override this. --- view/theme/redbasic/php/style.php | 5 +++++ 1 file changed, 5 insertions(+) (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 0ca47b1fb..ef1450681 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -215,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($a->channel['channel_theme'] != 'redbasic') + set_pconfig(local_channel(), 'redbasic', 'schema', '---'); -- cgit v1.2.3 From 7bb461380e6198987da8827210297c29d301d022 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Wed, 9 Mar 2016 14:15:50 -0800 Subject: issue #319 - make sure we have a local_channel() and an App::channel before trying to change the default schema for a channel --- 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 ef1450681..6058a3c14 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -218,5 +218,5 @@ if($schemecss) { // Set the schema to the default schema in derived themes. See the documentation for creating derived themes how to override this. -if($a->channel['channel_theme'] != 'redbasic') +if(local_channel() && $a->channel && $a->channel['channel_theme'] != 'redbasic') set_pconfig(local_channel(), 'redbasic', 'schema', '---'); -- cgit v1.2.3 From 9abd95fad3784a10fc48bc40f9b8a75d7d74edda Mon Sep 17 00:00:00 2001 From: redmatrix Date: Thu, 31 Mar 2016 16:06:03 -0700 Subject: static App --- view/theme/redbasic/php/style.php | 4 ++-- 1 file changed, 2 insertions(+), 2 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 6058a3c14..83c35935a 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -1,6 +1,6 @@ install) { +if(! App::$install) { // Get the UID of the channel owner $uid = get_theme_uid(); @@ -218,5 +218,5 @@ if($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() && $a->channel && $a->channel['channel_theme'] != 'redbasic') +if(local_channel() && App::$channel && App::$channel['channel_theme'] != 'redbasic') set_pconfig(local_channel(), 'redbasic', 'schema', '---'); -- cgit v1.2.3