Skip to content

Commit 577f4f8

Browse files
authored
Merge pull request #8081 from IgniteUI/didimmova/fix-textarea-8078-master
fix(input-group): fix textarea width to not overlap the suffix
2 parents da150d8 + 123f25d commit 577f4f8

File tree

2 files changed

+9
-54
lines changed

2 files changed

+9
-54
lines changed

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

+3-39
Original file line numberDiff line numberDiff line change
@@ -258,10 +258,6 @@
258258
@extend %form-group-label--box !optional;
259259
}
260260

261-
@include e(textarea) {
262-
@extend %form-group-textarea--box !optional;
263-
}
264-
265261
@include e(hint) {
266262
@extend %form-group-helper--box !optional;
267263
}
@@ -277,10 +273,6 @@
277273
@include e(bundle-main) {
278274
@extend %form-group-bundle-main--box-cosy !optional;
279275
}
280-
281-
@include e(textarea) {
282-
@extend %form-group-textarea--box-cosy !optional;
283-
}
284276
}
285277

286278
@include mx(box, compact) {
@@ -293,10 +285,6 @@
293285
@include e(bundle-main) {
294286
@extend %form-group-bundle-main--box-compact !optional;
295287
}
296-
297-
@include e(textarea) {
298-
@extend %form-group-textarea--box-compact !optional;
299-
}
300288
}
301289

302290
@include mx(disabled, box) {
@@ -333,10 +321,6 @@
333321
@extend %form-group-label--border !optional;
334322
}
335323

336-
@include e(textarea) {
337-
@extend %form-group-textarea--box !optional;
338-
}
339-
340324
@include e(hint) {
341325
@extend %form-group-helper--box !optional;
342326
}
@@ -373,10 +357,6 @@
373357
@include e(bundle-main) {
374358
@extend %form-group-bundle-main--box-cosy !optional;
375359
}
376-
377-
@include e(textarea) {
378-
@extend %form-group-textarea--box-cosy !optional;
379-
}
380360
}
381361

382362
@include mx(border, cosy, filled) {
@@ -413,10 +393,6 @@
413393
@include e(bundle-main) {
414394
@extend %form-group-bundle-main--box-compact !optional;
415395
}
416-
417-
@include e(textarea) {
418-
@extend %form-group-textarea--box-compact !optional;
419-
}
420396
}
421397

422398
@include mx(border, compact, filled) {
@@ -620,7 +596,7 @@
620596
}
621597

622598
@include e(textarea) {
623-
@extend %form-group-textarea--box !optional;
599+
@extend %form-group-textarea--indigo !optional;
624600
}
625601

626602
@include e(hint) {
@@ -640,7 +616,7 @@
640616
}
641617

642618
@include e(textarea) {
643-
@extend %form-group-textarea--box-cosy !optional;
619+
@extend %form-group-textarea--indigo-cosy !optional;
644620
}
645621
}
646622

@@ -656,7 +632,7 @@
656632
}
657633

658634
@include e(textarea) {
659-
@extend %form-group-textarea--box-compact !optional;
635+
@extend %form-group-textarea--indigo-compact !optional;
660636
}
661637
}
662638

@@ -866,10 +842,6 @@
866842
@extend %form-group-label--box !optional;
867843
}
868844

869-
@include e(textarea) {
870-
@extend %form-group-textarea--box !optional;
871-
}
872-
873845
@include e(hint) {
874846
@extend %form-group-helper--box !optional;
875847
}
@@ -885,10 +857,6 @@
885857
@include e(bundle-main) {
886858
@extend %form-group-bundle-main--box-cosy !optional;
887859
}
888-
889-
@include e(textarea) {
890-
@extend %form-group-textarea--box-cosy !optional;
891-
}
892860
}
893861

894862
@include mx(search, compact) {
@@ -901,10 +869,6 @@
901869
@include e(bundle-main) {
902870
@extend %form-group-bundle-main--box-compact !optional;
903871
}
904-
905-
@include e(textarea) {
906-
@extend %form-group-textarea--box-compact !optional;
907-
}
908872
}
909873

910874
@include mx(focused, search) {

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

+6-15
Original file line numberDiff line numberDiff line change
@@ -1066,25 +1066,16 @@
10661066
margin-#{$right}: -#{rem(16px, map-get($base-scale-size, 'compact'))};
10671067
}
10681068

1069-
%form-group-textarea--box {
1070-
width: calc(100% + #{rem(16px, map-get($base-scale-size, 'comfortable')) * 2}); /* add the padding to the width */
1071-
margin: 0 -#{rem(16px, map-get($base-scale-size, 'comfortable'))};
1072-
padding-#{$left}: rem(16px, map-get($base-scale-size, 'comfortable'));
1073-
padding-#{$left}: rem(16px, map-get($base-scale-size, 'comfortable'));
1069+
%form-group-textarea--indigo {
1070+
margin-top: -#{rem(18px, map-get($base-scale-size, 'comfortable'))} !important;
10741071
}
10751072

1076-
%form-group-textarea--box-cosy {
1077-
width: calc(100% + #{rem(16px, map-get($base-scale-size, 'cosy')) * 2}); /* add the padding to the width */
1078-
margin: 0 -#{rem(16px, map-get($base-scale-size, 'cosy'))};
1079-
padding-#{$left}: rem(16px, map-get($base-scale-size, 'cosy'));
1080-
padding-#{$left}: rem(16px, map-get($base-scale-size, 'cosy'));
1073+
%form-group-textarea--indigo-cosy {
1074+
margin-top: -#{rem(18px, map-get($base-scale-size, 'cosy'))} !important;
10811075
}
10821076

1083-
%form-group-textarea--box-compact {
1084-
width: calc(100% + #{rem(16px, map-get($base-scale-size, 'compact')) * 2}); /* add the padding to the width */
1085-
margin: 0 -#{rem(16px, map-get($base-scale-size, 'compact'))};
1086-
padding-#{$left}: rem(16px, map-get($base-scale-size, 'compact'));
1087-
padding-#{$left}: rem(16px, map-get($base-scale-size, 'compact'));
1077+
%form-group-textarea--indigo-compact {
1078+
margin-top: -#{rem(18px, map-get($base-scale-size, 'compact'))} !important;
10881079
}
10891080

10901081
%form-group-prefix,

0 commit comments

Comments
 (0)