Merge pull request #330 from dxc-technology/styles-refactor

[Patch] updating padding on table headers following guidelines
dxc-technology · Apr 22, 2021 · 7bc6502 · 7bc6502
2 parents 3f6d10d + f1d8181
commit 7bc6502
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git 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/.../src/app/components/examples/overview/overview-install/overview-install-assets.properties b/.../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",
                         ],
                     }
                 }
             }
         }
     }
-}
+}
diff --git a/...ngx-cdk-site/src/app/components/overview/overview-install/overview-install.component.html b/...ngx-cdk-site/src/app/components/overview/overview-install/overview-install.component.html
@@ -46,26 +46,25 @@
     <a
       href="https://angular.io/guide/creating-libraries#use-typescript-path-mapping-for-peer-dependencies"
       target="_blank"
-      >Angular</a
-    >
+      >Angular</a>
     does it?
   </p>
   <app-code-playground [code]="tsCode" type="CONSOLE"> </app-code-playground>
 
   <dxc-heading
     [level]="4"
     weight="normal"
-    text="Material"
+    text="Dxc Halstack Style"
     [margin]="headingMargin"
   ></dxc-heading>
 
   <p>
-    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.
   </p>
   <p>
     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:
   </p>
   <app-code-playground [code]="assetsCode" type="CONSOLE">
   </app-code-playground>

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
@@ -65,7 +65,7 @@ export class DxcTableComponent {
         }
 
         & th {
-          padding: 15px 20px 15px 40px;
+          padding: 14px 20px 12px 40px;
           height: 60px;
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -65,7 +65,7 @@ export class DxcTableComponent { @@
             }
             & th {
-              padding: 15px 20px 15px 40px;
+              padding: 14px 20px 12px 40px;
               height: 60px;
             }
@@ Expand Down @@