Skip to content

Commit df52d17

Browse files
authored
feat(grid): style inputs in the context of cell (#16451)
1 parent 477d7ce commit df52d17

File tree

3 files changed

+27
-8
lines changed

3 files changed

+27
-8
lines changed

projects/igniteui-angular/core/src/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/core/src/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' {
@@ -1196,6 +1202,21 @@
11961202
align-items: center;
11971203
outline-style: none;
11981204

1205+
@extend %cell-input-overrides;
1206+
1207+
> igx-input-group,
1208+
igx-combo,
1209+
igx-simple-combo,
1210+
igx-select,
1211+
igx-date-picker,
1212+
igx-time-picker {
1213+
height: auto;
1214+
}
1215+
1216+
igx-input-group {
1217+
background: transparent;
1218+
}
1219+
11991220
@if $variant != 'indigo' {
12001221
padding-inline: pad-inline(
12011222
map.get($grid-cell-padding-inline, 'compact'),
@@ -1411,8 +1432,6 @@
14111432
&%grid-cell-number {
14121433
justify-content: flex-start !important;
14131434
}
1414-
1415-
@extend %cell-input-overrides;
14161435
}
14171436

14181437
%grid-cell--pinned {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@
376376
%form-group-display--disabled {
377377
pointer-events: none;
378378
user-select: none;
379-
color: var-get($theme, 'disabled-text-color') !important;
379+
color: var-get($theme, 'disabled-text-color');
380380

381381
igx-prefix,
382382
[igxPrefix] {
@@ -1445,7 +1445,7 @@
14451445
%form-group-input--disabled {
14461446
cursor: default;
14471447

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

14501450
&::placeholder {
14511451
color: var-get($theme, 'disabled-placeholder-color');
@@ -1495,7 +1495,7 @@
14951495
}
14961496

14971497
%form-group-textarea--disabled {
1498-
color: var-get($theme, 'disabled-text-color') !important;
1498+
color: var-get($theme, 'disabled-text-color');
14991499
cursor: default;
15001500

15011501
&::placeholder {
@@ -2073,7 +2073,7 @@
20732073
}
20742074

20752075
%fluent-label-disabled {
2076-
color: var-get($theme, 'disabled-text-color') !important;
2076+
color: var-get($theme, 'disabled-text-color');
20772077
}
20782078

20792079
%fluent-label-filled {

0 commit comments

Comments
 (0)