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

3 files changed, 14 insertions, 5 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index bcbaec3d0..4062c259c 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -2184,6 +2184,10 @@ img.mail-list-sender-photo {
 	background-color: $abookself_bgcolour;
 }
 
+.abook-pending-contact, .abook-permschange {
+	background: $abook_changebg;
+}
+
 .online-now {
 	color: red;
 	cursor: pointer;
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 4ffdcbef8..dbe7c306d 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -276,6 +276,8 @@ if(! $a->install) {
 		$dirpopup_txtcol="";
 	if (!$dirpopup_linkcol)
 		$dirpopup_linkcol="";
+	if (!$abook_changebg)
+		$abook_changebg="orange";
 
 	if($nav_min_opacity === false || $nav_min_opacity === '') {
 		$nav_float_min_opacity = 1.0;
@@ -400,6 +402,7 @@ $options = array (
 '$admintable_hoverbgcol' => $admintable_hoverbgcol,
 '$dirpopup_txtcol' => $dirpopup_txtcol,
 '$dirpopup_linkcol' => $dirpopup_linkcol,
+'$abook_changebg' => $abook_changebg,
 );
 
 echo str_replace(array_keys($options), array_values($options), $x);    
diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php
index 69fcf403f..a4b43b31e 100644
--- a/view/theme/redbasic/schema/dark.php
+++ b/view/theme/redbasic/schema/dark.php
@@ -154,15 +154,15 @@
 		$abookself_bgcolour = "#251111";
 	if(! $infomess_bgcolour)
 		$infomess_bgcolour = "#333";
-        if(! $advperm_bgcolour)
+   if(! $advperm_bgcolour)
                 $advperm_bgcolour = "#1E1E1E";
-        if(! $advperm_bordercol)
+   if(! $advperm_bordercol)
                 $advperm_bordercol = "#222";
-        if(! $advperm_gradientcol)
+   if(! $advperm_gradientcol)
                 $advperm_gradientcol = "#111";
-        if(! $cal_bgcolour)
+   if(! $cal_bgcolour)
                  $cal_bgcolour = "#333";
-        if(! $fancybox_bgcolour)
+   if(! $fancybox_bgcolour)
                 $fancybox_bgcolour = "#1E1E1E";
 	if (!$admintable_hoverbgcol)
 		$admintable_hoverbgcol="#222";
@@ -170,3 +170,5 @@
 		$dirpopup_txtcol="#111";
 	if (!$dirpopup_linkcol)
 		$dirpopup_linkcol="#000";
+	if (!$abook_changebg)
+		$abook_changebg="#402900";