From 46ca0ae7611e6561aff330f814dc4007e8fc3a9b Mon Sep 17 00:00:00 2001
From: ehaines <ehaines@mitre.org>
Date: Sun, 24 Nov 2024 05:10:00 -0500
Subject: [PATCH] changed report colors to conform to  WCAG 2 AA thresholds

---
 .../Modules/CreateReport/CreateReport.psm1    |   2 +-
 .../Modules/CreateReport/scripts/main.js      |   1 +
 .../Modules/CreateReport/styles/main.css      |  21 ++++++++++++++++--
 .../IndividualReports/AADReport.html          | Bin 86158 -> 85896 bytes
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/PowerShell/ScubaGear/Modules/CreateReport/CreateReport.psm1 b/PowerShell/ScubaGear/Modules/CreateReport/CreateReport.psm1
index 06dd3d2e7f..7e1eda07f4 100644
--- a/PowerShell/ScubaGear/Modules/CreateReport/CreateReport.psm1
+++ b/PowerShell/ScubaGear/Modules/CreateReport/CreateReport.psm1
@@ -226,7 +226,7 @@ function New-Report {
     # Finish building the html report
     $Title = "$($FullName) Baseline Report"
     $AADWarning = "Exclusions must only be used if they are approved within an organization's security risk acceptance process.
-    Please reference <a href=`"$($ScubaGitHubUrl)/blob/v$($SettingsExport.module_version)/docs/configuration/configuration.md#entra-id-configuration`" target=`"_blank`">this section in the README file</a>
+    Please reference <a href=`"$($ScubaGitHubUrl)/blob/main/docs/configuration/configuration.md#entra-id-configuration`" target=`"_blank`" class=`" aad-link`">this section in the README file</a>
     file for a list of the policies that accept exclusions and the instructions for setting up exclusions in the configuration file.
     <i>Exclusions can introduce grave risks to your system and must be managed carefully.</i>"
     $NoWarning = "<br/>"
diff --git a/PowerShell/ScubaGear/Modules/CreateReport/scripts/main.js b/PowerShell/ScubaGear/Modules/CreateReport/scripts/main.js
index e3131e24dd..ac917c360f 100644
--- a/PowerShell/ScubaGear/Modules/CreateReport/scripts/main.js
+++ b/PowerShell/ScubaGear/Modules/CreateReport/scripts/main.js
@@ -18,6 +18,7 @@ const colorRows = () => {
             }
             else if (rows[i].children[statusCol].innerHTML === "Fail") {
                 rows[i].style.background = "var(--test-fail)";
+                rows[i].style.color = "var(--test-error-color)";
             }
             else if (rows[i].children[statusCol].innerHTML === "Warning") {
                 rows[i].style.background = "var(--test-warning)";
diff --git a/PowerShell/ScubaGear/Modules/CreateReport/styles/main.css b/PowerShell/ScubaGear/Modules/CreateReport/styles/main.css
index 5821d16ea7..440af37c49 100644
--- a/PowerShell/ScubaGear/Modules/CreateReport/styles/main.css
+++ b/PowerShell/ScubaGear/Modules/CreateReport/styles/main.css
@@ -38,7 +38,7 @@ html[data-theme='dark'] {
     --note-color: #ee4e04;
     --header-bottom: rgb(221, 221, 221);
     --link-color: #85B065;
-    --unvisited-link-color: #0092CC;
+    --unvisited-link-color: #E6F598;
     --text-color: #bdbdbd;
     --uuid-color: #999999;
     --border-color: #7b7b7b;
@@ -76,6 +76,23 @@ h4 {
     margin-bottom: 0.313em;
 }
 
+h4 .aad-link {
+    font-family: Arial, Helvetica, sans-serif;
+    color: var(--unvisited-link-color);
+    text-decoration: underline;
+}
+
+h4 .aad-link:visited {
+    font-family: Arial, Helvetica, sans-serif;
+    color: var(--link-color);
+}
+
+h4 .aad-link:hover {
+    font-family: Arial, Helvetica, sans-serif;
+    color: var(--link-color);
+    text-decoration: none;
+}
+
 
 .links {
     display: flex;
@@ -232,7 +249,7 @@ th.conditions {
 }
 
 #toggle-text {
-    color: #404040;
+    color: var(--text-color);
     margin: 0.313em 3.125em;
     font-family: Arial, Helvetica, sans-serif;
     font-size: 0.875em;
diff --git a/PowerShell/ScubaGear/Sample-Reports/IndividualReports/AADReport.html b/PowerShell/ScubaGear/Sample-Reports/IndividualReports/AADReport.html
index 632ce17587612104382740144e1e77c029daece2..26d071eeef76ad58fc1b63ad00284e106754daf7 100644
GIT binary patch
delta 1007
zcmeBM$l5WVmFfS#3Ew75m<Vm=V*F$@`Jb`PWRtr>lN+izCWo0QO<p%uX!3@BzR9yp
z_}IA^6hLrtV66D$0ymM#_e=sNe{wLGoMfso`H`>9<eU&WARRTi$y{yn180`WMowmv
z7x@(c`5u$?Jmr9N8W5X+<&sQACf^B@n;aBiHThqF$>d{~WF}dNfTb3NJ56@5<N+Ej
zHu*uI22hL5Bnyto36?CA`vUkTKe05L%;aDv3Uv+8MYRk%447`?o4m>@gpTgp;K4F^
znSB&Nw<%3F`xwEj#Go_zqk|z8!cJ#$gG(4NkPP5~7vL&`9(V<AER*GYI0!nfiz)$D
z;L9;N%}WDU<Wk^1waNQ@vZ&z30vfnYY4W?ECsc47mJG25PkeGCWrWT8kvp3=zq<2*
YbMu{Nb&Q*1UT`sP&UmSm&cww40EyOX5C8xG

delta 1309
zcmeB}&)T<;bt2O@M&8McHo}{^7(W>SnZJ!~fn;Ho^kj*H0+aV0V4Iv_!UGgp*rzC)
z$WXvg%%H$v3&hb3ybN4G8Um{sK!%7;{@^M!Im?P~@*@)`u(6_(A6UsiSpwD~AeNK<
z<bQ5Da2DU>UDk3y-a<!husU<FOd*ggbV>)4o|6@vK`I!XOea~efEYlF4%kA3EGIv3
z)|))Xf&(a?=w%9(ePdw-Wfg>L0a=FL?vqzpf}GUoZ7+}P@LC2PJRV7cnlflS5o8}j
zk|z`<TRDJqfP#z;o@fDDg@}bUE?!WpVX+WMlH)t*<#0Z0uE}RSH9*!mVNXz$dPQY&
z!|ya!B~W6cQ(V}wOkQKjH~EIY8V$XrF#Q5E;{&?-3u|uIoBSy(3z}Nc(i%T%Zs*->
j9I>;Rk$3a!+aEcB)a|GBj6f>#IX8$(exaPs0@45g!e&V}