Skip to content

Commit 6be21b8

Browse files
simeonoffsimeonoff
authored
Merge branch 'vnext' into apetrov/fix-slider-samples-vnext
2 parents fc80f7f + 38a047b commit 6be21b8

File tree

122 files changed

+515
-585
lines changed

Some content is hidden

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

122 files changed

+515
-585
lines changed

‎projects/app-crm/src/app/grid-crm/grid-crm.component.scss‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@
3232
$title-text-color: contrast-color($color: 'primary', $variant: 500)
3333
);
3434

35-
$crm-grid-toolbar-button: button-theme(
35+
$crm-grid-toolbar-button: outlined-button-theme(
3636
$background: color($light-palette, 'primary', 800),
3737
$hover-background: color($light-palette, 'primary', 900),
3838
$active-foreground: contrast-color($light-palette, 'primary', 900),
3939
$focus-foreground: contrast-color($light-palette, 'primary', 900)
4040
);
4141

42-
$crm-grid-search-button: button-theme(
42+
$crm-grid-search-button: flat-icon-button-theme(
4343
$background: transparent,
4444
$focus-background: color($light-palette, 'gray', 200),
4545
$hover-background: color($light-palette, 'gray', 200)
@@ -110,7 +110,7 @@
110110
width: 70%
111111
}
112112

113-
@include css-vars($crm-grid-toolbar);
113+
@include tokens($crm-grid-toolbar, $mode: 'scoped');
114114

115115
.igx-grid-toolbar__actions {
116116
.igx-button--outlined {
@@ -139,7 +139,7 @@
139139
}
140140

141141
.igx-grid-toolbar__actions {
142-
@include css-vars($crm-grid-toolbar-button);
142+
@include tokens($crm-grid-toolbar-button);
143143
}
144144

145145
.crm-sample-toolbar__title {
@@ -205,7 +205,7 @@
205205
box-shadow: none;
206206
}
207207

208-
@include css-vars($crm-input-drop-down);
208+
@include tokens($crm-input-drop-down, $mode: 'scoped');
209209

210210
.sample-flex-container {
211211
.igx-input-group,
@@ -281,13 +281,13 @@
281281
.igx-input-group--search .igx-input-group__bundle {
282282
background-color: color($color: 'primary', $variant: 800);
283283

284-
@include css-vars($crm-grid-search-button);
284+
@include tokens($crm-grid-search-button);
285285
}
286286

287287
.grid__wrapper:not(.dark_grid) {
288-
@include css-vars($crm-grid-theme);
289-
@include css-vars($summary-theme);
290-
@include css-vars($checkbox-theme);
288+
@include tokens($crm-grid-theme);
289+
@include tokens($summary-theme);
290+
@include tokens($checkbox-theme);
291291
}
292292

293293

@@ -315,7 +315,7 @@
315315
$cell-active-border-color: color($color: 'gray', $variant: 900),
316316
);
317317

318-
$crm-grid-dark-button: button-theme(
318+
$crm-grid-dark-button: flat-button-theme(
319319
$foreground: color($color: 'primary', $variant: 500),
320320
$hover-foreground: color($color: 'primary', $variant: 500),
321321
$focus-foreground: color($color: 'primary', $variant: 500),
@@ -327,13 +327,13 @@
327327

328328
.dark_grid {
329329
@include palette($dark-palette);
330-
@include css-vars($checkbox-dark-theme);
331-
@include css-vars($crm-dark-grid-theme);
332-
@include css-vars($crm-grid-dark-button);
333-
@include css-vars($crm-grid-dark-progress);
330+
@include tokens($checkbox-dark-theme);
331+
@include tokens($crm-dark-grid-theme);
332+
@include tokens($crm-grid-dark-button);
333+
@include tokens($crm-grid-dark-progress);
334334

335335
.igx-grid-toolbar__actions {
336-
@include css-vars($crm-grid-toolbar-button);
336+
@include tokens($crm-grid-toolbar-button);
337337
}
338338

339339
.sample-flex-container {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ $custom-badge-theme: badge-theme(
5959
.selected {
6060
igx-badge {
6161
& {
62-
@include css-vars($custom-badge-theme);
62+
@include tokens($custom-badge-theme);
6363
}
6464

6565
position: absolute;
@@ -96,8 +96,8 @@ $custom-badge-theme: badge-theme(
9696
}
9797

9898
.analytics-btn {
99-
@include css-vars(
100-
button-theme(
99+
@include tokens(
100+
contained-button-theme(
101101
$foreground: contrast-color($color: 'gray', $variant: 900),
102102
$background: color($color: 'success', $variant: 500, $opacity: .8),
103103
$hover-background: color($color: 'success'),

‎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 css-vars($grid-sample-theme);
20-
@include css-vars($progressBar-sample-theme);
19+
@include tokens($grid-sample-theme);
20+
@include tokens($progressBar-sample-theme);
2121
}
2222
}
2323

‎projects/app-lob/src/styles.scss‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ body {
4242
igx-hierarchical-grid,
4343
igx-pivot-grid,
4444
igx-tree-grid {
45-
--igx-chip-disabled-background: #616161;
46-
--igx-chip-disabled-border-color: #616161;
47-
--igx-chip-disabled-text-color: #BDBDBD;
45+
--ig-chip-disabled-background: #616161;
46+
--ig-chip-disabled-border-color: #616161;
47+
--ig-chip-disabled-text-color: #BDBDBD;
4848
}
4949
}
5050
.fin-dark-theme {

‎src/app/data-display/badge/badge-styling-sample/badge-styling-sample.component.scss‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@ $custom-badge-theme: badge-theme(
66
$border-radius: 4px
77
);
88

9-
@include css-vars($custom-badge-theme);
10-
9+
:host {
10+
@include tokens($custom-badge-theme);
11+
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,6 @@ igx-chip {
4444
// $border-radius: rem(5px)
4545
// );
4646

47-
// @include css-vars($custom-chip-theme)
48-
47+
// :host {
48+
// @include tokens($custom-chip-theme);
49+
// }

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ $custom-theme: progress-circular-theme(
55
$diameter: 50px,
66
);
77

8-
@include css-vars($custom-theme);
9-
108
igx-circular-bar {
9+
@include tokens($custom-theme);
1110
margin: 20px;
1211
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@ $custom-icon-theme: icon-theme(
66
$disabled-color: #494949
77
);
88

9-
@include css-vars($custom-icon-theme);
10-
9+
:host {
10+
@include tokens($custom-icon-theme);
11+
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,6 @@ $custom-theme: progress-linear-theme(
66
$text-color: #ecaa53,
77
);
88

9-
@include css-vars($custom-theme);
9+
:host {
10+
@include tokens($custom-theme);
11+
}

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

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,14 @@ $dark-highlight: highlight-theme(
88
$active-color: #ffcd0f,
99
);
1010

11-
:host {
12-
::ng-deep {
13-
@include css-vars($dark-highlight);
14-
11+
:host ::ng-deep {
12+
@include tokens($dark-highlight);
13+
1514
.custom-highlight {
16-
border: 1px solid #ffcd0f;
17-
}
18-
15+
border: 1px solid #ffcd0f;
16+
}
17+
1918
.custom-active-highlight {
20-
box-shadow: 0 0 3px 0 rgba(0, 0, 0, 0.75);
19+
box-shadow: 0 0 3px 0 rgba(0, 0, 0, 0.75);
2120
}
22-
}
2321
}
24-

0 commit comments

Comments
 (0)