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

3 files changed, 33 insertions, 7 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 5e7d87df5..06aa08030 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -534,11 +534,18 @@ aside li {
 
 }
 
-
 .directory-details {
 	font-size: 0.7em;
 }
 
+#cboxContent {
+    color: $dirpopup_txtcol;
+}
+
+#cboxContent a {
+    color: $dirpopup_linkcol;
+}
+
 .app-name {
 	width: 125px;
 	overflow: none;
@@ -1802,6 +1809,10 @@ text-decoration: none;
 	margin-right: 10px;
 }
 
+#adminpage table tr:hover {
+    background-color: $admintable_hoverbgcol;
+}
+
 /* message */
 
 img.mail-list-sender-photo {
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 1165fab95..23d9c695f 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -269,8 +269,14 @@ if(! $a->install) {
 	if (!$comment_border_top)
 		$comment_border_top="0px solid";		
 	if (!$comment_border_bottom)
-		$comment_border_bottom="0px solid";	
-		
+		$comment_border_bottom="0px solid";
+	if (!$admintable_hoverbgcol)
+		$admintable_hoverbgcol="#BBC7D7";
+	if (!$dirpopup_txtcol)
+		$dirpopup_txtcol="";
+	if (!$dirpopup_linkcol)
+		$dirpopup_linkcol="";
+
 	if($nav_min_opacity === false || $nav_min_opacity === '') {
 		$nav_float_min_opacity = 1.0;
 		$nav_percent_min_opacity = 100;
@@ -387,10 +393,13 @@ $options = array (
 '$comment_indent' => $comment_indent,
 '$body_width' => $body_width,
 '$comment_padding' => $comment_padding,
-'$comment_border_left' =>$comment_border_left,
-'$comment_border_right' =>$comment_border_right,
-'$comment_border_top' =>$comment_border_top,
-'$comment_border_bottom' =>$comment_border_bottom,
+'$comment_border_left' => $comment_border_left,
+'$comment_border_right' => $comment_border_right,
+'$comment_border_top' => $comment_border_top,
+'$comment_border_bottom' => $comment_border_bottom,
+'$admintable_hoverbgcol' => $admintable_hoverbgcol,
+'$dirpopup_txtcol' => $dirpopup_txtcol,
+'$dirpopup_linkcol' => $dirpopup_linkcol,
 );
 
 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 4d53def95..69fcf403f 100644
--- a/view/theme/redbasic/schema/dark.php
+++ b/view/theme/redbasic/schema/dark.php
@@ -164,3 +164,9 @@
                  $cal_bgcolour = "#333";
         if(! $fancybox_bgcolour)
                 $fancybox_bgcolour = "#1E1E1E";
+	if (!$admintable_hoverbgcol)
+		$admintable_hoverbgcol="#222";
+	if (!$dirpopup_txtcol)
+		$dirpopup_txtcol="#111";
+	if (!$dirpopup_linkcol)
+		$dirpopup_linkcol="#000";