Merge branch 'main' into core

Author: timarney

app/(gcforms)/[locale]/(form administration)/form-builder/[id]/settings/branding/components/options.ts

@@ -296,4 +296,22 @@ export const options = [
     logoTitleEn: "Office of the Commissioner of Lobbying of Canada",
     logoTitleFr: "Commissariat au lobbying du Canada",
   },
+  {
+    name: "cfia",
+    urlEn: "https://inspection.canada.ca/en",
+    urlFr: "https://inspection.canada.ca/fr",
+    logoEn: "/img/branding/cfia-en.svg",
+    logoFr: "/img/branding/cfia-fr.svg",
+    logoTitleEn: "Canadian Food Inspection Agency",
+    logoTitleFr: "Agence canadienne d'inspection des aliments",
+  },
+  {
+    name: "dcc",
+    urlEn: "https://www.dcc-cdc.gc.ca",
+    urlFr: "https://www.cdc-dcc.gc.ca",
+    logoEn: "/img/branding/dcc-en.svg",
+    logoFr: "/img/branding/dcc-fr.svg",
+    logoTitleEn: "Defence Construction Canada",
+    logoTitleFr: "Construction de Défense Canada",
+  },
 ];

components/clientComponents/globals/TabNavLink.tsx

@@ -21,7 +21,8 @@ export const TabNavLink = ({
     "mr-3 rounded-t-[25px] border-x border-t border-black bg-white px-5 pb-2 pt-1 no-underline laptop:py-2";
 
   const inactiveClasses =
-    "!text-black hover:bg-gray-600 hover:!text-white-default focus:!text-white [&_svg]:hover:fill-white [&_svg]:hover:stroke-white [&_svg]:focus:fill-white";
+    "!text-black hover:bg-gray-600 hover:!text-white-default [&_svg]:hover:fill-white [&_svg]:hover:stroke-white";
+
   const activeClasses =
     "bg-[#475569] !text-white [&_svg]:fill-white ${svgStroke} focus:text-white [&_svg]:focus:stroke-white";