Skip to content

Commit 07e541d

Browse files
authored
Merge branch 'master' into zkolev/promote-btn-group-skill-changes
2 parents 85fa432 + b265bd3 commit 07e541d

3 files changed

Lines changed: 3 additions & 8 deletions

File tree

projects/igniteui-angular/core/src/core/styles/components/grid/_grid-theme.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1265,7 +1265,7 @@
12651265
outline-style: none;
12661266

12671267
igx-icon {
1268-
--component-size: #{if($variant == 'indigo', 2, 3)};
1268+
--ig-size: #{if($variant == 'indigo', 2, 3)};
12691269
}
12701270
}
12711271

projects/igniteui-angular/core/src/core/styles/components/stepper/_stepper-theme.scss

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -366,16 +366,10 @@
366366
}
367367

368368
@if $variant == 'indigo' {
369-
[aria-selected='true'] {
370-
%igx-stepper__step-content-wrapper {
371-
padding-block: rem(16px);
372-
padding-inline-end: rem(16px);
373-
}
374-
}
375-
376369
[aria-selected='false'] {
377370
%igx-stepper__step-content-wrapper {
378371
padding-block: 0;
372+
transition: padding-block 0.3s 0.2s ease;
379373
}
380374
}
381375
}

projects/igniteui-angular/grids/grid/src/grid.component.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ export interface IGroupingDoneEventArgs extends IBaseEventArgs {
109109
preserveWhitespaces: false,
110110
providers: [
111111
IgxGridCRUDService,
112+
IgxGridMRLNavigationService,
112113
IgxGridNavigationService,
113114
IgxGridSummaryService,
114115
IgxGridSelectionService,

0 commit comments

Comments
 (0)