Skip to content

Include more BS5 tweaks for Griddly filters. #133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 8, 2025
Merged

Include more BS5 tweaks for Griddly filters. #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
486a616
Include more BS5 tweaks for Griddly filters.
NLilley Jul 7, 2025
97eb183
Rework classes
NLilley Jul 8, 2025
639257f
Remove additional classes
NLilley Jul 8, 2025
f736781
Further code revisions
NLilley Jul 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Build/CommonAssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
13 changes: 11 additions & 2 deletions Griddly/Views/Shared/Griddly/GriddlyFilters.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
}
Expand Down