From c97a824fff84c34b01fdb7c8a3f0749c9b882335 Mon Sep 17 00:00:00 2001
From: Sam Saravillo <7529759+samsaravillo@users.noreply.github.com>
Date: Tue, 27 May 2025 14:17:54 -0700
Subject: [PATCH 1/3] Revert "sonarQube fix"
This reverts commit ddb0c7bb7099c95e97700adba80896910ebe59cd.
---
.../src/Unity.Flex.Web/Unity.Flex.Web.csproj | 13 +++++++++++++
.../wwwroot/themes/ux2/fluentui-icons.css | 4 ++++
2 files changed, 17 insertions(+)
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Unity.Flex.Web.csproj b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Unity.Flex.Web.csproj
index facb40bac..eef11a58b 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Unity.Flex.Web.csproj
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Unity.Flex.Web.csproj
@@ -90,6 +90,7 @@
+
@@ -98,8 +99,13 @@
+
+
+
+ Always
+
Always
@@ -107,7 +113,9 @@
+
+
@@ -121,10 +129,13 @@
+
+
+
@@ -132,7 +143,9 @@
+
+
diff --git a/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/fluentui-icons.css b/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/fluentui-icons.css
index aa596424b..488da210d 100644
--- a/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/fluentui-icons.css
+++ b/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/fluentui-icons.css
@@ -241,6 +241,10 @@
content: '\EA4A';
}
+.fl-history:before {
+ content: '\E81C';
+}
+
.fl-comments:before {
content: '\E15F';
}
From feb0f7b83aa0af0d6d6d8a96de9c903d6f6fd016 Mon Sep 17 00:00:00 2001
From: Sam Saravillo <7529759+samsaravillo@users.noreply.github.com>
Date: Tue, 27 May 2025 14:25:36 -0700
Subject: [PATCH 2/3] fix custom tab widget
---
.../src/Unity.Flex.Web/Unity.Flex.Web.csproj | 10 ----------
.../Shared/Components/CustomTabWidget/Default.css | 1 +
2 files changed, 1 insertion(+), 10 deletions(-)
create mode 100644 applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/CustomTabWidget/Default.css
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Unity.Flex.Web.csproj b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Unity.Flex.Web.csproj
index eef11a58b..623d4b724 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Unity.Flex.Web.csproj
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Unity.Flex.Web.csproj
@@ -90,7 +90,6 @@
-
@@ -99,9 +98,7 @@
-
-
Always
@@ -113,9 +110,7 @@
-
-
@@ -129,13 +124,10 @@
-
-
-
@@ -143,9 +135,7 @@
-
-
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/CustomTabWidget/Default.css b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/CustomTabWidget/Default.css
new file mode 100644
index 000000000..19a76f130
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/CustomTabWidget/Default.css
@@ -0,0 +1 @@
+
\ No newline at end of file
From 86a4aa5b5583121149b3f7806e62452162bff111 Mon Sep 17 00:00:00 2001
From: Sam Saravillo <7529759+samsaravillo@users.noreply.github.com>
Date: Tue, 27 May 2025 14:28:34 -0700
Subject: [PATCH 3/3] remove duplicated css
---
.../src/Unity.Theme.UX2/wwwroot/themes/ux2/fluentui-icons.css | 4 ----
1 file changed, 4 deletions(-)
diff --git a/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/fluentui-icons.css b/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/fluentui-icons.css
index 488da210d..aa596424b 100644
--- a/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/fluentui-icons.css
+++ b/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/fluentui-icons.css
@@ -241,10 +241,6 @@
content: '\EA4A';
}
-.fl-history:before {
- content: '\E81C';
-}
-
.fl-comments:before {
content: '\E15F';
}