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

3 files changed, 32 insertions, 3 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 35cf66991..39cfcaec3 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1541,15 +1541,15 @@ header {
 }
 
 
-#nav-notify-menu {
+#nav-notify-menu, #nav-network-menu, #nav-home-menu {
 	background: $notify_bgcolour;
 }
  	
-#nav-notify-menu a {
+#nav-notify-menu a, #nav-network-menu a, #nav-home-menu a {
 	color: $notify_linkcolour;
 }
 
-#nav-notify-menu a:hover {
+#nav-notify-menu a:hover, #nav-network-menu a:hover, #nav-home-menu a:hover {
 	background: $notify_bghover;
 }
 
@@ -2139,6 +2139,21 @@ nav .dropdown-menu {
 	border-top-left-radius: 0px;
 	border-bottom-right-radius: $radiuspx;
 	border-bottom-left-radius: $radiuspx;
+	background-color: $notify_bgcolour;
+}
+
+nav .dropdown-menu .divider{
+	background-color: $navmenu_bgchover;
+}
+
+nav .dropdown-menu>li>a{
+	color: $notify_linkcolour;
+}
+
+nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
+	color: $notify_linkcolour;
+	background-color: $navmenu_bgchover;
+	$navmenu_bgimage
 }
 
 #usermenu-caret {
@@ -2274,6 +2289,10 @@ blockquote {
 	text-decoration: $input_decohover;
 }
 
+.btn-primary {
+    z-index: 10;
+}
+
 @media screen and (max-width: 767px) {
 	aside#region_1 {
 		background: rgba(0, 0, 0, .1);
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index f25d7228a..5546b134e 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -87,6 +87,10 @@ if(! $a->install) {
 		$nav_icon_colour = "#999";
 	if (! $nav_active_icon_colour)
 		$nav_active_icon_colour = "#fff";
+	if (! $navmenu_bgchover)
+		$navmenu_bgchover = "#f5f5f5";
+	if (! $navmenu_bgimage)
+		$navmenu_bgimage = "";
 	if (! $navtabs_borderc)
 		$navtabs_borderc = "#ddd";
 	if (! $navtabs_fontcolour)
@@ -238,6 +242,8 @@ $options = array (
 '$nav_bd' => $nav_bd,
 '$nav_icon_colour' => $nav_icon_colour,
 '$nav_active_icon_colour' => $nav_active_icon_colour,
+'$navmenu_bgchover' => $navmenu_bgchover,
+'$navmenu_bgimage' => $navmenu_bgimage,
 '$navtabs_borderc' => $navtabs_borderc,
 '$navtabs_fontcolour' => $navtabs_fontcolour,
 '$navtabs_bgcolour' => $navtabs_bgcolour,
diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php
index 1572ea9b0..063df9210 100644
--- a/view/theme/redbasic/schema/dark.php
+++ b/view/theme/redbasic/schema/dark.php
@@ -16,6 +16,10 @@
 		$nav_icon_colour = "#999";
 	if (! $nav_active_icon_colour)
 		$nav_active_icon_colour = "#fff";
+	if (! $navmenu_bgchover)
+		$navmenu_bgchover = "#222";
+	if (! $navmenu_bgimage)
+		$navmenu_bgimage = "background-image: none;";
 	if (! $navtabs_borderc)
 		$navtabs_borderc = "#333";
 	if (! $navtabs_fontcolour)