Merge pull request #17896 from abpframework/auto-merge/rel-7-4/2233

Merge branch dev with rel-7.4

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

@@ -62,7 +62,7 @@
                                 
                                 @foreach (var permission in group.Permissions)
                                 {
-                                    <Field Margin="permission.ParentName != null ? Margin.Is3.OnAll : Margin.Is0.OnAll">
+                                    <Field Margin="permission.ParentName != null ? Margin.Is3.OnAll : Margin.Is3.OnY">
                                         <Check
                                             Disabled="@(IsDisabledPermission(permission))"
                                             Cursor="Cursor.Pointer"

npm/ng-packs/package.json

@@ -55,7 +55,7 @@
     "@abp/ng.setting-management": "~7.4.0",
     "@abp/ng.tenant-management": "~7.4.0",
     "@abp/ng.theme.basic": "~7.4.0",
-    "@abp/ng.theme.lepton-x": "^2.4.0-rc.4",
+    "@abp/ng.theme.lepton-x": "~2.4.0",
     "@abp/ng.theme.shared": "~7.4.0",
     "@abp/utils": "~7.4.0",
     "@angular-devkit/build-angular": "~16.0.0",

templates/app-nolayers/angular/package.json

@@ -20,7 +20,7 @@
     "@abp/ng.setting-management": "~7.4.0",
     "@abp/ng.tenant-management": "~7.4.0",
     "@abp/ng.theme.shared": "~7.4.0",
-    "@abp/ng.theme.lepton-x": "~2.4.0-rc.4",
+    "@abp/ng.theme.lepton-x": "~2.4.0",
     "@angular/animations": "~16.0.0",
     "@angular/common": "~16.0.0",
     "@angular/compiler": "~16.0.0",

templates/app/angular/package.json

@@ -20,7 +20,7 @@
     "@abp/ng.setting-management": "~7.4.0",
     "@abp/ng.tenant-management": "~7.4.0",
     "@abp/ng.theme.shared": "~7.4.0",
-    "@abp/ng.theme.lepton-x": "~2.4.0-rc.4",
+    "@abp/ng.theme.lepton-x": "~2.4.0",
     "@angular/animations": "~16.0.0",
     "@angular/common": "~16.0.0",
     "@angular/compiler": "~16.0.0",