Skip to content

Commit dca1f11

Browse files
Merge pull request #446 from dxc-technology/fix-theming
[Major] Default theme and advanced theme updated
2 parents 4f7e7a7 + caf4d6a commit dca1f11

File tree

77 files changed

+2727
-2617
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+2727
-2617
lines changed

projects/dxc-ngx-cdk-site/src/app/components/theme-builder/dynamic-component/theme-builder-dynamic.module.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ import { UploadPreviewComponent } from '../../../pages/theme-builder/previews/up
3535
import { TablePreviewComponent } from '../../../pages/theme-builder/previews/table-preview/table-preview.component';
3636
import { NewInputTextPreviewComponent } from '../../../pages/theme-builder/previews/new-input-text-preview/new-input-text-preview.component';
3737
import { NewDatePreviewComponent } from "src/app/pages/theme-builder/previews/new-date-preview/new-date-preview.component";
38-
import { PasswordPreviewComponent } from '../../../pages/theme-builder/previews/password-preview/password-preview.component';
39-
import { NumberPreviewComponent } from '../../../pages/theme-builder/previews/number-preview/number-preview.component';
4038
import { NewTextareaPreviewComponent } from "src/app/pages/theme-builder/previews/new-textarea-preview/new-textarea-preview.component";
4139

4240
@NgModule({
@@ -76,8 +74,6 @@ import { NewTextareaPreviewComponent } from "src/app/pages/theme-builder/preview
7674
UploadPreviewComponent,
7775
TablePreviewComponent,
7876
NewDatePreviewComponent,
79-
PasswordPreviewComponent,
80-
NumberPreviewComponent,
8177
NewTextareaPreviewComponent
8278
]
8379
})

projects/dxc-ngx-cdk-site/src/app/pages/components-page/components-page.component.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
}
44

55
.body-container {
6-
font-family: var(--fontFamily);
76
display: flex;
87
min-height: 100vh;
98
}

projects/dxc-ngx-cdk-site/src/app/pages/components-sidenav/components-sidenav-menu/components-sidenav-menu.component.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
margin-block-end: 0.67em;
99
margin-inline-start: 0px;
1010
margin-inline-end: 0px;
11-
font-family: var(--fontFamily);
1211
font-size: 24px;
1312
display: flex;
1413
-webkit-box-align: center;
@@ -55,7 +54,6 @@
5554
}
5655
.sidenav-links {
5756
padding: 0px 20px;
58-
font-family: var(--fontFamily);
5957
.nav-item {
6058
margin-bottom: 5px;
6159
padding-left: 0px;

projects/dxc-ngx-cdk-site/src/app/pages/components-sidenav/components-sidenav.component.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
.body-container {
2-
font-family: var(--fontFamily);
32
display: flex;
43
min-height: 100vh;
54
}

projects/dxc-ngx-cdk-site/src/app/pages/overview-page/overview-page.component.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,12 @@ div.overview-header-titles {
2121
h1.overview-header-title {
2222
margin: 0px;
2323
font-size: 35px;
24-
font-family: var(--fontFamily);
2524
line-height: 40px;
2625
}
2726

2827
h2.overview-header-subtitle {
2928
margin: 0px;
3029
font-size: 25px;
31-
font-family: var(--fontFamily);
3230
line-height: 20px;
3331
color: #474747;
3432
font-weight: normal;

projects/dxc-ngx-cdk-site/src/app/pages/theme-builder/previews/accordion-preview/accordion-preview.component.html

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@
88
>
99
<div>
1010
<dxc-button label="hola" mode="text"> </dxc-button>
11-
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse
12-
malesuada lacus ex, sit amet blandit leo lobortis eget.</p>
11+
<p>
12+
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse
13+
malesuada lacus ex, sit amet blandit leo lobortis eget.
14+
</p>
1315
</div>
1416
</dxc-accordion>
1517
</tbuilder-component-mode>
@@ -22,6 +24,18 @@
2224
padding="medium"
2325
disabled
2426
>
27+
<dxc-accordion-icon>
28+
<svg fill="currentColor" viewBox="0 0 24 24">
29+
<g id="Bounding_Box">
30+
<rect fill="none" width="24" height="24" />
31+
</g>
32+
<g id="Master">
33+
<path
34+
d="M19,9.3V4h-3v2.6L12,3L2,12h3v8h5v-6h4v6h5v-8h3L19,9.3z M10,10c0-1.1,0.9-2,2-2s2,0.9,2,2H10z"
35+
/>
36+
</g>
37+
</svg>
38+
</dxc-accordion-icon>
2539
<div>
2640
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse
2741
malesuada lacus ex, sit amet blandit leo lobortis eget.

projects/dxc-ngx-cdk-site/src/app/pages/theme-builder/previews/button-preview/button-preview.component.html

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,38 @@
1919
</svg>
2020
</dxc-button-icon>
2121
</dxc-button>
22+
<dxc-button margin="xxsmall">
23+
<dxc-button-icon
24+
><svg
25+
xmlns="http://www.w3.org/2000/svg"
26+
width="24"
27+
height="24"
28+
viewBox="0 0 24 24"
29+
fill="currentColor"
30+
>
31+
<path d="M0 0h24v24H0z" fill="none" />
32+
<path
33+
d="M19.35 10.04C18.67 6.59 15.64 4 12 4 9.11 4 6.6 5.64 5.35 8.04 2.34 8.36 0 10.91 0 14c0 3.31 2.69 6 6 6h13c2.76 0 5-2.24 5-5 0-2.64-2.05-4.78-4.65-4.96zM14 13v4h-4v-4H7l5-5 5 5h-3z"
34+
/>
35+
</svg>
36+
</dxc-button-icon>
37+
</dxc-button>
38+
<dxc-button label="Button" margin="xxsmall" iconPosition="after">
39+
<dxc-button-icon
40+
><svg
41+
xmlns="http://www.w3.org/2000/svg"
42+
width="24"
43+
height="24"
44+
viewBox="0 0 24 24"
45+
fill="currentColor"
46+
>
47+
<path d="M0 0h24v24H0z" fill="none" />
48+
<path
49+
d="M19.35 10.04C18.67 6.59 15.64 4 12 4 9.11 4 6.6 5.64 5.35 8.04 2.34 8.36 0 10.91 0 14c0 3.31 2.69 6 6 6h13c2.76 0 5-2.24 5-5 0-2.64-2.05-4.78-4.65-4.96zM14 13v4h-4v-4H7l5-5 5 5h-3z"
50+
/>
51+
</svg>
52+
</dxc-button-icon>
53+
</dxc-button>
2254
<dxc-button label="Button" margin="xxsmall" disabled></dxc-button>
2355
</tbuilder-component-mode>
2456

projects/dxc-ngx-cdk-site/src/app/pages/theme-builder/previews/number-preview/number-preview.component.html

Lines changed: 0 additions & 63 deletions
This file was deleted.

projects/dxc-ngx-cdk-site/src/app/pages/theme-builder/previews/number-preview/number-preview.component.ts

Lines changed: 0 additions & 20 deletions
This file was deleted.

projects/dxc-ngx-cdk-site/src/app/pages/theme-builder/previews/password-preview/password-preview.component.html

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)