Skip to content

Commit 2282631

Browse files
adrianptrvLipata
andauthored
fix(input-group): prefix & suffix bootrstrap borders (#16149)
Co-authored-by: Nikolay Alipiev <nikolay.alipiev@gmail.com>
1 parent 5c82c36 commit 2282631

File tree

3 files changed

+51
-36
lines changed

3 files changed

+51
-36
lines changed

projects/igniteui-angular/src/lib/core/styles/components/combo/_combo-theme.scss

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -136,20 +136,6 @@
136136
}
137137

138138
@if $variant == 'bootstrap' {
139-
.igx-input-group--disabled {
140-
%igx-combo__toggle-button {
141-
border-inline-start-width: rem(1px);
142-
border-inline-start-style: solid;
143-
border-inline-start-color: inherit;
144-
}
145-
}
146-
147-
igx-suffix:not(.igx-combo__clear-button) + %igx-combo__toggle-button {
148-
border-inline-start-width: rem(1px);
149-
border-inline-start-style: solid;
150-
border-inline-start-color: inherit;
151-
}
152-
153139
.igx-input-group__bundle::after {
154140
height: rem(1px) !important;
155141
}

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

Lines changed: 51 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -612,7 +612,7 @@
612612
%bootstrap-file-focused,
613613
%bootstrap-file-valid,
614614
%bootstrap-file-warning,
615-
%bootstrap-file-invalid,
615+
%bootstrap-file-invalid
616616
{
617617
%form-group-bundle {
618618
border-radius: var-get($theme, 'box-border-radius');
@@ -670,18 +670,42 @@
670670
%form-group-bundle {
671671
box-shadow: 0 0 0 rem(4px) var-get($theme, 'success-shadow-color');
672672
}
673+
674+
%form-group-prefix:not(:first-child) {
675+
border-inline-start-color: var-get($theme, 'success-secondary-color');
676+
}
677+
678+
%form-group-suffix:not(:last-child) {
679+
border-inline-end-color: var-get($theme, 'success-secondary-color');
680+
}
673681
}
674682

675683
%bootstrap-file-warning-focused {
676684
%form-group-bundle {
677685
box-shadow: 0 0 0 rem(4px) color($color: 'warn', $variant: '500', $opacity: .38);
686+
687+
%form-group-prefix:not(:first-child) {
688+
border-inline-start-color: var-get($theme, 'warning-secondary-color');
689+
}
690+
691+
%form-group-suffix:not(:last-child) {
692+
border-inline-end-color: var-get($theme, 'warning-secondary-color');
693+
}
678694
}
679695
}
680696

681697
%bootstrap-file-invalid-focused {
682698
%form-group-bundle {
683699
box-shadow: 0 0 0 rem(4px) var-get($theme, 'error-shadow-color');
684700
}
701+
702+
%form-group-prefix:not(:first-child) {
703+
border-inline-start-color: var-get($theme, 'error-secondary-color');
704+
}
705+
706+
%form-group-suffix:not(:last-child) {
707+
border-inline-end-color: var-get($theme, 'error-secondary-color');
708+
}
685709
}
686710

687711
@if $variant == 'bootstrap' {
@@ -691,6 +715,14 @@
691715
%upload-button {
692716
border-color: var-get($theme, 'focused-border-color');
693717
}
718+
719+
%form-group-prefix:not(:first-child) {
720+
border-inline-start-color: var-get($theme, 'focused-border-color');
721+
}
722+
723+
%form-group-suffix:not(:last-child) {
724+
border-inline-end-color: var-get($theme, 'focused-border-color');
725+
}
694726
}
695727
}
696728

@@ -2015,11 +2047,6 @@
20152047
};
20162048
}
20172049
}
2018-
2019-
.igx-input-group__clear-icon + igx-suffix,
2020-
.igx-input-group__clear-icon + [igxPrefix] {
2021-
border-inline-start: rem(1px) solid var-get($theme, 'border-color');
2022-
}
20232050
}
20242051

20252052
%form-group-display--bootstrap-suffixed-focused {
@@ -2284,6 +2311,24 @@
22842311
border-color: var-get($theme, 'disabled-border-color');
22852312
color: var-get($theme, 'disabled-text-color');
22862313
}
2314+
2315+
%form-group-prefix--disabled-bootstrap:not(:first-child) {
2316+
border-inline-start-color: var-get($theme, 'disabled-border-color');
2317+
}
2318+
2319+
%form-group-suffix--disabled-bootstrap:not(:last-child) {
2320+
border-inline-end-color: var-get($theme, 'disabled-border-color');
2321+
}
2322+
2323+
@if $variant == 'bootstrap' {
2324+
%form-group-prefix:not(:first-child) {
2325+
border-inline-start: rem(1px) solid var-get($theme, 'border-color');
2326+
}
2327+
2328+
%form-group-suffix:not(:last-child) {
2329+
border-inline-end: rem(1px) solid var-get($theme, 'border-color');
2330+
}
2331+
}
22872332
}
22882333

22892334
/// Adds typography styles for the igx-input-group component.

projects/igniteui-angular/src/lib/core/styles/components/select/_select-theme.scss

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,6 @@
1313
display: block;
1414
}
1515

16-
@if $variant == 'bootstrap' {
17-
.igx-input-group--disabled {
18-
%igx-select__toggle-button {
19-
border-inline-start-width: rem(1px);
20-
border-inline-start-style: solid;
21-
border-inline-start-color: inherit;
22-
}
23-
}
24-
25-
igx-suffix + %igx-select__toggle-button {
26-
border-inline-start-width: rem(1px);
27-
border-inline-start-style: solid;
28-
border-inline-start-color: inherit;
29-
}
30-
}
31-
3216
.igx-input-group {
3317
%igx-select__toggle-button {
3418
background: var-get($theme, 'toggle-button-background');

0 commit comments

Comments
 (0)