4 files changed, 52 insertions, 81 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..12f5e1bad 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -150,24 +150,15 @@ input[type=text], textarea {
 	color: var(--bs-body-color);
 }
 
-.selected-doco-nav {
-	font-weight: bold;
-	text-shadow: 2px 2px 3px lightgray;
-}
-
-#doco-content img {
-	width: 100%;
-}
-
-#help-content pre code {
-	overflow-x: auto;
-	white-space: pre;
-}
-
 .heart {
 	color: #FF0000;
 }
 
+#toast-container {
+	z-index: 1060;
+	width: 300px;
+}
+
 #powered-by {
 	font-size: 0.5rem;
 	position: absolute;
@@ -708,26 +699,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 +767,7 @@ div.jGrowl div.jGrowl-notification {
 
 .shared_header img {
 	border-radius: var(--bs-border-radius);
-	margin-right: .75rem;
+	margin-right: .5rem;
 }
 
 .tag1 {
@@ -859,28 +830,27 @@ margin-right: 50px;
 
 .generic-icons,
 a .generic-icons {
-	font-size: 1rem;
-	margin-right: 0.5rem;
+	font-size: 1.2rem;
 }
 
 .generic-icons-right {
-	font-size: 1rem;
+	font-size: 1.2rem;
 	margin-left: 0.5rem;
 }
 
 .generic-icons-nav {
-	font-size: 1rem;
-	margin-right: 7px;
+	font-size: 1.2rem;
+	margin-right: 0.5rem;
 }
 
 .admin-icons {
-	font-size: 1.2em;
-	margin-right: 7px;
+	font-size: 1.2rem;
+	margin-right: 0.5rem;
 }
 
 .drop-icons,
 a .drop-icons {
-	font-size: 1rem;
+	font-size: 1.2rem;
 	text-decoration: none;
 	cursor: pointer;
 }
@@ -910,25 +880,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 */
 
@@ -944,6 +895,11 @@ img.mail-conv-sender-photo {
 	font-weight: bold;
 }
 
+.jot-icons,
+.comment-icon {
+	font-size: 1.2rem;
+}
+
 #profile-jot-wrapper {
 	background-color: var(--bs-body-bg);
 	border: 1px solid var(--bs-border-color);
@@ -1022,6 +978,19 @@ img.mail-conv-sender-photo {
 	border-top: 1px dashed #adadad;
 }
 
+
+.hide-comments-icon,
+.divgrow-showmore-icon {
+	font-size: $font_size;
+}
+
+.divgrow-showmore-label,
+.hide-comments-label {
+	text-transform: uppercase;
+	font-size: 0.7rem;
+}
+
+
 .wall-item-comment-wrapper {
 	padding: 7px 10px;
 	background-color: var(--bs-tertiary-bg);
@@ -1098,7 +1067,7 @@ img.mail-conv-sender-photo {
 }
 
 .abook-self {
-	background-color: #ffdddd;
+	background-color: var(--bs-light-bg-subtle);
 }
 
 .abook-pending-contact, .abook-permschange {
@@ -1394,12 +1363,16 @@ dl.bb-dl > dd > li {
 }
 
 .bootstrap-tagsinput .tag:before {
-	/* Copied from fa-asterisk, is there a better way to do it? */
-	font-family: ForkAwesome;
-	font-weight: normal;
-	font-style: normal;
-	text-decoration: inherit;
-	content:"\f069  ";
+	font-family: bootstrap-icons;
+	font-size: 0.5rem;
+	content: "\F151";
+	margin-right: .25rem;
+}
+
+.bootstrap-tagsinput .tag [data-role="remove"]:after {
+	font-family: bootstrap-icons;
+	font-size: 0.5rem;
+	content: "\F659";
 }
 
 /* Modified original CSS to match input in Redbasic */
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 0f2617cc0..76d6c0854 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -29,11 +29,11 @@ $(document).ready(function() {
 	}
 
 	if (redbasic_dark_mode == 1) {
-		$('#theme-switch-icon').removeClass('fa-moon-o').addClass('fa-sun-o');
+		$('#theme-switch-icon').removeClass('bi-moon').addClass('bi-sun');
 		$('[data-bs-theme="light"]').attr('data-bs-theme', 'dark');
 	}
 	if (redbasic_dark_mode == 0) {
-		$('#theme-switch-icon').removeClass('fa-sun-o').addClass('fa-moon-o');
+		$('#theme-switch-icon').removeClass('bi-sun').addClass('bi-moon');
 		$('[data-bs-theme="dark"]:not(nav)').attr('data-bs-theme', 'light');
 	}
 
@@ -84,12 +84,12 @@ $(document).ready(function() {
 				$('[data-bs-theme="dark"]').attr('data-bs-theme', 'light');
 			}
 			localStorage.setItem('redbasic_dark_mode', 0);
-			$('#theme-switch-icon').removeClass('fa-sun-o').addClass('fa-moon-o');
+			$('#theme-switch-icon').removeClass('bi-sun').addClass('bi-moon');
 		}
 		else {
 			$('[data-bs-theme="light"]').attr('data-bs-theme', 'dark');
 			localStorage.setItem('redbasic_dark_mode', 1);
-			$('#theme-switch-icon').removeClass('fa-moon-o').addClass('fa-sun-o');
+			$('#theme-switch-icon').removeClass('bi-moon').addClass('bi-sun');
 		}
 		$('meta[name=theme-color]').attr('content', $('nav').css('background-color'));
 		localStorage.setItem('redbasic_theme_color', $('nav').css('background-color'));
diff --git a/view/theme/redbasic/php/theme_init.php b/view/theme/redbasic/php/theme_init.php
index 54e6e7be3..c26621068 100644
--- a/view/theme/redbasic/php/theme_init.php
+++ b/view/theme/redbasic/php/theme_init.php
@@ -1,7 +1,10 @@
 <?php
+use Zotlabs\Lib\Config;
+
 require_once('view/php/theme_init.php');
 
-head_add_css('/library/fork-awesome/css/fork-awesome.min.css');
+head_add_css('/vendor/twbs/bootstrap-icons/font/bootstrap-icons.min.css');
+
 head_add_css('/library/bootstrap-tagsinput/bootstrap-tagsinput.css');
 head_add_css('/library/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.min.css');
 
@@ -24,8 +27,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 . '"';