Skip to content

Commit 790f1d4

Browse files
authored
Merge branch '15.1.x' into ibarakov/fix-12581-15.1.x
2 parents 5db634b + b468f96 commit 790f1d4

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2163,9 +2163,10 @@
21632163
}
21642164

21652165
%igx-group-label__count-badge {
2166-
> div {
2167-
background: var-get($theme, 'group-count-background');
2168-
color: var-get($theme, 'group-count-text-color');
2166+
--background-color: #{var-get($theme, 'group-count-background')};
2167+
--text-color: #{var-get($theme, 'group-count-text-color')};
2168+
2169+
> span {
21692170
font-size: $grid-head-fs;
21702171
}
21712172
}

projects/igniteui-angular/src/lib/core/styles/components/input/_input-group-theme.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@
534534
height: var(--size);
535535
position: relative;
536536
max-width: 100%;
537-
font-size: 1rem;
537+
font-size: rem(16px);
538538

539539
&::after {
540540
content: '';
@@ -1896,7 +1896,6 @@
18961896

18971897
%form-group-input {
18981898
@include type-style($input-text) {
1899-
font-size: 16px;
19001899
margin: 0;
19011900
}
19021901
}

0 commit comments

Comments
 (0)