diff --git a/apps/angular/angular.json b/apps/angular/angular.json index 31fc0890..310a14ad 100644 --- a/apps/angular/angular.json +++ b/apps/angular/angular.json @@ -51,15 +51,13 @@ "bundleName": "ngx-datatable-material" }, { - "input": "node_modules/bootstrap/dist/css/bootstrap.rtl.min.css", + "input": "node_modules/@abp/ng.theme.shared/styles/bootstrap-rtl.min.css", "inject": false, "bundleName": "bootstrap-rtl.min" }, - { - "input": "node_modules/bootstrap/dist/css/bootstrap.min.css", - "inject": true, - "bundleName": "bootstrap-ltr.min" - }, + "node_modules/@volo/ngx-lepton-x.lite/styles/sidemenu-layout.min.css", + "node_modules/bootstrap-icons/font/bootstrap-icons.css", + "src/styles.scss" ], "scripts": [], diff --git a/apps/angular/package.json b/apps/angular/package.json index b33a31c1..54a67899 100644 --- a/apps/angular/package.json +++ b/apps/angular/package.json @@ -12,14 +12,15 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~5.0.0-rc.2", - "@abp/ng.components": "~5.0.0-rc.2", - "@abp/ng.core": "~5.0.0-rc.2", - "@abp/ng.identity": "~5.0.0-rc.2", - "@abp/ng.setting-management": "~5.0.0-rc.2", - "@abp/ng.tenant-management": "~5.0.0-rc.2", - "@abp/ng.theme.basic": "~5.0.0-rc.2", - "@abp/ng.theme.shared": "~5.0.0-rc.2", + "@abp/ng.account": "4.4.4", + "@abp/ng.components": "4.4.4", + "@abp/ng.core": "4.4.4", + "@abp/ng.identity": "4.4.4", + "@abp/ng.setting-management": "4.4.4", + "@abp/ng.tenant-management": "4.4.4", + "@abp/ng.theme.basic": "4.4.4", + "@abp/ng.theme.lepton-x": "^1.0.0-alpha.2", + "@abp/ng.theme.shared": "4.4.4", "@angular/animations": "~12.2.8", "@angular/common": "~12.2.8", "@angular/compiler": "~12.2.8", @@ -34,7 +35,7 @@ "zone.js": "~0.11.4" }, "devDependencies": { - "@abp/ng.schematics": "~5.0.0-rc.2", + "@abp/ng.schematics": "4.4.4", "@angular-devkit/build-angular": "~12.2.8", "@angular/cli": "~12.2.8", "@angular/compiler-cli": "~12.2.8", diff --git a/apps/angular/projects/catalog/config/src/providers/route.provider.ts b/apps/angular/projects/catalog/config/src/providers/route.provider.ts index 3aacd0ad..904ebf10 100644 --- a/apps/angular/projects/catalog/config/src/providers/route.provider.ts +++ b/apps/angular/projects/catalog/config/src/providers/route.provider.ts @@ -15,6 +15,7 @@ export function configureRoutes(routesService: RoutesService) { name: eCatalogRouteNames.Catalog, layout: eLayoutType.application, parentName: null, + iconClass: 'bi bi-collection-fill', requiredPolicy: eCatalogPolicyNames.Catalog, }, { @@ -23,6 +24,7 @@ export function configureRoutes(routesService: RoutesService) { parentName: eCatalogRouteNames.Catalog, order: 1, requiredPolicy: eCatalogPolicyNames.ProductManagement, + iconClass: 'bi bi-tag-fill', }, ]); }; diff --git a/apps/angular/projects/catalog/src/pages/product/product.component.html b/apps/angular/projects/catalog/src/pages/product/product.component.html index 898b4918..45a2c244 100644 --- a/apps/angular/projects/catalog/src/pages/product/product.component.html +++ b/apps/angular/projects/catalog/src/pages/product/product.component.html @@ -4,7 +4,7 @@
{{ 'CatalogService::Products' | abpLocalization }}
-
+
@@ -26,7 +26,7 @@ aria-haspopup="true" ngbDropdownToggle > - {{ 'AbpUi::Actions' | abpLocalization }} + {{ 'AbpUi::Actions' | abpLocalization }}