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

4 files changed, 25 insertions, 20 deletions

diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index 752a02a6a..8dbe1be9c 100644
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -5,10 +5,20 @@ namespace Zotlabs\Theme;
 class RedbasicConfig {
 
 	function get_schemas() {
-		$scheme_choices = array();
-		$scheme_choices["---"] = t("Focus (Hubzilla default)");
 		$files = glob('view/theme/redbasic/schema/*.php');
+
+		$scheme_choices = [];
+
 		if($files) {
+
+			if(in_array('view/theme/redbasic/schema/default.php', $files)) {
+				$scheme_choices['---'] = t('Default');
+				$scheme_choices['focus'] = t('Focus (Hubzilla default)');
+			}
+			else {
+				$scheme_choices['---'] = t('Focus (Hubzilla default)');
+			}
+
 			foreach($files as $file) {
 				$f = basename($file, ".php");
 				if($f != 'default') {
@@ -17,6 +27,7 @@ class RedbasicConfig {
 				}
 			}
 		}
+
 		return $scheme_choices;
 	}
 
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index a666f96f2..06cf23ba2 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -56,10 +56,9 @@ if (($schema) && ($schema != '---')) {
 
 }
 
-// If we haven't got a schema, load the default.  We shouldn't touch this - we
-// should leave it for admins to define for themselves.
-// default.php and default.css MUST be symlinks to existing schema files.
-if (! $schema) {
+// Allow admins to set a default schema for the hub.
+// default.php and default.css MUST be symlinks to existing schema files in view/theme/redbasic/schema
+if ((!$schema) || ($schema == '---')) {
 
 	if(file_exists('view/theme/redbasic/schema/default.php')) {
 		$schemefile = 'view/theme/redbasic/schema/default.php';
diff --git a/view/theme/redbasic/php/theme_init.php b/view/theme/redbasic/php/theme_init.php
index 020bda363..bfeabcb46 100644
--- a/view/theme/redbasic/php/theme_init.php
+++ b/view/theme/redbasic/php/theme_init.php
@@ -8,6 +8,7 @@ head_add_css('/library/datetimepicker/jquery.datetimepicker.css');
 head_add_css('/library/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.min.css');
 require_once('view/php/theme_init.php');
 
+head_add_js('/library/popper/popper.js');
 head_add_js('/library/bootstrap/js/bootstrap.min.js');
 head_add_js('/library/bootbox/bootbox.min.js');
 head_add_js('/library/bootstrap-tagsinput/bootstrap-tagsinput.js');
diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css
index 756c583ff..b1aa5e07a 100644
--- a/view/theme/redbasic/schema/dark.css
+++ b/view/theme/redbasic/schema/dark.css
@@ -274,26 +274,20 @@ nav .dropdown-menu {
 	background: #999;
 }
 
-.nav-tabs{
+.nav-tabs {
 	border-bottom:1px solid #333;
 }
 
-.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{
-	border:1px solid #333;
-}
-
-.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus { 
+.nav-tabs .nav-link.active { 
 	color: #fff;
-	background-color: #111; 
-}
-
-.nav-tabs.nav-justified > li > a {
-	color: #ccc;
+	background-color: #111;
+	border-color: #333;
 }
 
-.nav-tabs > li > a:hover, .nav-tabs > li > a:focus {
-    text-decoration: underline;
-    background-color: #222;
+.nav-tabs .nav-link:hover,
+.nav-tabs .nav-link:focus {
+	text-decoration: underline;
+	background-color: #222;
 	color: #ccc;
 	border-color: #333;
 }