Skip to content

Commit e251fb8

Browse files
authored
Merge branch '10.1.x' into ddincheva/activeNodeBlur
2 parents 1953e3d + b8f99af commit e251fb8

File tree

2 files changed

+20
-8
lines changed

2 files changed

+20
-8
lines changed

projects/igniteui-angular/src/lib/core/styles/components/grid/_grid-theme.scss

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -689,13 +689,6 @@
689689
$drag-icon-size: rem(24px);
690690
$grouping-padding-right: rem(12px);
691691

692-
$grid-border-width: map-get((
693-
material: 0,
694-
fluent: 1px,
695-
bootstrap: 0,
696-
indigo-design: 0
697-
), $variant);
698-
699692
$grid-header-weight: map-get((
700693
material: 600,
701694
fluent: 800,
@@ -710,9 +703,13 @@
710703
grid-template-columns: 1fr;
711704
overflow: hidden;
712705
box-shadow: $grid-shadow;
706+
707+
@if $variant == 'fluent' {
708+
box-shadow: 0 0 0 1px --var($theme, 'grid-border-color');
709+
}
710+
713711
outline-style: none;
714712
z-index: 1;
715-
border: $grid-border-width solid --var($theme, 'grid-border-color');
716713

717714
%cbx-display {
718715
min-width: $cbx-size;

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 {

0 commit comments

Comments
 (0)