Skip to content

Commit

Permalink
fix: correct style import (#300)
Browse files Browse the repository at this point in the history
* fix: correct style import

* fix: update webpack version
  • Loading branch information
HenryT-CG authored Nov 12, 2024
1 parent 3e0863a commit d7bbdf0
Show file tree
Hide file tree
Showing 4 changed files with 75 additions and 69 deletions.
11 changes: 3 additions & 8 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"projects": {
"onecx-theme-ui": {
"projectType": "application",
"schematics": {},
"schematics": { "@schematics/angular:component": { "style": "scss" } },
"root": "",
"sourceRoot": "src",
"prefix": "app",
Expand All @@ -29,14 +29,10 @@
"output": "/onecx-portal-lib/assets/"
}
],
"styles": [
"node_modules/primeicons/primeicons.css",
"node_modules/primeng/resources/primeng.min.css",
"node_modules/@onecx/portal-integration-angular/assets/styles.scss",
"src/styles.scss"
],
"styles": ["src/styles.scss"],
"scripts": ["node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"],
"extraWebpackConfig": "webpack.config.js",
"outputHashing": "all",
"commonChunk": false
},
"configurations": {
Expand Down Expand Up @@ -67,7 +63,6 @@
"with": "src/environments/environment.prod.ts"
}
],
"outputHashing": "all",
"extraWebpackConfig": "webpack.prod.config.js"
}
},
Expand Down
101 changes: 56 additions & 45 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,17 +51,17 @@
"@ngrx/router-store": "^18.0.1",
"@ngx-translate/core": "^15.0.0",
"@ngx-translate/http-loader": "^8.0.0",
"@onecx/accelerator": "^5.23.3",
"@onecx/angular-accelerator": "^5.23.3",
"@onecx/angular-auth": "^5.23.3",
"@onecx/angular-integration-interface": "^5.23.3",
"@onecx/angular-remote-components": "^5.23.3",
"@onecx/angular-webcomponents": "^5.23.3",
"@onecx/angular-testing": "^5.23.3",
"@onecx/integration-interface": "^5.23.3",
"@onecx/keycloak-auth": "^5.23.3",
"@onecx/portal-integration-angular": "^5.23.3",
"@onecx/portal-layout-styles": "^5.23.3",
"@onecx/accelerator": "^5.23.4",
"@onecx/angular-accelerator": "^5.23.4",
"@onecx/angular-auth": "^5.23.4",
"@onecx/angular-integration-interface": "^5.23.4",
"@onecx/angular-remote-components": "^5.23.4",
"@onecx/angular-webcomponents": "^5.23.4",
"@onecx/angular-testing": "^5.23.4",
"@onecx/integration-interface": "^5.23.4",
"@onecx/keycloak-auth": "^5.23.4",
"@onecx/portal-integration-angular": "^5.23.4",
"@onecx/portal-layout-styles": "^5.23.4",
"@webcomponents/webcomponentsjs": "^2.8.0",
"file-saver": "^2.0.5",
"keycloak-angular": "^16.0.1",
Expand Down Expand Up @@ -118,7 +118,7 @@
"ts-node": "10.9.2",
"typescript": "5.5.4",
"url-loader": "^4.1.1",
"webpack": "^5.93.0",
"webpack": "^5.95.0",
"webpack-merge": "^6.0.1"
}
}
8 changes: 4 additions & 4 deletions src/styles.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* global styles */
@import '../node_modules/primeng/resources/primeng.min.css';
@import '../node_modules/primeicons/primeicons.css';
@import 'node_modules/primeicons/primeicons.css';
@import 'node_modules/primeng/resources/primeng.min.css';

/* portal core */
@import '../node_modules/@onecx/portal-layout-styles/src/styles/shell/shell.scss';
@import '../node_modules/@onecx/portal-layout-styles/src/styles/primeng/theme-light.scss';
@import 'node_modules/@onecx/portal-layout-styles/src/styles/shell/shell';
@import 'node_modules/@onecx/portal-layout-styles/src/styles/primeng/theme-light.scss';

0 comments on commit d7bbdf0

Please sign in to comment.