Skip to content

Commit 39196d0

Browse files
committed
fix(input-group): fix borders and material focus line
1 parent c32d22e commit 39196d0

File tree

1 file changed

+20
-25
lines changed

1 file changed

+20
-25
lines changed

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

Lines changed: 20 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,7 @@
9696
display: inline-flex;
9797
width: max-content;
9898
align-items: center;
99-
100-
@if $indigo-theme {
101-
min-height: calc(100% - #{rem(1px)}) !important;
102-
} @else {
103-
min-height: 100% !important;
104-
}
105-
99+
min-height: 100% !important;
106100
transition: color $transition-timing, background $transition-timing;
107101

108102
&:not(:empty) {
@@ -155,12 +149,30 @@
155149
[igxPrefix] {
156150
@extend %form-group-prefix;
157151
outline-style: none;
152+
153+
&:first-child {
154+
@if $variant == 'fluent' {
155+
border-start-start-radius: calc(var-get($theme, 'border-border-radius') - var(--_fluent-input-border-size));
156+
border-end-start-radius: calc(var-get($theme, 'border-border-radius') - var(--_fluent-input-border-size));
157+
} @else if $variant == "indigo" {
158+
border-start-start-radius: var-get($theme, 'box-border-radius');
159+
}
160+
}
158161
}
159162

160163
igx-suffix,
161164
[igxSuffix] {
162165
@extend %form-group-suffix;
163166
outline-style: none;
167+
168+
&:last-child {
169+
@if $variant == 'fluent' {
170+
border-start-end-radius: calc(var-get($theme, 'border-border-radius') - var(--_fluent-input-border-size));
171+
border-end-end-radius: calc(var-get($theme, 'border-border-radius') - var(--_fluent-input-border-size));
172+
} @else if $variant == "indigo" {
173+
border-start-end-radius: var-get($theme, 'box-border-radius');
174+
}
175+
}
164176
}
165177

166178
input,
@@ -1500,7 +1512,7 @@
15001512
align-self: end;
15011513
transform: scaleX(0);
15021514
transform-origin: center;
1503-
background: var-get($theme, 'focused-secondary-color');
1515+
background: var-get($theme, 'focused-bottom-line-color');
15041516
z-index: 1;
15051517
}
15061518
}
@@ -2087,23 +2099,6 @@
20872099
}
20882100
}
20892101

2090-
.igx-input-group--fluent [igxPrefix],
2091-
.igx-input-group--fluent igx-prefix {
2092-
&:first-child {
2093-
[igxButton]::after,
2094-
button::after {
2095-
border: {
2096-
start: {
2097-
start-radius: var-get($theme, 'border-border-radius');
2098-
};
2099-
end: {
2100-
start-radius: var-get($theme, 'border-border-radius');
2101-
};
2102-
}
2103-
}
2104-
}
2105-
}
2106-
21072102
%form-group-prefix-fluent,
21082103
%form-group-suffix-fluent,
21092104
%form-group-prefix-fluent-search,

0 commit comments

Comments
 (0)