From 84639ba2cbf0564a9ba3151a93d92d74d4fb09f1 Mon Sep 17 00:00:00 2001 From: Manuel Angel Garcia Caballero Date: Wed, 21 Apr 2021 17:21:43 +0200 Subject: [PATCH 1/2] [Patch] updating padding on table headers following guidelines --- angular.json | 7 ++++--- .../overview-install/overview-install-assets.properties | 4 ++-- .../overview-install/overview-install.component.html | 6 +++--- .../dxc-ngx-cdk/src/lib/dxc-table/dxc-table.component.ts | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/angular.json b/angular.json index 0522016bb..d1f1a57d0 100644 --- a/angular.json +++ b/angular.json @@ -45,9 +45,9 @@ } ], "styles": [ - "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css", - "./node_modules/@dxc-technology/halstack-angular/lib/styles/fonts/fonts.scss", + "./node_modules/@dxc-technology/halstack-angular/lib/styles/themes/theme.scss", "projects/dxc-ngx-cdk-site/src/styles.scss" + ], "scripts": [], "baseHref": "/" @@ -115,8 +115,9 @@ "projects/dxc-ngx-cdk-site/src/assets" ], "styles": [ - "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css", + "./node_modules/@dxc-technology/halstack-angular/lib/styles/themes/theme.scss", "projects/dxc-ngx-cdk-site/src/styles.scss" + ], "scripts": [] } diff --git a/projects/dxc-ngx-cdk-site/src/app/components/examples/overview/overview-install/overview-install-assets.properties b/projects/dxc-ngx-cdk-site/src/app/components/examples/overview/overview-install/overview-install-assets.properties index 06adefbb8..09fddd453 100644 --- a/projects/dxc-ngx-cdk-site/src/app/components/examples/overview/overview-install/overview-install-assets.properties +++ b/projects/dxc-ngx-cdk-site/src/app/components/examples/overview/overview-install/overview-install-assets.properties @@ -12,11 +12,11 @@ } ], "styles": [ - "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css" + "./node_modules/@dxc-technology/halstack-angular/lib/styles/themes/theme.scss", ], } } } } } -} \ No newline at end of file +} diff --git a/projects/dxc-ngx-cdk-site/src/app/components/overview/overview-install/overview-install.component.html b/projects/dxc-ngx-cdk-site/src/app/components/overview/overview-install/overview-install.component.html index f18325a76..2eb67fbcb 100644 --- a/projects/dxc-ngx-cdk-site/src/app/components/overview/overview-install/overview-install.component.html +++ b/projects/dxc-ngx-cdk-site/src/app/components/overview/overview-install/overview-install.component.html @@ -55,17 +55,17 @@

- The CDK uses Angular Material so if it's not added, the components will not + The cdk uses a Dxc Halstack styling so if it's not added, the components will not work as expected.

Furthermore, it is mandatory to add in your angular.json the library assets - as well as the indigo pink pre-built theme from Angular Material: + as well as the theme from Halstack Angular:

diff --git a/projects/dxc-ngx-cdk/src/lib/dxc-table/dxc-table.component.ts b/projects/dxc-ngx-cdk/src/lib/dxc-table/dxc-table.component.ts index 52f171acc..7605008a9 100644 --- a/projects/dxc-ngx-cdk/src/lib/dxc-table/dxc-table.component.ts +++ b/projects/dxc-ngx-cdk/src/lib/dxc-table/dxc-table.component.ts @@ -65,7 +65,7 @@ export class DxcTableComponent { } & th { - padding: 15px 20px 15px 40px; + padding: 14px 20px 12px 40px; height: 60px; } From f1d8181725d9bcbd293d34b63c302b2b87c88423 Mon Sep 17 00:00:00 2001 From: Manuel Angel Garcia Caballero Date: Thu, 22 Apr 2021 09:58:14 +0200 Subject: [PATCH 2/2] [Minor] Collecting in lib all css files into a unique style.css --- .../overview/overview-install/overview-install.component.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/projects/dxc-ngx-cdk-site/src/app/components/overview/overview-install/overview-install.component.html b/projects/dxc-ngx-cdk-site/src/app/components/overview/overview-install/overview-install.component.html index 2eb67fbcb..590c3d11f 100644 --- a/projects/dxc-ngx-cdk-site/src/app/components/overview/overview-install/overview-install.component.html +++ b/projects/dxc-ngx-cdk-site/src/app/components/overview/overview-install/overview-install.component.html @@ -46,8 +46,7 @@ Angular + >Angular does it?