Skip to content

Commit 4be085b

Browse files
committed
fix(input-group): use the file schema colors
1 parent 1f8db21 commit 4be085b

File tree

6 files changed

+77
-41
lines changed

6 files changed

+77
-41
lines changed

projects/igniteui-angular/src/lib/input-group/themes/_base.scss

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -332,13 +332,15 @@ $base-scale-size: (
332332
}
333333

334334
@include e(upload-button) {
335-
--igx-button-background: transparent;
336-
--igx-button-hover-background: transparent;
337-
--igx-button-focus-background: transparent;
338-
--igx-button-focus-visible-background: transparent;
339-
--igx-button-active-background: transparent;
340-
341-
//padding-inline: var(--_prefix-suffix-spacing);
335+
--background: #{var-get($theme, 'file-selector-button-background')};
336+
--foreground: #{var-get($theme, 'file-selector-button-foreground')};
337+
--focus-background: #{var-get($theme, 'file-selector-button-background--focused')};
338+
--focus-foreground: #{var-get($theme, 'file-selector-button-foreground--focused')};
339+
--focus-visible-background: #{var-get($theme, 'file-selector-button-background--focused')};
340+
--active-background: #{var-get($theme, 'file-selector-button-background')};
341+
--active-foreground: #{var-get($theme, 'file-selector-button-foreground')};
342+
--disabled-background: #{var-get($theme, 'file-selector-button-background--disabled')};
343+
--disabled-foreground: #{var-get($theme, 'file-selector-button-foreground--disabled')};
342344
}
343345

344346
@include m(textarea-group) {
@@ -473,10 +475,6 @@ $base-scale-size: (
473475
grid-column: 1 / -1;
474476
}
475477

476-
@include e(file-input) {
477-
color: var-get($theme, 'disabled-text-color');
478-
}
479-
480478
@include e(toggle-button) {
481479
color: var(--toggle-button-foreground-disabled);
482480
background: var(--toggle-button-background-disabled);
@@ -486,6 +484,11 @@ $base-scale-size: (
486484
display: none;
487485
}
488486

487+
@include e(file-input) {
488+
background: var-get($theme, 'file-names-background--disabled');
489+
color: var-get($theme, 'file-names-foreground--disabled');
490+
}
491+
489492
/* stylelint-disable max-nesting-depth */
490493
&:hover {
491494
@include e(input) {
@@ -498,5 +501,6 @@ $base-scale-size: (
498501
}
499502
/* stylelint-enable max-nesting-depth */
500503
}
504+
501505
}
502506
}
Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,18 @@
1+
@use 'sass:map';
12
@use 'igniteui-theming/sass/themes' as *;
23
@use 'igniteui-theming/sass/themes/schemas/components/dark/input-group' as *;
4+
@use 'igniteui-theming/sass/themes/schemas/components/dark/file-input' as *;
35

4-
$material: digest-schema($dark-material-input-group);
5-
$bootstrap: digest-schema($dark-bootstrap-input-group);
6-
$fluent: digest-schema($dark-fluent-input-group);
7-
$indigo: digest-schema($dark-indigo-input-group);
6+
$input-material: digest-schema($dark-material-input-group);
7+
$input-bootstrap: digest-schema($dark-bootstrap-input-group);
8+
$input-fluent: digest-schema($dark-fluent-input-group);
9+
$input-indigo: digest-schema($dark-indigo-input-group);
10+
$file-material: digest-schema($dark-material-file-input);
11+
$file-bootstrap: digest-schema($dark-bootstrap-file-input);
12+
$file-fluent: digest-schema($dark-fluent-file-input);
13+
$file-indigo: digest-schema($dark-indigo-file-input);
14+
15+
$material: map.merge($input-material, $file-material);
16+
$bootstrap: map.merge($input-bootstrap, $file-bootstrap);
17+
$fluent: map.merge($input-fluent, $file-fluent);
18+
$indigo: map.merge($input-indigo, $file-indigo);
Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,21 @@
1+
@use 'sass:map';
12
@use 'igniteui-theming/sass/themes' as *;
23
@use 'igniteui-theming/sass/themes/schemas/components/light/input-group' as *;
4+
@use 'igniteui-theming/sass/themes/schemas/components/light/file-input' as *;
35

4-
$base: digest-schema($light-input-group);
5-
$material: digest-schema($material-input-group);
6-
$bootstrap: digest-schema($bootstrap-input-group);
7-
$fluent: digest-schema($fluent-input-group);
8-
$indigo: digest-schema($indigo-input-group);
6+
$input-base: digest-schema($light-input-group);
7+
$input-material: digest-schema($material-input-group);
8+
$input-bootstrap: digest-schema($bootstrap-input-group);
9+
$input-fluent: digest-schema($fluent-input-group);
10+
$input-indigo: digest-schema($indigo-input-group);
11+
$file-base: digest-schema($light-file-input);
12+
$file-material: digest-schema($material-file-input);
13+
$file-bootstrap: digest-schema($bootstrap-file-input);
14+
$file-fluent: digest-schema($fluent-file-input);
15+
$file-indigo: digest-schema($indigo-file-input);
16+
17+
$base: map.merge($input-base, $file-base);
18+
$material: map.merge($input-material, $file-material);
19+
$bootstrap: map.merge($input-bootstrap, $file-bootstrap);
20+
$fluent: map.merge($input-fluent, $file-fluent);
21+
$indigo: map.merge($input-indigo, $file-indigo);

projects/igniteui-angular/src/lib/input-group/themes/shared/bootstrap.scss

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -81,22 +81,10 @@ $border-radius: var-get($_theme, 'border-border-radius');
8181
@extend %border-styles;
8282

8383
border-width: $border-size;
84-
background: var-get($_theme, 'input-prefix-background');
8584
grid-row: 2;
8685
}
8786

8887
@include e(upload-button) {
89-
--igx-button-background: #{var-get($_theme, 'input-prefix-background')};
90-
--igx-button-hover-background: #{var-get($_theme, 'input-prefix-background')};
91-
--igx-button-active-background: #{var-get($_theme, 'input-prefix-background')};
92-
--igx-button-focus-visible-background: #{var-get($_theme, 'input-prefix-background')};
93-
--igx-button-foreground: #{var-get($_theme, 'input-prefix-color')};
94-
--igx-button-hover-foreground: #{var-get($_theme, 'input-prefix-color')};
95-
--igx-button-active-foreground: #{var-get($_theme, 'input-prefix-color')};
96-
--igx-button-focus-visible-foreground: #{var-get($_theme, 'input-prefix-color')};
97-
--igx-button-disabled-foreground: #{var-get($_theme, 'disabled-text-color')};
98-
--igx-button-disabled-background: #{var-get($_theme, 'border-disabled-background')};
99-
10088
@include type-style(body-1);
10189

10290
min-height: revert;
@@ -460,7 +448,7 @@ $border-radius: var-get($_theme, 'border-border-radius');
460448
}
461449

462450
@include e(upload) {
463-
@extend %disabled-styles;
451+
border-color: var-get($_theme, 'disabled-border-color');
464452
}
465453

466454
@include e(file-input) {

projects/igniteui-angular/src/lib/input-group/themes/shared/fluent.scss

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,6 @@ $_theme: $fluent;
1818
}
1919
}
2020

21-
@include e(upload-button) {
22-
--igx-button-background: transparent;
23-
--igx-button-hover-background: transparent;
24-
--igx-button-focus-background: transparent;
25-
--igx-button-focus-visible-background: transparent;
26-
--igx-button-active-background: transparent;
27-
}
28-
2921
@include e(hint) {
3022
min-height: rem(18px);
3123
}

projects/igniteui-angular/src/lib/input-group/themes/shared/material.scss

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -450,6 +450,34 @@ $input-bottom-spacing: rem(6px);
450450
}
451451
}
452452

453+
@include m(file) {
454+
@include e(file-input) {
455+
background: var-get($_theme, 'file-names-background');
456+
color: var-get($_theme, 'file-names-foreground');
457+
}
458+
}
459+
460+
@include mx(file, filled) {
461+
@include e(file-input) {
462+
background: var-get($_theme, 'file-names-background--filled');
463+
color: var-get($_theme, 'file-names-foreground--filled');
464+
}
465+
}
466+
467+
@include mx(file, focused) {
468+
@include e(file-input) {
469+
background: var-get($_theme, 'file-names-background--focused');
470+
color: var-get($_theme, 'file-names-foreground--focused');
471+
}
472+
}
473+
474+
@include mx(file, disabled) {
475+
@include e(file-input) {
476+
background: var-get($_theme, 'file-names-background--disabled');
477+
color: var-get($_theme, 'file-names-foreground--disabled');
478+
}
479+
}
480+
453481
@include mx(border, textarea-group) {
454482
@include e(label) {
455483
top: var(--_input-top-spacing);

0 commit comments

Comments
 (0)