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

3 files changed, 15 insertions, 5 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 7641949e3..b14984981 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -748,7 +748,7 @@ footer {
 	display: block;
 	color: #FFFFFF;
 	margin-top: 15px;
-	background-color: $nav_bg_2;
+	background-color: $nav_bg;
 	-webkit-border-radius: $radiuspx ;
 	-moz-border-radius: $radiuspx;
 	border-radius: $radiuspx;
@@ -837,7 +837,7 @@ footer {
 #nav-search-spinner {
 	float: left;
 	margin: 25px 0px 0px 25px;
-	color: #fff;
+	color: $nav_active_icon_colour;
 }
 
 #nav-search-text:hover,
@@ -1490,7 +1490,7 @@ div.jGrowl div.info {
 #nav-search-text-ac .autocomplete {
 	position: fixed;
 	top: 51px;
-	border: 1px solid #222;
+	border: 1px solid $nav_bd;
 	border-top: none;
 }
 
@@ -2262,5 +2262,11 @@ blockquote {
 .navbar-inverse .navbar-nav > .active > a:hover,
 .navbar-inverse .navbar-nav > .active > a:focus {
 	color: $nav_active_icon_colour;
-	background-color: $nav_bg;
+}
+
+.navbar-inverse .navbar-nav > .open > a,
+.navbar-inverse .navbar-nav > .open > a:hover,
+.navbar-inverse .navbar-nav > .open > a:focus {
+	background-color: $nav_bd;
+	color: $nav_active_icon_colour;
 }
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 9e6adb2a4..4bb852a40 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -89,7 +89,9 @@ if(! $a->install) {
 	if (! $link_colour)
 		$link_colour = "#0080FF";
 	if (! $banner_colour)
-		$banner_colour = "fff";
+		$banner_colour = "#fff";
+	if (! $search_background)
+		$search_background = "#eee";
 	if (! $bgcolour)
 		$bgcolour = "#fdfdfd";
 	if (! $background_image)
diff --git a/view/theme/redbasic/schema/BS-Default.php b/view/theme/redbasic/schema/BS-Default.php
index 401045c7b..f93e879e3 100644
--- a/view/theme/redbasic/schema/BS-Default.php
+++ b/view/theme/redbasic/schema/BS-Default.php
@@ -16,3 +16,5 @@
 		$nav_icon_colour = "#777";
 	if (! $nav_active_icon_colour)
 		$nav_active_icon_colour = "#555";
+	if (! $radius)
+		$radius = "4";