From 1dda77596926fe08990c8a6f31412a38fbc602b5 Mon Sep 17 00:00:00 2001
From: Jeroen <jeroenpraat@xs4all.nl>
Date: Fri, 10 Oct 2014 13:35:16 +0000
Subject: Good compromise I think. Remove display setting . Set the default
 (light) schema to  = , so that other schemas can still use .

---
 view/theme/redbasic/php/config.php | 3 ---
 view/theme/redbasic/php/style.php  | 5 ++---
 2 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'view/theme/redbasic/php')

diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index 4c889008a..bfef8216c 100644
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -25,7 +25,6 @@ function theme_content(&$a) {
 	$arr['comment_indent'] = get_pconfig(local_user(),'redbasic', 'comment_indent' );
 	$arr['toolicon_colour'] = get_pconfig(local_user(),'redbasic','toolicon_colour');
 	$arr['toolicon_activecolour'] = get_pconfig(local_user(),'redbasic','toolicon_activecolour');
-	$arr['genericcontent_bgcolour'] = get_pconfig(local_user(),'redbasic', 'genericcontent_bgcolour' );
 	$arr['font_size'] = get_pconfig(local_user(),'redbasic', 'font_size' );
 	$arr['body_font_size'] = get_pconfig(local_user(),'redbasic', 'body_font_size' );
 	$arr['font_colour'] = get_pconfig(local_user(),'redbasic', 'font_colour' );
@@ -64,7 +63,6 @@ function theme_post(&$a) {
 		set_pconfig(local_user(), 'redbasic', 'comment_indent', $_POST['redbasic_comment_indent']);
 		set_pconfig(local_user(), 'redbasic', 'toolicon_colour', $_POST['redbasic_toolicon_colour']);
 		set_pconfig(local_user(), 'redbasic', 'toolicon_activecolour', $_POST['redbasic_toolicon_activecolour']);
-		set_pconfig(local_user(), 'redbasic', 'genericcontent_bgcolour', $_POST['redbasic_genericcontent_bgcolour']);		
 		set_pconfig(local_user(), 'redbasic', 'font_size', $_POST['redbasic_font_size']);
 		set_pconfig(local_user(), 'redbasic', 'body_font_size', $_POST['redbasic_body_font_size']);
 		set_pconfig(local_user(), 'redbasic', 'font_colour', $_POST['redbasic_font_colour']);
@@ -122,7 +120,6 @@ if(feature_enabled(local_user(),'expert'))
 		'$comment_indent' => array('redbasic_comment_indent', t('Set the indent for comments'), $arr['comment_indent']),
 		'$toolicon_colour' => array('redbasic_toolicon_colour',t('Set the basic color for item icons'),$arr['toolicon_colour']),
 		'$toolicon_activecolour' => array('redbasic_toolicon_activecolour',t('Set the hover color for item icons'),$arr['toolicon_activecolour']),
-		'$genericcontent_bgcolour' => array('redbasic_genericcontent_bgcolour',t('Set the background color of other content'),$arr['genericcontent_bgcolour']),
 		'$body_font_size' => array('redbasic_body_font_size', t('Set font-size for the entire application'), $arr['body_font_size']),
 		'$font_size' => array('redbasic_font_size', t('Set font-size for posts and comments'), $arr['font_size']),
 		'$font_colour' => array('redbasic_font_colour', t('Set font-color for posts and comments'), $arr['font_colour']),
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 104d9d51e..045ddc309 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -24,7 +24,6 @@ if(! $a->install) {
 		$background_image = get_pconfig($uid, "redbasic", "background_image");	
 		$toolicon_colour = get_pconfig($uid,'redbasic','toolicon_colour');
 		$toolicon_activecolour = get_pconfig($uid,'redbasic','toolicon_activecolour');
-		$genericcontent_bgcolour = get_pconfig($uid, "redbasic", "genericcontent_bgcolour");
 		$item_colour = get_pconfig($uid, "redbasic", "item_colour");
 		$comment_item_colour = get_pconfig($uid, "redbasic", "comment_item_colour");
 		$comment_border_colour = get_pconfig($uid, "redbasic", "comment_border_colour");
@@ -122,12 +121,12 @@ if(! $a->install) {
 		$bgcolour = "#fdfdfd";
 	if (! $background_image)
 		$background_image ='';
-	if (! $genericcontent_bgcolour)
-		$genericcontent_bgcolour ='rgba(247,247,247,0.8)';
 	if (! $item_colour)
 		$item_colour = "rgba(238,238,238,0.8)";
 	if (! $comment_item_colour)
 		$comment_item_colour = "rgba(254,254,254,0.4)";
+	if (! $genericcontent_bgcolour)
+		$genericcontent_bgcolour = $comment_item_colour;
 	if (! $comment_border_colour)
 		$comment_border_colour = "rgba(238,238,238,0.8)";
 	if (! $toolicon_colour)
-- 
cgit v1.2.3