Skip to content

Commit 6141c64

Browse files
authored
fix(input-group): prefix & suffix bootstrap border (#16151)
1 parent e09d808 commit 6141c64

File tree

1 file changed

+65
-30
lines changed
  • projects/igniteui-angular/src/lib/input-group/themes/shared

1 file changed

+65
-30
lines changed

projects/igniteui-angular/src/lib/input-group/themes/shared/bootstrap.scss

Lines changed: 65 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ $border-radius: var-get($_theme, 'border-border-radius');
2727
.igx-input-group__bundle-main {
2828
border-start-start-radius: $border-radius;
2929
border-end-start-radius: $border-radius;
30-
3130
}
3231
}
3332

@@ -44,20 +43,6 @@ $border-radius: var-get($_theme, 'border-border-radius');
4443
border-radius: $border-radius;
4544
}
4645
}
47-
48-
igx-suffix + .igx-input-group__toggle-button,
49-
[igxSuffix] + .igx-input-group__toggle-button {
50-
// Add border between the toggle button and the rest of the suffixes
51-
border-inline-start: $border-size solid $border-color;
52-
}
53-
54-
igx-input-group:not(.igx-input-group--disabled) {
55-
.igx-input-group__clear-icon + igx-suffix,
56-
.igx-input-group__clear-icon + [igxSuffix] {
57-
// Add border between the clear button and the rest of the suffixes
58-
border-inline-start: $border-size solid $border-color;
59-
}
60-
}
6146
}
6247
}
6348

@@ -186,6 +171,24 @@ $border-radius: var-get($_theme, 'border-border-radius');
186171
}
187172
}
188173

174+
@include m(prefixed, $not: (disabled)) {
175+
@include e(bundle-start) {
176+
igx-prefix:not(:first-child),
177+
[igxPrefix]:not(:first-child) {
178+
border-inline-start: rem(1px) solid var-get($_theme, 'border-color');
179+
}
180+
}
181+
}
182+
183+
@include m(suffixed, $not: (disabled)) {
184+
@include e(bundle-end) {
185+
igx-suffix:not(:last-child),
186+
[igxSuffix]:not(:last-child) {
187+
border-inline-end: rem(1px) solid var-get($_theme, 'border-color');
188+
}
189+
}
190+
}
191+
189192
@include m(suffixed) {
190193
@include e(bundle-end) {
191194
@extend %border-styles;
@@ -344,16 +347,20 @@ $border-radius: var-get($_theme, 'border-border-radius');
344347

345348
@include e(bundle-start) {
346349
border-color: var-get($_theme, 'focused-border-color');
350+
351+
igx-prefix:not(:first-child),
352+
[igxPrefix]:not(:first-child) {
353+
border-inline-start: rem(1px) solid var-get($_theme, 'focused-border-color');
354+
}
347355
}
348356

349357
@include e(bundle-end) {
350358
border-color: var-get($_theme, 'focused-border-color');
351-
}
352359

353-
.igx-input-group__clear-icon + igx-suffix,
354-
.igx-input-group__clear-icon + [igxSuffix] {
355-
// Add border between the clear button and the rest of the suffixes
356-
border-color: var-get($_theme, 'focused-border-color');
360+
igx-suffix:not(:last-child),
361+
[igxSuffix]:not(:last-child) {
362+
border-inline-end: rem(1px) solid var-get($_theme, 'focused-border-color');
363+
}
357364
}
358365
}
359366

@@ -364,16 +371,20 @@ $border-radius: var-get($_theme, 'border-border-radius');
364371

365372
@include e(bundle-start) {
366373
border-color: var-get($_theme, 'success-secondary-color');
374+
375+
igx-prefix:not(:first-child),
376+
[igxPrefix]:not(:first-child) {
377+
border-inline-start: rem(1px) solid var-get($_theme, 'success-secondary-color');
378+
}
367379
}
368380

369381
@include e(bundle-end) {
370382
border-color: var-get($_theme, 'success-secondary-color');
371-
}
372383

373-
.igx-input-group__clear-icon + igx-suffix,
374-
.igx-input-group__clear-icon + [igxSuffix] {
375-
// Add border between the clear button and the rest of the suffixes
376-
border-color: var-get($_theme, 'success-secondary-color');
384+
igx-suffix:not(:last-child),
385+
[igxSuffix]:not(:last-child) {
386+
border-inline-end: rem(1px) solid var-get($_theme, 'success-secondary-color');
387+
}
377388
}
378389
}
379390

@@ -384,10 +395,20 @@ $border-radius: var-get($_theme, 'border-border-radius');
384395

385396
@include e(bundle-start) {
386397
border-color: var-get($_theme, 'error-secondary-color');
398+
399+
igx-prefix:not(:first-child),
400+
[igxPrefix]:not(:first-child) {
401+
border-inline-start: rem(1px) solid var-get($_theme, 'error-secondary-color');
402+
}
387403
}
388404

389405
@include e(bundle-end) {
390406
border-color: var-get($_theme, 'error-secondary-color');
407+
408+
igx-suffix:not(:last-child),
409+
[igxSuffix]:not(:last-child) {
410+
border-inline-end: rem(1px) solid var-get($_theme, 'error-secondary-color');
411+
}
391412
}
392413
}
393414

@@ -398,16 +419,20 @@ $border-radius: var-get($_theme, 'border-border-radius');
398419

399420
@include e(bundle-start) {
400421
border-color: var-get($_theme, 'warning-secondary-color');
422+
423+
igx-prefix:not(:first-child),
424+
[igxPrefix]:not(:first-child) {
425+
border-inline-start: rem(1px) solid var-get($_theme, 'warning-secondary-color');
426+
}
401427
}
402428

403429
@include e(bundle-end) {
404430
border-color: var-get($_theme, 'warning-secondary-color');
405-
}
406431

407-
.igx-input-group__clear-icon + igx-suffix,
408-
.igx-input-group__clear-icon + [igxSuffix] {
409-
// Add border between the clear button and the rest of the suffixes
410-
border-color: var-get($_theme, 'warning-secondary-color');
432+
igx-suffix:not(:last-child),
433+
[igxSuffix]:not(:last-child) {
434+
border-inline-end: rem(1px) solid var-get($_theme, 'warning-secondary-color');
435+
}
411436
}
412437
}
413438

@@ -441,10 +466,20 @@ $border-radius: var-get($_theme, 'border-border-radius');
441466

442467
@include e(bundle-start) {
443468
@extend %disabled-styles;
469+
470+
igx-prefix:not(:first-child),
471+
[igxPrefix]:not(:first-child) {
472+
border-inline-start: rem(1px) solid var-get($_theme, 'disabled-border-color');
473+
}
444474
}
445475

446476
@include e(bundle-end) {
447477
@extend %disabled-styles;
478+
479+
igx-suffix:not(:last-child),
480+
[igxSuffix]:not(:last-child) {
481+
border-inline-end: rem(1px) solid var-get($_theme, 'disabled-border-color');
482+
}
448483
}
449484

450485
@include e(upload) {

0 commit comments

Comments
 (0)