Merge pull request #133 from NLilley/adelas-changes

Include more BS5 tweaks for Griddly filters.

Author: ithielnor

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")]

Griddly/Views/Shared/Griddly/GriddlyFilters.cshtml

@@ -40,7 +40,16 @@ 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="griddly-modal-close close btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                    }
+                    else
+                    {
+                        <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> }
                 }
             </div>
@@ -75,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">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>
                     }