Merge https://github.com/friendica/red into pending_merge

1 files changed, 107 insertions, 4 deletions

diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 49852036b..8984df788 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -87,8 +87,22 @@ if(! $a->install) {
 		$nav_icon_colour = "#999";
 	if (! $nav_active_icon_colour)
 		$nav_active_icon_colour = "#fff";
+	if (! $navtabs_borderc)
+		$navtabs_borderc = "#ddd";
+	if (! $navtabs_fontcolour)
+		$navtabs_fontcolour = "#555";
+	if (! $navtabs_bgcolour)
+		$navtabs_bgcolour = "#fff";
+	if (! $navtabs_linkcolour)
+		$navtabs_linkcolour = "";
+	if (! $navtabs_linkchover)
+		$navtabs_linkchover = "";
+	if (! $navtabs_decohover)
+		$navtabs_decohover = "none";
+	if (! $navtabs_bgchover)
+		$navtabs_bgchover = "#eee";
 	if (! $link_colour)
-		$link_colour = "#0080FF";
+		$link_colour = "#0080ff";
 	if (! $banner_colour)
 		$banner_colour = "#fff";
 	if (! $search_background)
@@ -100,23 +114,77 @@ if(! $a->install) {
 	if (! $item_colour)
 		$item_colour = "#fdfdfd";
 	if (! $toolicon_colour)
-		$toolicon_colour = '#777777';
+		$toolicon_colour = '#777';
 	if (! $toolicon_activecolour)
 		$toolicon_activecolour = '#000';
 	if (! $item_opacity)
 		$item_opacity = "1";
+	if (! $item_bordercolour)
+		$item_bordercolour = "#f4f4f4";
 	if (! $font_size)
 		$font_size = "1.0em";
 	if (! $body_font_size)
 		$body_font_size = "11px";
 	if (! $font_colour)
-		$font_colour = "#4D4D4D";
+		$font_colour = "#4d4d4d";
+	if (! $selected_active_colour)
+		$selected_active_colour = "#444";
+	if (! $selected_active_deco)
+		$selected_active_deco = "none";
+	if (! $blockquote_colour)
+		$blockquote_colour = "#000";
+	if (! $blockquote_bgcolour)
+		$blockquote_bgcolour = "#f4f8f9";
+	if (! $blockquote_bordercolour)
+		$blockquote_bordercolour = "#dae4ee";
+	if (! $notif_itemcolour)
+		$notif_itemcolour = "#000";
+	if (! $notif_itemhovercolour)
+		$notif_itemhovercolour = "#000";
+	if (! $editbuttons_bgcolour)
+		$editbuttons_bgcolour = "#fff";
+	if (! $editbuttons_bordercolour)
+		$editbuttons_bordercolour = "#ccc";
+	if (! $editbuttons_bghover)
+		$editbuttons_bghover = "#ebebeb";
+	if (! $acpopup_bgcolour)
+		$acpopup_bgcolour = "#fff";
+	if (! $acpopup_bordercolour)
+		$acpopup_bordercolour = "#ccc";
+	if (! $acpopup_tgbl_bgcolour)
+		$acpopup_tgbl_bgcolour = "#ddddff";
+	if (! $acpopup_hovercolour)
+		$acpopup_hovercolour = "#000";
+	if (! $notify_bgcolour)
+		$notify_bgcolour = "#fff";
+	if (! $notify_linkcolour)
+		$notify_linkcolour = "#333";	
+	if (! $notify_bghover)
+		$notify_bghover = "#e7e7e7";
+	if (! $notifyseen_bgcolour)
+		$notifyseen_bgcolour = "#ddd";
+	if (! $notifyseen_linkcolour)
+		$notifyseen_linkcolour = "#333";
+	if (! $notifyseen_bghover)
+		$notifyseen_bghover = "#e7e7e7";
+	if (! $notifyseen_linkhover)
+		$notifyseen_linkhover = "#333";
+	if (! $input_bgsubmit)
+		$input_bgsubmit = "#F0F0F0";
+	if (! $input_linksubmit)
+		$input_linksubmit = "#0080FF";
+	if (! $input_border)
+		$input_border = "#666";
+	if (! $input_colourhover)
+		$input_colourhover = "#333";
+	if (! $input_decohover)
+		$input_decohover = "none";
 	if (! $radius)
 		$radius = "0";
 	if (! $shadow)
 		$shadow = "0";
 	if(! $active_colour)
-		$active_colour = '#FFFFFF';
+		$active_colour = '#fff';
 	if (! $converse_width) {
 		$converse_width="1024px";
 	}
@@ -154,6 +222,13 @@ $options = array (
 '$nav_bd' => $nav_bd,
 '$nav_icon_colour' => $nav_icon_colour,
 '$nav_active_icon_colour' => $nav_active_icon_colour,
+'$navtabs_borderc' => $navtabs_borderc,
+'$navtabs_fontcolour' => $navtabs_fontcolour,
+'$navtabs_bgcolour' => $navtabs_bgcolour,
+'$navtabs_linkcolour' => $navtabs_linkcolour,
+'$navtabs_linkchover' => $navtabs_linkchover,
+'$navtabs_bgchover' => $navtabs_bgchover,
+'$navtabs_decohover' => $navtabs_decohover,
 '$link_colour' => $link_colour,
 '$banner_colour' => $banner_colour,
 '$search_background' => $search_background,
@@ -161,11 +236,39 @@ $options = array (
 '$background_image' => $background_image,
 '$item_colour' => $item_colour,
 '$item_opacity' => $item_opacity,
+'$item_bordercolour' => $item_bordercolour,
 '$toolicon_colour' => $toolicon_colour,
 '$toolicon_activecolour' => $toolicon_activecolour,
 '$font_size' => $font_size,
 '$font_colour' => $font_colour,
+'$selected_active_colour' => $selected_active_colour,
+'$selected_active_deco' => $selected_active_deco,
 '$body_font_size' => $body_font_size,
+'$blockquote_colour' => $blockquote_colour,
+'$blockquote_bgcolour' => $blockquote_bgcolour,
+'$blockquote_bordercolour' => $blockquote_bordercolour,
+'$blockquote_bgcolourhover' => $blockquote_bgcolourhover,
+'$notif_itemcolour' => $notif_itemcolour,
+'$notif_itemhovercolour' => $notif_itemhovercolour,
+'$editbuttons_bgcolour' => $editbuttons_bgcolour,
+'$editbuttons_bordercolour' => $editbuttons_bordercolour,
+'$editbuttons_bghover' => $editbuttons_bghover,
+'$acpopup_bgcolour' => $acpopup_bgcolour,
+'$acpopup_bordercolour' => $acpopup_bordercolour,
+'$acpopup_tgbl_bgcolour' => $acpopup_tgbl_bgcolour,
+'$acpopup_hovercolour' => $acpopup_hovercolour,
+'$notify_bgcolour' => $notify_bgcolour,
+'$notify_linkcolour' => $notify_linkcolour,
+'$notify_bghover' => $notify_bghover,
+'$notifyseen_bgcolour' => $notifyseen_bgcolour,
+'$notifyseen_linkcolour' => $notifyseen_linkcolour,
+'$notifyseen_bghover' => $notifyseen_bghover,
+'$notifyseen_linkhover' => $notifyseen_linkhover,
+'$input_bgsubmit' => $input_bgsubmit,
+'$input_linksubmit' => $input_linksubmit,
+'$input_border' => $input_border,
+'$input_colourhover' => $input_colourhover,
+'$input_decohover' => $input_decohover,
 '$radius' => $radius,
 '$shadow' => $shadow,
 '$active_colour' => $active_colour,