Skip to content

Commit 0f75a70

Browse files
authored
Merge branch '20.1.x' into randriova/calendar-i18n-20.1.x
2 parents 71616d9 + 0720fc1 commit 0f75a70

File tree

2 files changed

+30
-27
lines changed

2 files changed

+30
-27
lines changed

projects/igniteui-angular/src/lib/core/styles/components/button/_button-theme.scss

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -426,6 +426,7 @@
426426
&:active {
427427
background: var-get($flat-theme, 'focus-background');
428428
color: var-get($flat-theme, 'focus-foreground');
429+
border-color: var-get($flat-theme, 'focus-border-color');
429430

430431
igx-icon {
431432
color: var-get($flat-theme, 'focus-foreground');
@@ -524,18 +525,20 @@
524525
color: var-get($outlined-theme, 'focus-visible-foreground');
525526
border-color: var-get($outlined-theme, 'focus-visible-border-color');
526527

527-
igx-icon {
528-
color: var-get($outlined-theme, 'focus-visible-foreground');
528+
@if $variant == 'material' or $variant == 'bootstrap' {
529+
igx-icon {
530+
color: var-get($outlined-theme, 'icon-color-hover');
531+
}
532+
} @else {
533+
igx-icon {
534+
color: var-get($outlined-theme, 'icon-color');
535+
}
529536
}
530537

531538
@if $variant == 'bootstrap' {
532539
box-shadow: 0 0 0 rem(4px) var-get($outlined-theme, 'shadow-color');
533540
} @else if $variant == 'indigo' {
534541
box-shadow: 0 0 0 rem(3px) var-get($outlined-theme, 'shadow-color');
535-
536-
igx-icon {
537-
color: var-get($outlined-theme, 'icon-color');
538-
}
539542
}
540543

541544
&:hover {
@@ -551,15 +554,10 @@
551554
&:active {
552555
background: var-get($outlined-theme, 'focus-background');
553556
color: var-get($outlined-theme, 'focus-foreground');
557+
border-color: var-get($outlined-theme, 'focus-border-color');
554558

555-
@if $variant == 'material' {
556-
border-color: var-get($outlined-theme, 'focus-border-color');
557-
558-
igx-icon {
559-
color: var-get($outlined-theme, 'focus-foreground');
560-
}
561-
} @else {
562-
border-color: var-get($outlined-theme, 'active-border-color');
559+
igx-icon {
560+
color: var-get($outlined-theme, 'focus-foreground');
563561
}
564562

565563
@if $variant == 'indigo' {
@@ -681,6 +679,11 @@
681679
&:active {
682680
color: var-get($contained-theme, 'focus-foreground');
683681
background: var-get($contained-theme, 'focus-background');
682+
border-color: var-get($contained-theme, 'focus-border-color');
683+
684+
igx-icon {
685+
color: var-get($contained-theme, 'focus-foreground');
686+
}
684687

685688
@if $variant == 'indigo' {
686689
igx-icon {
@@ -818,6 +821,11 @@
818821
&:active {
819822
background: var-get($fab-theme, 'focus-background');
820823
color: var-get($fab-theme, 'focus-foreground');
824+
border-color: var-get($fab-theme, 'focus-border-color');
825+
826+
igx-icon {
827+
color: var-get($contained-theme, 'focus-foreground');
828+
}
821829

822830
@if $variant == 'indigo' {
823831
igx-icon {

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

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@
177177
igx-date-picker,
178178
igx-time-picker {
179179
position: relative;
180-
height: calc(100% - #{$editing-outline-width * 2});
180+
height: auto;
181181
width: 100% !important;
182182
overflow: hidden;
183183
}
@@ -211,6 +211,10 @@
211211
min-height: 100% !important;
212212
border: none !important;
213213

214+
.igx-input-group__filler {
215+
border: none !important;
216+
}
217+
214218
&::before {
215219
content: none !important;
216220
}
@@ -1006,10 +1010,10 @@
10061010
}
10071011

10081012
%igx-icon--error {
1009-
@if $variant == 'fluent' and $theme-variant == 'light' or $variant == 'material' and $theme-variant == 'light' {
1010-
color: color($color: 'gray', $variant: 600);
1011-
} @else {
1013+
@if $variant == 'indigo' or $theme-variant == 'dark' {
10121014
color: color($color: 'gray', $variant: 500);
1015+
} @else {
1016+
color: color($color: 'gray', $variant: 600);
10131017
}
10141018
}
10151019
}
@@ -1204,15 +1208,6 @@
12041208

12051209
@extend %cell-input-overrides;
12061210

1207-
> igx-input-group,
1208-
igx-combo,
1209-
igx-simple-combo,
1210-
igx-select,
1211-
igx-date-picker,
1212-
igx-time-picker {
1213-
height: auto;
1214-
}
1215-
12161211
igx-input-group {
12171212
background: transparent;
12181213
}

0 commit comments

Comments
 (0)