Merge pull request #528 from Ortus-Solutions/feature/adminbar-update

Feature/adminbar update
Ortus-Solutions · Aug 6, 2022 · 1576d8a · 1576d8a
2 parents b646610 + ab1e4b8
commit 1576d8a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/modules/contentbox/models/comments/CommentService.cfc b/modules/contentbox/models/comments/CommentService.cfc
@@ -285,7 +285,11 @@ component extends="cborm.models.VirtualEntityService" singleton {
 		}
 
 		// Check if user has already an approved comment. If they do, then approve them
-		if ( inSettings.cb_comments_moderation_whitelist AND userHasPreviousAcceptedComment( inComment.getAuthorEmail() ) ) {
+		if (
+			inSettings.cb_comments_moderation_whitelist AND userHasPreviousAcceptedComment(
+				inComment.getAuthorEmail()
+			)
+		) {
 			inComment.setIsApproved( true );
 			return true;
 		}

diff --git a/modules/contentbox/modules/contentbox-ui/views/adminbar/adminbarCSS.cfm b/modules/contentbox/modules/contentbox-ui/views/adminbar/adminbarCSS.cfm
@@ -5,6 +5,7 @@
         background: ##333;
         box-shadow: 1px 1px 3px rgba(0, 0, 0, 0.5);
         color: white;
+        font-family: 'Open Sans', "Helvetica Neue", Arial, sans-serif;
         font-size: .875rem;
         top: 0;
         left: 0;
@@ -60,6 +61,8 @@
         margin-right: 0px; 
     }
     .cb-adminbar__dropdown-toggle {
+        background-color: transparent;
+        border: none;
         padding: 0.5rem
     }
     .cb-adminbar__menu-item a, .cb-adminbar__menu-item button, .cb-adminbar__brand {
@@ -143,6 +146,7 @@
         right: 20px;
     }
     .cb-adminbar__toggle .svg-cheveron {
+        color: ##fff;
         height: 20px;
         width: 20px;
         transition: all 1s ease;

diff --git a/modules/contentbox/seeders/BaseSeeder.cfc b/modules/contentbox/seeders/BaseSeeder.cfc
@@ -1,4 +1,4 @@
-abstract                       component {
+abstract                         component {
 
 	// DI
 	property name="packageService" inject="PackageService";