Skip to content

Commit 99b7242

Browse files
committed
Updated Bootstrap modal trigger attributes for Bootstrap 5 compatibility
1 parent d72c0af commit 99b7242

File tree

18 files changed

+2633
-2771
lines changed

18 files changed

+2633
-2771
lines changed

angular/src/shared/service-proxies/service-proxies.ts

Lines changed: 1405 additions & 1848 deletions
Large diffs are not rendered by default.

angular/yarn.lock

Lines changed: 1209 additions & 904 deletions
Large diffs are not rendered by default.

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Home/Index.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
<i class="fas fa-minus"></i>
103103
</button>
104104
<div class="btn-group">
105-
<button type="button" class="btn btn-tool dropdown-toggle" data-toggle="dropdown">
105+
<button type="button" class="btn btn-tool dropdown-toggle" data-bs-toggle="dropdown">
106106
<i class="fas fa-wrench"></i>
107107
</button>
108108
<div class="dropdown-menu dropdown-menu-right" role="menu">

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Roles/Index.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<h1>@L("Roles")</h1>
2222
</div>
2323
<div class="col-sm-6">
24-
<a href="javascript:;" data-toggle="modal" data-target="#RoleCreateModal" class="btn bg-blue float-sm-right">
24+
<a href="javascript:;" data-bs-toggle="modal" data-bs-target="#RoleCreateModal" class="btn bg-blue float-sm-right">
2525
<i class="fa fa-plus-square"></i>
2626
@L("Create")
2727
</a>

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Shared/Components/RightNavbarLanguageSwitch/Default.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
@model RightNavbarLanguageSwitchViewModel
33

44
<li class="nav-item dropdown">
5-
<a href="javascript:void(0);" class="nav-link" data-toggle="dropdown" role="button">
5+
<a href="javascript:void(0);" class="nav-link" data-bs-toggle="dropdown" role="button">
66
<i class="@Model.CurrentLanguage.Icon" title="@Model.CurrentLanguage.DisplayName"></i>
77
<span class="d-none d-md-inline-block">@Model.CurrentLanguage.DisplayName</span>
88
</a>

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Shared/Components/RightNavbarUserArea/Default.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@model AbpCompanyName.AbpProjectName.Web.Views.Shared.Components.RightNavbarUserArea.RightNavbarUserAreaViewModel
22
<li class="nav-item dropdown nav-user-menu">
3-
<a href="javascript:void(0);" class="nav-link" data-toggle="dropdown" role="button">
3+
<a href="javascript:void(0);" class="nav-link" data-bs-toggle="dropdown" role="button">
44
<img class="user-image img-circle elevation-2" src="~/img/avatar.png" alt="User Image">
55
</a>
66
<div class="dropdown-menu dropdown-menu-right">

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Shared/Components/TenantChange/Default.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<span>@L("NotSelected")</span>
1717
}
1818

19-
(<a href="javascript:;" data-toggle="modal" data-target="#TenantChangeModal">@L("Change")</a>)
19+
(<a href="javascript:;" data-bs-toggle="modal" data-bs-target="#TenantChangeModal">@L("Change")</a>)
2020
</span>
2121
</div>
2222
<div class="modal fade" id="TenantChangeModal" tabindex="-1" role="dialog" aria-labelledby="UserCreateModalLabel" data-backdrop="static">

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Shared/Layout/_Alerts.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<div class="alert @alertClass @(alert.Dismissible ? "alert-dismisable" : "") mt-3 mr-1 ml-1">
3333
@if (alert.Dismissible)
3434
{
35-
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
35+
<button type="button" class="close" data-bs-dismiss="alert" aria-hidden="true">×</button>
3636
}
3737
<h5>
3838
<i class="icon fas @iconClass"></i>
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<div class="modal-footer justify-content-between">
2-
<button type="button" class="btn btn-default close-button" data-dismiss="modal">@L("Cancel")</button>
2+
<button type="button" class="btn btn-default close-button" data-bs-dismiss="modal">@L("Cancel")</button>
33
<button type="submit" class="btn btn-primary save-button">@L("Save")</button>
44
</div>

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Shared/Modals/_ModalHeader.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
@model ModalHeaderViewModel
33
<div class="modal-header">
44
<h5 class="modal-title">@Html.Raw(Model.Title)</h5>
5-
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
5+
<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
66
<span aria-hidden="true">&times;</span>
77
</button>
88
</div>

0 commit comments

Comments
 (0)