Merge branch '9.2RC'master

3 files changed, 11 insertions, 48 deletions

diff --git a/view/theme/redbasic/css/narrow_navbar.css b/view/theme/redbasic/css/narrow_navbar.css
index 9f915418e..2b0ec9a05 100644
--- a/view/theme/redbasic/css/narrow_navbar.css
+++ b/view/theme/redbasic/css/narrow_navbar.css
@@ -4,9 +4,4 @@
 		--bs-navbar-padding-y: 1px;
 	}
 
-	#jGrowl.top-right {
-		top: 3.5rem;
-		right: 15px;
-	}
-
 }
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 56194c735..2de40d671 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -168,6 +168,11 @@ input[type=text], textarea {
 	color: #FF0000;
 }
 
+#toast-container {
+	z-index: 1060;
+	width: 300px;
+}
+
 #powered-by {
 	font-size: 0.5rem;
 	position: absolute;
@@ -708,26 +713,6 @@ nav .acpopup {
 	color:#cc0000;
 }
 
-/* popup notifications */
-div.jGrowl div.notice {
-  background: #511919 url("../../../../images/icons/48/notice.png") no-repeat 5px center;
-  color: #ffffff;
-  padding-left: 58px;
-}
-div.jGrowl div.info {
-  background: #364e59 url("../../../../images/icons/48/info.png") no-repeat 5px center;
-  color: #ffffff;
-  padding-left: 58px;
-}
-#jGrowl.top-right {
-	top: 4.5rem;
-	right: .25rem;
-}
-
-div.jGrowl div.jGrowl-notification {
-    min-height: 60px;
-}
-
 .jslider .jslider-scale ins {
 	color: #333;
 	font-size: 1rem;
@@ -796,7 +781,7 @@ div.jGrowl div.jGrowl-notification {
 
 .shared_header img {
 	border-radius: var(--bs-border-radius);
-	margin-right: .75rem;
+	margin-right: .5rem;
 }
 
 .tag1 {
@@ -910,25 +895,6 @@ a .drop-icons:hover {
 	list-style-type: none;
 }
 
-table {
-	border-spacing: 2px;
-	max-width: 100%;
-}
-
-th,td {
-	padding: 3px;
-}
-
-#channels > tbody > tr > td, #users > tbody > tr > td {
-	max-width: 19.4em;
-	overflow: hidden;
-}
-
-/* mail */
-
-img.mail-conv-sender-photo {
-	border-radius: var(--bs-border-radius);
-}
 
 /* jot */
 
@@ -1098,7 +1064,7 @@ img.mail-conv-sender-photo {
 }
 
 .abook-self {
-	background-color: #ffdddd;
+	background-color: var(--bs-light-bg-subtle);
 }
 
 .abook-pending-contact, .abook-permschange {
diff --git a/view/theme/redbasic/php/theme_init.php b/view/theme/redbasic/php/theme_init.php
index 54e6e7be3..cffe22de6 100644
--- a/view/theme/redbasic/php/theme_init.php
+++ b/view/theme/redbasic/php/theme_init.php
@@ -1,4 +1,6 @@
 <?php
+use Zotlabs\Lib\Config;
+
 require_once('view/php/theme_init.php');
 
 head_add_css('/library/fork-awesome/css/fork-awesome.min.css');
@@ -24,8 +26,8 @@ if (App::$profile_uid) {
 }
 
 if (!$redbasic_mode) {
-	$redbasic_mode = ((get_config('redbasic', 'dark_mode')) ? 'dark' : 'light');
-	$redbasic_navbar_mode = ((get_config('redbasic', 'navbar_dark_mode')) ? 'dark' : 'light');
+	$redbasic_mode = ((Config::Get('redbasic', 'dark_mode')) ? 'dark' : 'light');
+	$redbasic_navbar_mode = ((Config::Get('redbasic', 'navbar_dark_mode')) ? 'dark' : 'light');
 }
 
 App::$page['color_mode'] = 'data-bs-theme="' . $redbasic_mode . '"';