Skip to content

Commit 4696094

Browse files
authored
fix(input-group): fix borders and material focus line (#16406)
1 parent 91bed5d commit 4696094

File tree

2 files changed

+30
-41
lines changed

2 files changed

+30
-41
lines changed

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -754,12 +754,6 @@
754754
@include mx(fluent, search, focused) {
755755
@extend %igx-input-group-fluent-search--focused !optional;
756756
}
757-
758-
@include mx(fluent, search, disabled) {
759-
@include e(bundle) {
760-
@extend %form-group-bundle-search--disabled !optional;
761-
}
762-
}
763757
// FLUENT END
764758

765759
// ============================== //

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

Lines changed: 30 additions & 35 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,
@@ -680,7 +692,7 @@
680692
%bootstrap-file-warning,
681693
%bootstrap-file-invalid {
682694
%form-group-bundle {
683-
border-radius: var-get($theme, 'box-border-radius');
695+
border-radius: var-get($theme, 'border-border-radius');
684696
transition: box-shadow .15s ease-out, border .15s ease-out;
685697

686698
&:hover {
@@ -793,7 +805,7 @@
793805

794806
.igx-input-group--bootstrap:not(.igx-input-group--prefixed) {
795807
.igx-input-group__upload-button {
796-
border-radius: var-get($theme, 'box-border-radius') 0 0 var-get($theme, 'box-border-radius');
808+
border-radius: var-get($theme, 'border-border-radius') 0 0 var-get($theme, 'border-border-radius');
797809
}
798810

799811
.igx-input-group__file-input {
@@ -1025,9 +1037,9 @@
10251037
%form-group-bundle--search {
10261038
background: var-get($theme, 'search-background');
10271039
box-shadow: var-get($theme, 'search-resting-elevation');
1040+
border-radius: var-get($theme, 'search-border-radius');
10281041

10291042
@if $variant != 'bootstrap' {
1030-
border-radius: var-get($theme, 'search-border-radius');
10311043
overflow: hidden;
10321044
}
10331045

@@ -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
}
@@ -2053,11 +2065,11 @@
20532065
}
20542066

20552067
%fluent-label-success {
2056-
color: var-get($theme, 'idle-text-color');
2068+
color: var-get($theme, 'idle-secondary-color');
20572069
}
20582070

20592071
%fluent-label-error {
2060-
color: var-get($theme, 'idle-text-color');
2072+
color: var-get($theme, 'idle-secondary-color');
20612073
}
20622074

20632075
%fluent-label-disabled {
@@ -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,
@@ -2233,10 +2228,10 @@
22332228
end-width: rem(1px);
22342229
};
22352230
start: {
2236-
start-radius: var-get($theme, 'box-border-radius');
2231+
start-radius: var-get($theme, 'border-border-radius');
22372232
};
22382233
end: {
2239-
start-radius: var-get($theme, 'box-border-radius');
2234+
start-radius: var-get($theme, 'border-border-radius');
22402235
};
22412236
}
22422237
}
@@ -2253,10 +2248,10 @@
22532248
end-width: rem(1px);
22542249
};
22552250
start: {
2256-
end-radius: var-get($theme, 'box-border-radius');
2251+
end-radius: var-get($theme, 'border-border-radius');
22572252
};
22582253
end: {
2259-
end-radius: var-get($theme, 'box-border-radius');
2254+
end-radius: var-get($theme, 'border-border-radius');
22602255
};
22612256
}
22622257
}
@@ -2323,7 +2318,7 @@
23232318
map.get($bootstrap-inline-padding, 'cosy'),
23242319
map.get($bootstrap-inline-padding, 'comfortable')
23252320
);
2326-
border-radius: var-get($theme, 'box-border-radius');
2321+
border-radius: var-get($theme, 'border-border-radius');
23272322

23282323
}
23292324

0 commit comments

Comments
 (0)