Skip to content

Commit d61b94c

Browse files
authored
Merge pull request #3141 from IgniteUI/mpopov/styling-samples-refactoring
Refactoring styling samples
2 parents 2979018 + 026ca09 commit d61b94c

86 files changed

Lines changed: 308 additions & 582 deletions

File tree

Some content is hidden

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

projects/app-lob/src/app/grid-dynamic-chart-data/data-analysis-dock-manager/data-analysis-dock-manager.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ $custom-badge-theme: badge-theme(
5656
.selected {
5757
igx-badge {
5858
& {
59-
@include badge($custom-badge-theme);
59+
@include css-vars($custom-badge-theme);
6060
}
6161

6262
position: absolute;

projects/app-lob/src/app/grid/grid-boston-marathon/grid.component.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ $progressBar-sample-theme: progress-linear-theme(
1616

1717
::ng-deep .default-theme {
1818
.grid__wrapper {
19-
@include grid($grid-sample-theme);
20-
@include progress-linear($progressBar-sample-theme);
19+
@include css-vars($grid-sample-theme);
20+
@include css-vars($progressBar-sample-theme);
2121
}
2222
}
2323

src/app/data-display/chip/chip-styling/chip-styling.component.scss

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,6 @@ $custom-theme: chip-theme(
1717
$border-radius: 5px
1818
);
1919

20-
21-
// :host {
22-
// @include css-vars($custom-theme);
23-
// }
24-
25-
26-
/* Using Theme Overrides to provide IE 11 support.
27-
* NOTE: Theming using this approach will greatly increase the size
28-
* of the output CSS. If you do not plan to target IE 11,
29-
* delete this section and use the `igx-css-vars` mixin as shown above.
30-
**/
3120
:host ::ng-deep {
32-
@include chip($custom-theme);
21+
@include css-vars($custom-theme);
3322
}

src/app/data-display/circular-progressbar/circular-styling-sample/circular-styling-sample.component.scss

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,6 @@ $custom-theme: progress-circular-theme(
55
$progress-circle-color: color($color: 'success')
66
);
77

8-
// :host {
9-
// @include css-vars($custom-theme);
10-
// }
11-
12-
/* Using Theme Overrides to provide IE 11 support.
13-
* NOTE: Theming using this approach will greatly increase the size
14-
* of the output CSS. If you do not plan to target IE 11,
15-
* delete this section and use the `igx-css-vars` mixin as shown above.
16-
**/
178
:host ::ng-deep {
18-
@include progress-circular($custom-theme);
9+
@include css-vars($custom-theme);
1910
}

src/app/data-display/icon/icon-styling-sample/icon-styling-sample.component.scss

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,6 @@ $custom-icon-theme: icon-theme(
2525
color: #0a415c;
2626
}
2727

28-
// @include css-vars($custom-icon-theme);
29-
30-
/* Using Theme Overrides to provide IE 11 support.
31-
* NOTE: Theming using this approach will greatly increase the size
32-
* of the output CSS. If you do not plan to target IE 11,
33-
* delete this section and use the `igx-css-vars` mixin as shown above.
34-
**/
35-
::ng-deep {
36-
@include icon($custom-icon-theme);
37-
}
28+
@include css-vars($custom-icon-theme);
3829
}
3930

src/app/data-display/linear-progressbar/linear-progressbar-styling-sample/linear-progressbar-styling-sample.component.scss

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,6 @@ $custom-theme: progress-linear-theme(
1010
$text-color: #ECAA53
1111
);
1212

13-
// :host {
14-
// @include css-vars($custom-theme);
15-
// }
16-
17-
/* Using Theme Overrides to provide IE 11 support.
18-
* NOTE: Theming using this approach will greatly increase the size
19-
* of the output CSS. If you do not plan to target IE 11,
20-
* delete this section and use the `igx-css-vars` mixin as shown above.
21-
**/
22-
:host ::ng-deep {
23-
@include progress-linear($custom-theme);
13+
:host {
14+
@include css-vars($custom-theme);
2415
}

src/app/data-display/text-highlight/text-highlight-style/text-highlight-style.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ $dark-highlight: highlight-theme(
1212
padding: 4px;
1313

1414
::ng-deep {
15-
@include highlight($dark-highlight);
15+
@include css-vars($dark-highlight);
1616

1717
.custom-highlight {
1818
border: 1px solid #FFCD0F;

src/app/data-entries/buttonGroup/button-group-style/button-group-style.component.scss

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,9 @@ $custom-button-group: button-group-theme(
1717
$disabled-background-color: lightgray
1818
);
1919

20-
// :host {
21-
// @include css-vars($custom-button-group);
22-
// }
23-
24-
/* Using Theme Overrides to provide IE 11 support.
25-
* NOTE: Theming using this approach will greatly increase the size
26-
* of the output CSS. If you do not plan to target IE 11,
27-
* delete this section and use the `igx-css-vars` mixin as shown above.
28-
**/
2920
:host ::ng-deep {
30-
@include button-group($custom-button-group);
21+
@include css-vars($custom-button-group);
3122
}
3223

24+
25+

src/app/data-entries/buttons/buttons-roundness-sample/buttons-roundness-sample.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@ $iconBtn: button-theme(
1717
);
1818

1919
.flat {
20-
@include button($flatBtn);
20+
@include css-vars($flatBtn);
2121
}
2222

2323
.raised {
24-
@include button($raisedBtn);
24+
@include css-vars($raisedBtn);
2525
}
2626

2727
.fab {
28-
@include button($fabBtn);
28+
@include css-vars($fabBtn);
2929
}
3030

3131
.icon {
32-
@include button($iconBtn);
32+
@include css-vars($iconBtn);
3333
}
3434

3535
.buttons-sample {

src/app/data-entries/buttons/buttons-style/buttons-style.component.scss

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,6 @@ $custom-button-theme: button-theme(
2020
$disabled-foreground: #bbb
2121
);
2222

23-
// :host {
24-
// @include css-vars($custom-button-theme);
25-
// }
26-
27-
/* Using Theme Overrides to provide IE 11 support.
28-
* NOTE: Theming using this approach will greatly increase the size
29-
* of the output CSS. If you do not plan to target IE 11,
30-
* delete this section and use the `igx-css-vars` mixin as shown above.
31-
**/
3223
:host ::ng-deep {
33-
@include button($custom-button-theme);
24+
@include css-vars($custom-button-theme);
3425
}

0 commit comments

Comments
 (0)