Skip to content

Commit 9be65f7

Browse files
authored
Merge branch 'master' into didimmova/refactor-dev-demos
2 parents 193609d + 639b659 commit 9be65f7

File tree

2 files changed

+17
-6
lines changed

2 files changed

+17
-6
lines changed

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1171,8 +1171,10 @@
11711171
color: --var($theme, 'input-prefix-color');
11721172
background: --var($theme, 'input-prefix-background');
11731173
padding: rem(8px, map-get($base-scale-size, 'comfortable'));
1174+
width: auto;
11741175
height: auto;
11751176
line-height: normal;
1177+
font-weight: 400;
11761178

11771179
igx-icon {
11781180
width: rem(18px);
@@ -1203,6 +1205,7 @@
12031205
color: --var($theme, 'input-suffix-color');
12041206
padding: rem(8px, map-get($base-scale-size, 'comfortable'));
12051207
background: --var($theme, 'input-suffix-background');
1208+
width: auto;
12061209
height: auto;
12071210
line-height: normal;
12081211

@@ -1218,6 +1221,7 @@
12181221
}
12191222

12201223
%form-group-suffix-fluent-search {
1224+
width: auto;
12211225
height: auto;
12221226
padding: rem(8px, map-get($base-scale-size, 'comfortable'));
12231227
line-height: normal;
@@ -1479,9 +1483,18 @@
14791483
border: 1px solid --var($theme, 'border-color');
14801484
padding: map-get($bootstrap-padding, 'comfortable');
14811485
z-index: -1;
1486+
width: auto;
14821487
height: auto;
1488+
font-size: map-get($bootstrap-font-size, 'comfortable');
14831489
line-height: 1.5;
14841490
white-space: nowrap;
1491+
1492+
igx-icon {
1493+
width: map-get($bootstrap-font-size, 'comfortable');
1494+
height: map-get($bootstrap-font-size, 'comfortable');
1495+
font-size: map-get($bootstrap-font-size, 'comfortable');
1496+
font-weight: 400;
1497+
}
14851498
}
14861499

14871500
%form-group-prefix--bootstrap {
@@ -1505,6 +1518,7 @@
15051518
%form-group-prefix--cosy-bootstrap,
15061519
%form-group-suffix--cosy-bootstrap {
15071520
padding: map-get($bootstrap-padding, 'cosy');
1521+
width: auto;
15081522
height: auto;
15091523

15101524
igx-icon {
@@ -1517,6 +1531,7 @@
15171531
%form-group-prefix--compact-bootstrap,
15181532
%form-group-suffix--compact-bootstrap {
15191533
padding: map-get($bootstrap-padding, 'compact');
1534+
width: auto;
15201535
height: auto;
15211536

15221537
igx-icon {

src/app/input-group/input-group.sample.html

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@
3232
[displayDensity]="density"
3333
[type]="inputSearchType"
3434
>
35-
<igx-prefix>
36-
<igx-icon>search</igx-icon>
37-
</igx-prefix>
35+
<igx-icon igxPrefix>search</igx-icon>
3836
<input
3937
name="inputTest"
4038
#input
@@ -69,9 +67,7 @@
6967
[(ngModel)]="inputValue"
7068
[disabled]="isDisabled"
7169
/>
72-
<igx-suffix>
73-
<igx-icon>data_usage</igx-icon>
74-
</igx-suffix>
70+
<igx-icon igxSuffix>data_usage</igx-icon>
7571
</igx-input-group>
7672
<br />
7773

0 commit comments

Comments
 (0)