From 486a616367da0f5a03b9281a76c0012662f7e7e6 Mon Sep 17 00:00:00 2001
From: NLilley <nicholaslilley@gmail.com>
Date: Mon, 7 Jul 2025 17:16:18 +0300
Subject: [PATCH 1/4] Include more BS5 tweaks for Griddly filters. Bump version
 fo 3.8.4

---
 Build/CommonAssemblyInfo.cs                       |  6 +++---
 .../Views/Shared/Griddly/GriddlyFilters.cshtml    | 15 +++++++++++++--
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/Build/CommonAssemblyInfo.cs b/Build/CommonAssemblyInfo.cs
index 1c45c25..b52180a 100644
--- a/Build/CommonAssemblyInfo.cs
+++ b/Build/CommonAssemblyInfo.cs
@@ -12,7 +12,7 @@
 //      Minor Version
 //      Build Number
 //      Revision
-[assembly: AssemblyVersion("3.8.3")]
-[assembly: AssemblyFileVersion("3.8.3")]
+[assembly: AssemblyVersion("3.8.4")]
+[assembly: AssemblyFileVersion("3.8.4")]
 // Uncomment the informational version to create a pre-release package
-//[assembly: AssemblyInformationalVersion("3.8.1-rc2")]
+//[assembly: AssemblyInformationalVersion("3.8.4-rc2")]
diff --git a/Griddly/Views/Shared/Griddly/GriddlyFilters.cshtml b/Griddly/Views/Shared/Griddly/GriddlyFilters.cshtml
index 83dac3f..b3383e2 100644
--- a/Griddly/Views/Shared/Griddly/GriddlyFilters.cshtml
+++ b/Griddly/Views/Shared/Griddly/GriddlyFilters.cshtml
@@ -40,7 +40,18 @@ else
                 else
                 {
                     if (!css.Is(CssFramework.Bootstrap3)) { <h4 class="modal-title">Filter</h4> }
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+
+                    if (css.Is(CssFramework.Bootstrap5))
+                    {
+                        <button type="button" class="close btn-close-custom order-3 ms-2" data-dismiss="modal" bs-data-dismiss="modal" aria-label="Close">
+                            <span aria-hidden="true">&times;</span>
+                        </button>
+                    }
+                    else
+                    {
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                    }
+                    
                     if (css.Is(CssFramework.Bootstrap3)) { <h4 class="modal-title">Filter</h4> }
                 }
             </div>
@@ -75,7 +86,7 @@ else
                             }
                         </div>
 
-                        <button type="button" class="@(css.Is(CssFramework.Bootstrap4, CssFramework.Bootstrap5) ? "btn btn-link" : css.ButtonDefault) griddly-filter-cancel" data-dismiss="modal">Cancel</button>
+                        <button type="button" class="@(css.Is(CssFramework.Bootstrap4, CssFramework.Bootstrap5) ? "btn btn-link" : css.ButtonDefault) griddly-filter-cancel" data-dismiss="modal" bs-data-dismiss="modal">Cancel</button>
 
                         <button type="submit" class="@css.ButtonDefault">Search</button>
                     }

From 97eb183afcc8abd0f75a2c9ea5b1eda1bacd7610 Mon Sep 17 00:00:00 2001
From: NLilley <nicholaslilley@gmail.com>
Date: Tue, 8 Jul 2025 17:55:48 +0300
Subject: [PATCH 2/4] Rework classes

---
 Griddly/Views/Shared/Griddly/GriddlyFilters.cshtml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Griddly/Views/Shared/Griddly/GriddlyFilters.cshtml b/Griddly/Views/Shared/Griddly/GriddlyFilters.cshtml
index b3383e2..8e8f5cb 100644
--- a/Griddly/Views/Shared/Griddly/GriddlyFilters.cshtml
+++ b/Griddly/Views/Shared/Griddly/GriddlyFilters.cshtml
@@ -43,13 +43,11 @@ else
 
                     if (css.Is(CssFramework.Bootstrap5))
                     {
-                        <button type="button" class="close btn-close-custom order-3 ms-2" data-dismiss="modal" bs-data-dismiss="modal" aria-label="Close">
-                            <span aria-hidden="true">&times;</span>
-                        </button>
+                        <button type="button" class="griddly-modal-close close btn-close order-3 ms-2" data-dismiss="modal" data-bs-dismiss="modal" aria-label="Close"></button>
                     }
                     else
                     {
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                        <button type="button" class="griddly-modal-close close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
                     }
                     
                     if (css.Is(CssFramework.Bootstrap3)) { <h4 class="modal-title">Filter</h4> }

From 639257fabdbc7c63c341ff7c14a32889dcf486f7 Mon Sep 17 00:00:00 2001
From: NLilley <nicholaslilley@gmail.com>
Date: Tue, 8 Jul 2025 17:57:04 +0300
Subject: [PATCH 3/4] Remove additional classes

---
 Griddly/Views/Shared/Griddly/GriddlyFilters.cshtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Griddly/Views/Shared/Griddly/GriddlyFilters.cshtml b/Griddly/Views/Shared/Griddly/GriddlyFilters.cshtml
index 8e8f5cb..97aa724 100644
--- a/Griddly/Views/Shared/Griddly/GriddlyFilters.cshtml
+++ b/Griddly/Views/Shared/Griddly/GriddlyFilters.cshtml
@@ -43,7 +43,7 @@ else
 
                     if (css.Is(CssFramework.Bootstrap5))
                     {
-                        <button type="button" class="griddly-modal-close close btn-close order-3 ms-2" data-dismiss="modal" data-bs-dismiss="modal" aria-label="Close"></button>
+                        <button type="button" class="griddly-modal-close close btn-close" data-dismiss="modal" data-bs-dismiss="modal" aria-label="Close"></button>
                     }
                     else
                     {

From f73678176839994c682e5fada8ae3a28712dc5eb Mon Sep 17 00:00:00 2001
From: NLilley <nicholaslilley@gmail.com>
Date: Tue, 8 Jul 2025 18:02:07 +0300
Subject: [PATCH 4/4] Further code revisions

---
 Griddly/Views/Shared/Griddly/GriddlyFilters.cshtml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Griddly/Views/Shared/Griddly/GriddlyFilters.cshtml b/Griddly/Views/Shared/Griddly/GriddlyFilters.cshtml
index 97aa724..5d3f0f2 100644
--- a/Griddly/Views/Shared/Griddly/GriddlyFilters.cshtml
+++ b/Griddly/Views/Shared/Griddly/GriddlyFilters.cshtml
@@ -43,7 +43,7 @@ else
 
                     if (css.Is(CssFramework.Bootstrap5))
                     {
-                        <button type="button" class="griddly-modal-close close btn-close" data-dismiss="modal" data-bs-dismiss="modal" aria-label="Close"></button>
+                        <button type="button" class="griddly-modal-close close btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
                     }
                     else
                     {
@@ -84,7 +84,7 @@ else
                             }
                         </div>
 
-                        <button type="button" class="@(css.Is(CssFramework.Bootstrap4, CssFramework.Bootstrap5) ? "btn btn-link" : css.ButtonDefault) griddly-filter-cancel" data-dismiss="modal" bs-data-dismiss="modal">Cancel</button>
+                        <button type="button" class="@(css.Is(CssFramework.Bootstrap4, CssFramework.Bootstrap5) ? "btn btn-link" : css.ButtonDefault) griddly-filter-cancel" data-dismiss="modal" data-bs-dismiss="modal">Cancel</button>
 
                         <button type="submit" class="@css.ButtonDefault">Search</button>
                     }