Skip to content

Commit 68e5700

Browse files
authored
feat(grid): style inputs in the context of cell (#16475)
1 parent 9af7c10 commit 68e5700

File tree

3 files changed

+27
-8
lines changed

3 files changed

+27
-8
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,8 +276,8 @@
276276

277277
.igx-input-group--disabled {
278278
%igx-combo__toggle-button {
279-
background: var-get($theme, 'toggle-button-background-disabled') !important;
280-
color: var-get($theme, 'toggle-button-foreground-disabled') !important;
279+
background: var-get($theme, 'toggle-button-background-disabled');
280+
color: var-get($theme, 'toggle-button-foreground-disabled');
281281
}
282282

283283
%igx-combo__clear-button {

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

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,12 @@
292292
box-shadow: none !important;
293293
border: none !important;
294294
}
295+
296+
.igx-input-group--disabled,
297+
.igx-input-group--disabled igx-prefix,
298+
.igx-input-group--disabled igx-suffix {
299+
color: var-get($theme, 'cell-disabled-color');
300+
}
295301
}
296302

297303
@if $variant != 'indigo' {
@@ -1192,6 +1198,21 @@
11921198
align-items: center;
11931199
outline-style: none;
11941200

1201+
@extend %cell-input-overrides;
1202+
1203+
> igx-input-group,
1204+
igx-combo,
1205+
igx-simple-combo,
1206+
igx-select,
1207+
igx-date-picker,
1208+
igx-time-picker {
1209+
height: auto;
1210+
}
1211+
1212+
igx-input-group {
1213+
background: transparent;
1214+
}
1215+
11951216
@if $variant != 'indigo' {
11961217
padding-inline: pad-inline(
11971218
map.get($grid-cell-padding-inline, 'compact'),
@@ -1407,8 +1428,6 @@
14071428
&%grid-cell-number {
14081429
justify-content: flex-start !important;
14091430
}
1410-
1411-
@extend %cell-input-overrides;
14121431
}
14131432

14141433
%grid-cell--pinned {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@
364364
%form-group-display--disabled {
365365
pointer-events: none;
366366
user-select: none;
367-
color: var-get($theme, 'disabled-text-color') !important;
367+
color: var-get($theme, 'disabled-text-color');
368368

369369
igx-prefix,
370370
[igxPrefix] {
@@ -1433,7 +1433,7 @@
14331433
%form-group-input--disabled {
14341434
cursor: default;
14351435

1436-
color: var-get($theme, 'disabled-text-color') !important;
1436+
color: var-get($theme, 'disabled-text-color');
14371437

14381438
&::placeholder {
14391439
color: var-get($theme, 'disabled-placeholder-color');
@@ -1483,7 +1483,7 @@
14831483
}
14841484

14851485
%form-group-textarea--disabled {
1486-
color: var-get($theme, 'disabled-text-color') !important;
1486+
color: var-get($theme, 'disabled-text-color');
14871487
cursor: default;
14881488

14891489
&::placeholder {
@@ -2061,7 +2061,7 @@
20612061
}
20622062

20632063
%fluent-label-disabled {
2064-
color: var-get($theme, 'disabled-text-color') !important;
2064+
color: var-get($theme, 'disabled-text-color');
20652065
}
20662066

20672067
%fluent-label-filled {

0 commit comments

Comments
 (0)