Merge pull request #19207 from abpframework/auto-merge/rel-8-1/2556

Merge branch dev with rel-8.1

modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml

@@ -21,7 +21,7 @@
         <abp-modal-body>
             <abp-tabs name="create-user-modal-tabs">
                 <abp-tab title="@L["UserInformations"].Value">
-                    <div class="mt-3" >
+                    <div >
                         @* TODO: Can we use dynamic form? *@
                         <abp-input asp-for="UserInfo.UserName" />
                         <abp-input asp-for="UserInfo.Name" />
@@ -72,7 +72,7 @@
                     </div>
                 </abp-tab>
                 <abp-tab title="@L["Roles"].Value">
-                    <div class="mt-3" >
+                    <div>
                         @for (var i = 0; i < Model.Roles.Length; i++)
                         {
                             var role = Model.Roles[i];

modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor

@@ -43,9 +43,6 @@
                         @foreach (var group in _groups)
                         {
                             <TabPanel Name="@GetNormalizedGroupName(group.Name)">
-                                <h4>@group.DisplayName</h4>
-                                
-                                <Divider />
                                 
                                 <Field>
                                     <Check

modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml

@@ -16,7 +16,7 @@
         <abp-modal-header title="@(L["Permissions"].Value) - @(HttpUtility.HtmlEncode(Model.EntityDisplayName))"></abp-modal-header>
         <abp-modal-body class="custom-scroll-container">
             <abp-input asp-for="SelectAllInAllTabs" check-box-hidden-input-render-mode="CheckBoxHiddenInputRenderMode.None" label="@L["SelectAllInAllTabs"].Value" disabled="@Model.Groups.All(group => group.IsDisabled(Model.ProviderName))"/>
-            <hr class="mt-2 mb-2"/>
+            <hr class="my-2"/>
             <input asp-for="@Model.ProviderKey"/>
             <input asp-for="@Model.ProviderName"/>
             <abp-tabs name="PermissionsTabs" tab-style="PillVertical" vertical-header-size="_4" class="custom-scroll-container">
@@ -24,10 +24,8 @@
                 {
                     var group = Model.Groups[i];
                     <abp-tab title="@group.DisplayName" name="v-pills-tab-@group.GetNormalizedGroupName()">
-                        <h4>@group.DisplayName</h4>
-                        <hr class="mt-2 mb-3"/>
                         <div class="w-100" style="max-height: 640px;overflow-y: auto">
-                            <div class="ps-1 pt-1">
+                            <div class="ps-1">
                                 <abp-input asp-for="@group.IsAllPermissionsGranted"
                                            check-box-hidden-input-render-mode="CheckBoxHiddenInputRenderMode.None"
                                            name="SelectAllInThisTab"