Skip to content

Commit b1617db

Browse files
committed
Merge branch 'master' of https://github.com/IgniteUI/igniteui-angular into copilot/support-multiple-entry-points
2 parents 84708a7 + 801d14f commit b1617db

File tree

2 files changed

+1
-16
lines changed

2 files changed

+1
-16
lines changed

projects/igniteui-angular/core/src/core/styles/components/time-picker/_time-picker-theme.scss

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,6 @@
2323
'indigo': rem(16px),
2424
), $variant);
2525

26-
.igx-input-group {
27-
display: flex;
28-
flex-direction: column;
29-
30-
@if $variant == 'indigo' or $variant == 'bootstrap' {
31-
[igxLabel] {
32-
margin-block-end: rem(4px);
33-
}
34-
} @else if $variant == 'fluent' {
35-
[igxLabel] {
36-
margin-block-end: rem(5px);
37-
}
38-
}
39-
}
40-
4126
%time-picker-display {
4227
@include sizable();
4328

projects/igniteui-angular/grids/src/grids/grid/cell.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ describe('IgxGrid - Cell component #grid', () => {
426426
</igx-column>
427427
}
428428
</igx-grid>`,
429-
styleUrls: ['../../test-utils/grid-cell-style-testing.scss'],
429+
styleUrls: ['../../../../test-utils/grid-cell-style-testing.scss'],
430430
imports: [IgxGridComponent, IgxColumnComponent]
431431
})
432432
export class ConditionalCellStyleTestComponent implements OnInit {

0 commit comments

Comments
 (0)