Fix group color picker

ViewTemplates/Groups/form.blade.php

@@ -95,8 +95,8 @@
                         </span>
                     </div>
                 </div>
+                <div class="form-text">@lang('PANOPTICON_GROUPS_FIELD_COLOUR_HELP')</div>
             </div>
-            <div class="form-text">@lang('PANOPTICON_GROUPS_FIELD_COLOUR_HELP')</div>
         </fieldset>
     </div>
 

languages/en-GB.ini

@@ -1764,7 +1764,7 @@ PANOPTICON_GROUPS_TABLE_HEAD_TITLE="Group Name"
 PANOPTICON_GROUPS_FIELD_TITLE="Group Name"
 PANOPTICON_GROUPS_FIELD_COLOUR="Colour"
 PANOPTICON_GROUPS_FIELD_COLOUR_HELP="Colours the group's badge wherever it appears in the site lists. The text colour is chosen automatically for the best contrast against your chosen background. If you want an icon, add an emoji to the group's name instead — Panopticon deliberately does not support group icons."
-PANOPTICON_GROUPS_FIELD_COLOUR_NONE="No colour"
+PANOPTICON_GROUPS_FIELD_COLOUR_NONE="None"
 PANOPTICON_GROUPS_FIELD_COLOUR_CUSTOM="Custom colour"
 PANOPTICON_COLOUR_BLUE="Blue"
 PANOPTICON_COLOUR_INDIGO="Indigo"

media/scss/_common.scss

@@ -9,6 +9,7 @@
 
 @import "../../node_modules/bootstrap/scss/bootstrap";
 
+@import "section/badge";
 @import "section/choices";
 @import "section/ace";
 @import "section/tinymce";

media/scss/section/_badge.scss

@@ -0,0 +1,13 @@
+/*!*
+ * @package   panopticon
+ * @copyright Copyright (c)2023-2026 Nicholas K. Dionysopoulos / Akeeba Ltd
+ * @license   https://www.gnu.org/licenses/agpl-3.0.txt GNU Affero General Public License, version 3 or later
+ */
+
+#group-colour-picker {
+  .badge {
+    &:empty {
+      display: inline-block;
+    }
+  }
+}

media/scss/section/_choices.scss

@@ -17,7 +17,7 @@ $choices-icon-cross-inverse: url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjEi
   &.input-group {
     .choices {
       min-width: unset;
-      width: calc(100% - 2.5em);
+      width: calc(100% - 3.5em);
     }
   }
 }

src/Model/Groups.php

@@ -224,10 +224,10 @@ public function getGroupColours(bool $forEnabledSitesOnly = true): array
 
 		$colourHelper = $this->getContainer()->helper->colour;
 
-		return array_map(
-			fn(?string $colour): ?string => $colourHelper->sanitise($colour),
-			$colours
-		);
+        return array_map(
+            fn(?array $colour): ?string => $colourHelper->sanitise($colour['colour']),
+            $colours
+        );
 	}
 
 	/**