From a724b86c4ab1453d3b35a1f6365fefbb96476f87 Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Wed, 1 Jul 2020 16:34:58 +0300 Subject: [PATCH] fix: change the order of style elements in angular.json --- templates/app/angular/angular.json | 21 +++++++++++---------- templates/module/angular/angular.json | 20 ++++++++++---------- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/templates/app/angular/angular.json b/templates/app/angular/angular.json index 9177a6d86c..09eb7f4cc7 100644 --- a/templates/app/angular/angular.json +++ b/templates/app/angular/angular.json @@ -26,16 +26,6 @@ "extractCss": true, "assets": ["src/favicon.ico", "src/assets"], "styles": [ - { - "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" - }, { "input": "node_modules/@fortawesome/fontawesome-free/css/all.min.css", "inject": true, @@ -61,6 +51,17 @@ "inject": true, "bundleName": "ngx-datatable-material" }, + + { + "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" + }, "src/styles.scss" ], "scripts": [] diff --git a/templates/module/angular/angular.json b/templates/module/angular/angular.json index fcc60f516e..1a98e98cb2 100644 --- a/templates/module/angular/angular.json +++ b/templates/module/angular/angular.json @@ -66,16 +66,6 @@ "projects/dev-app/src/assets" ], "styles": [ - { - "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" - }, { "input": "node_modules/@fortawesome/fontawesome-free/css/all.min.css", "inject": true, @@ -101,6 +91,16 @@ "inject": true, "bundleName": "ngx-datatable-material" }, + { + "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" + }, "projects/dev-app/src/styles.scss" ], "scripts": []