Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

2 files changed, 10 insertions, 6 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 0dee7dead..71ae085ea 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1344,13 +1344,17 @@ main.fullscreen .section-content-wrapper-np {
 /* bootstrap overrides */
 
 .btn,
-.rounded-top,
 .form-control,
 .nav-pills .nav-link,
 .nav-tabs .nav-link {
 	border-radius: $radius;
 }
 
+.rounded-top {
+	border-top-left-radius: $radius !important;
+	border-top-right-radius: $radius !important;
+}
+
 blockquote {
 	font-size: 1rem;
 	font-style: italic;
@@ -1380,17 +1384,17 @@ blockquote {
 	background-color: $item_colour;
 }
 
-.bg-inverse {
+.bg-dark {
 	background-color: $nav_bg !important;
 }
 
-.navbar-inverse .navbar-nav .nav-link,
+.navbar-dark .navbar-nav .nav-link,
 .usermenu i {
 	color: $nav_icon_colour;
 }
 
-.navbar-inverse .navbar-nav .nav-link:focus,
-.navbar-inverse .navbar-nav .nav-link:hover,
+.navbar-dark .navbar-nav .nav-link:focus,
+.navbar-dark .navbar-nav .nav-link:hover,
 .usermenu:focus i,
 .usermenu:hover i {
 	color: $nav_active_icon_colour;
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 06cf23ba2..ad8220028 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -74,7 +74,7 @@ if ((!$schema) || ($schema == '---')) {
 //Set some defaults - we have to do this after pulling owner settings, and we have to check for each setting
 //individually.  If we don't, we'll have problems if a user has set one, but not all options.
 if (! $nav_bg)
-	$nav_bg = '#222';
+	$nav_bg = '#343a40';
 if (! $nav_icon_colour)
 	$nav_icon_colour = 'rgba(255, 255, 255, 0.5)';
 if (! $nav_active_icon_colour)