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

3 files changed, 6 insertions, 0 deletions

diff --git a/mod/acl.php b/mod/acl.php
index 2f1866f85..dea0047f2 100644
--- a/mod/acl.php
+++ b/mod/acl.php
@@ -251,6 +251,7 @@ function navbar_complete(&$a) {
 	}
 
 	if(! $url) {
+		require_once("include/dir_fns.php");
 		$directory = find_upstream_directory($dirmode);
 
 		if($directory) {
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 53d17ea04..5fb4e8b36 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -3389,6 +3389,8 @@ color-stop(0.82, #b00)
 );
 }
 
+/*
+
 nav:hover {
 
   background-image: linear-gradient(bottom, #f00 26%, #b00 82%);
@@ -3406,6 +3408,8 @@ color-stop(0.82, #b00)
 );
 }
 
+*/
+
 nav a,
 nav a:active,
 nav a:visited,
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index e5b128546..31b83394f 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -44,6 +44,7 @@
 	    if ($colour_scheme === 'fancyred') {$shadows = true; $navcolour = 'black'; $displaystyle = 'fancy'; $linkcolour = 'f00'; $shiny = "opaque";}
 	    // Dark themes are very different - we need to do some of these from scratch, so don't bother setting vars for anything else
 	    if ($colour_scheme === 'dark') {$colour = 'dark'; $navcolour = 'black';}
+	    if ($colour_scheme === 'redbasic'){$navcolour = 'red';}
 }
 
 // This is probably the easiest place to apply global settings.  Don't bother with site line height and such.  Instead, check pconfig for global user settings.