Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts:
	util/messages.po

1 files changed, 7 insertions, 94 deletions

diff --git a/view/theme/redbasic/schema/simple_green_on_black.php b/view/theme/redbasic/schema/simple_green_on_black.php
index 6b104a4e6..2660624d6 100644
--- a/view/theme/redbasic/schema/simple_green_on_black.php
+++ b/view/theme/redbasic/schema/simple_green_on_black.php
@@ -16,108 +16,21 @@
 		$nav_icon_colour = "#32962D";
 	if (! $nav_active_icon_colour)
 		$nav_active_icon_colour = "#50f148";
-	if (! $navtabs_borderc)
-		$navtabs_borderc = "#143D12";
-	if (! $navtabs_fontcolour)
-		$navtabs_fontcolour = "#46D43F";
-	if (! $navtabs_bgcolour)
-		$navtabs_bgcolour = "#000";
-	if (! $navtabs_linkcolour)
-		$navtabs_linkcolour = "color: #50f148;";
-	if (! $navtabs_linkchover)
-		$navtabs_linkchover = "color: #50f148;";
-	if (! $navtabs_bgchover)
-		$navtabs_bgchover = "#000";
-	if (! $navtabs_decohover)
-		$navtabs_decohover = "underline";
-if (! $navaside_bghover)
-		$navaside_bghover = "#143D12";
-	if (! $link_colour)
-		$link_colour = "#50f148";
-	if (! $link_font_weight)
-		$link_font_weight = "bold";
-	if (! $selected_active_colour)
-		$selected_active_colour = "#50f148";
-	if (! $selected_active_deco)
-		$selected_active_deco = "underline";
 	if (! $banner_colour)
 		$banner_colour = "#000";
-	if (! $search_background)
-		$search_background = "#000";
+	if (! $link_colour)
+		$link_colour = "#50f148";
 	if (! $bgcolour)
-		$bgcolour = "#000";
-	if (! $genericcontent_bgcolour)
-		$genericcontent_bgcolour = 'rgba(0,0,0,0.8)';
+		$bgcolour = "#000";		
+	if (! $toolicon_colour)
+		$toolicon_colour = "#32962D";
+	if (! $toolicon_activecolour)
+		$toolicon_activecolour = "#50f148";
 	if (! $item_colour)
 		$item_colour = "rgba(0,0,0,0.8)";
 	if (! $comment_item_colour)
 		$comment_item_colour = "rgba(0,0,0,0.4)";
 	if (! $comment_border_colour)
 		$comment_border_colour = "rgba(0,0,0,0.8)";
-	if (! $toolicon_colour)
-		$toolicon_colour = '#32962D';
-	if (! $toolicon_activecolour)
-		$toolicon_activecolour = '#50f148';
 	if (! $font_colour)
 		$font_colour = "#46D43F";
-	if (! $blockquote_colour)
-		$blockquote_colour = "#32962D";
-	if (! $blockquote_bgcolour)
-		$blockquote_bgcolour = "#000";
-	if (! $blockquote_bordercolour)
-		$blockquote_bordercolour = "#143D12";
-	if (! $code_borderc)
-		$code_borderc = "#143D12";
-	if (! $code_bgcolour)
-		$code_bgcolour = "#000";
-	if (! $code_txtcolour)
-		$code_txtcolour = "#32962D";
-	if (! $pre_borderc)
-		$pre_borderc = "#143D12";
-	if (! $pre_bgcolour)
-		$pre_bgcolour = "#000";
-	if (! $pre_txtcolour)
-		$pre_txtcolour = "#32962D";
-	if (! $item_bordercolour)
-		$item_bordercolour = "#143D12";
-	if (! $notif_itemcolour)
-		$notif_itemcolour = "#50f148";
-	if (! $notif_itemhovercolour)
-		$notif_itemhovercolour = "#50f148";
-	if (! $acpopup_bgcolour)
-		$acpopup_bgcolour = "#000";
-	if (! $acpopup_bordercolour)
-		$acpopup_bordercolour = "#143D12";
-	if (! $acpopup_tgbl_bgcolour)
-		$acpopup_tgbl_bgcolour = "#000";
-	if (! $acpopup_hovercolour)
-		$acpopup_hovercolour = "#50f148";
-	if (! $dropdown_bgcolour)
-		$dropdown_bgcolour = "#000";
-	if (! $dropdown_textcolour)
-		$dropdown_textcolour = "#32962D";
-	if (! $dropdown_txtcolhover)
-		$dropdown_txtcolhover = "#50f148";
-	if (! $dropdown_bgcolhover)
-		$dropdown_bgcolhover = "#143D12";
-	if (! $dropdown_bgimghover)
-		$dropdown_bgimghover = "background-image: none;";
-	if (! $dropdown_togglecol)
-		$dropdown_togglecol = "#50f148";
-	if (! $dropdown_togglebgcol)
-		$dropdown_togglebgcol = "#000";
-	if (! $dropdown_bordercol)
-		$dropdown_bordercol = "#143D12";
-	if (! $preview_backgroundimg)
-		$preview_backgroundimg = "gray_and_black_diagonal_stripes_background_seamless.gif";
-
-
-
-
-
-
-
-
-
-
-