Skip to content

Commit 66326b9

Browse files
committed
feat(input-group): update inputs computed styles
1 parent c05d3d3 commit 66326b9

File tree

1 file changed

+41
-50
lines changed

1 file changed

+41
-50
lines changed

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

Lines changed: 41 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@
147147
$search-hover-elevation: map.get($input-group-schema, 'search-hover-elevation');
148148
$search-disabled-elevation: map.get($input-group-schema, 'search-disabled-elevation');
149149

150-
@if $variant == 'material' and $box-background != transparent {
150+
@if $variant == 'material' {
151151
@if not($box-background-hover) and $box-background {
152152
$box-background-hover: var(--box-background);
153153
}
@@ -169,11 +169,11 @@
169169
}
170170

171171
@if not($placeholder-color) and $box-background {
172-
$placeholder-color: hsla(from adaptive-contrast(var(--box-background)) h s l / 0.6);
172+
$placeholder-color: hsla(from adaptive-contrast(var(--box-background)) h s l / 0.9);
173173
}
174174

175175
@if not($hover-placeholder-color) and $box-background-hover {
176-
$hover-placeholder-color: hsla(from adaptive-contrast(var(--box-background-hover)) h s l / 0.6);
176+
$hover-placeholder-color: hsla(from adaptive-contrast(var(--box-background-hover)) h s l / 0.9);
177177
}
178178

179179
@if not($idle-text-color) and $box-background {
@@ -192,24 +192,12 @@
192192
$focused-text-color: adaptive-contrast(var(--box-background-focus));
193193
}
194194

195-
@if not($idle-bottom-line-color) and $box-background {
196-
$idle-bottom-line-color: hsla(from adaptive-contrast(var(--box-background)) h s l / 0.6);
197-
}
198-
199-
@if not($hover-bottom-line-color) and $box-background {
200-
$hover-bottom-line-color: adaptive-contrast(var(--box-background));
201-
}
202-
203195
@if not($idle-secondary-color) and $box-background {
204-
$idle-secondary-color: hsla(from adaptive-contrast(var(--box-background)) h s l / 0.6);
205-
}
206-
207-
@if not($focused-secondary-color) and $box-background-focus {
208-
$focused-secondary-color: adaptive-contrast(var(--box-background-focus));
196+
$idle-secondary-color: hsla(from adaptive-contrast(var(--box-background)) h s l / 0.9);
209197
}
210198

211199
@if not($input-prefix-color) and $box-background {
212-
$input-prefix-color: hsla(from adaptive-contrast(var(--box-background)) h s l / 0.6);
200+
$input-prefix-color: hsla(from adaptive-contrast(var(--box-background)) h s l / 0.9);
213201
}
214202

215203
@if not($input-prefix-color--filled) and $box-background {
@@ -221,7 +209,7 @@
221209
}
222210

223211
@if not($input-suffix-color) and $box-background {
224-
$input-suffix-color: hsla(from adaptive-contrast(var(--box-background)) h s l / 0.6);
212+
$input-suffix-color: hsla(from adaptive-contrast(var(--box-background)) h s l / 0.9);
225213
}
226214

227215
@if not($input-suffix-color--filled) and $box-background {
@@ -295,44 +283,50 @@
295283
}
296284
}
297285

298-
//material search input
299-
@if $search-background != transparent {
300-
@if not($placeholder-color) and $search-background {
301-
$placeholder-color: hsla(from adaptive-contrast(var(--search-background)) h s l / 0.6);
302-
}
286+
//search input
287+
@if not($placeholder-color) and $search-background {
288+
$placeholder-color: hsla(from adaptive-contrast(var(--search-background)) h s l / 0.9);
289+
}
303290

304-
@if not($hover-placeholder-color) and $placeholder-color {
305-
$hover-placeholder-color: var(--placeholder-color);
306-
}
291+
@if not($hover-placeholder-color) and $placeholder-color {
292+
$hover-placeholder-color: var(--placeholder-color);
293+
}
307294

295+
@if $variant == 'indigo' {
296+
@if not($box-background-hover) and $search-background {
297+
$box-background-hover: var(--search-background);
298+
}
299+
} @else {
308300
@if not($idle-secondary-color) and $placeholder-color {
309301
$idle-secondary-color: var(--placeholder-color);
310302
}
303+
}
311304

312-
@if not($idle-text-color) and $search-background {
313-
$idle-text-color: adaptive-contrast(var(--search-background));
314-
}
305+
@if not($idle-text-color) and $search-background {
306+
$idle-text-color: adaptive-contrast(var(--search-background));
307+
}
315308

316-
@if not($focused-secondary-color) and $search-background {
317-
$focused-secondary-color: adaptive-contrast(var(--search-background));
318-
}
309+
@if not($filled-text-color) and $search-background {
310+
$filled-text-color: adaptive-contrast(var(--search-background));
311+
}
319312

320-
@if not($filled-text-color) and $search-background {
321-
$filled-text-color: adaptive-contrast(var(--search-background));
322-
}
313+
@if not($filled-text-hover-color) and $search-background {
314+
$filled-text-hover-color: adaptive-contrast(var(--search-background));
315+
}
323316

324-
@if not($filled-text-hover-color) and $search-background {
325-
$filled-text-hover-color: adaptive-contrast(var(--search-background));
326-
}
317+
@if not($focused-text-color) and $search-background {
318+
$focused-text-color: adaptive-contrast(var(--search-background));
319+
}
327320

328-
@if not($focused-text-color) and $search-background {
329-
$focused-text-color: adaptive-contrast(var(--search-background));
330-
}
321+
@if not($input-prefix-color) and $search-background {
322+
$input-prefix-color: hsla(from adaptive-contrast(var(--search-background)) h s l / 0.9);
323+
}
331324

332-
@if not($input-prefix-color) and $search-background {
333-
$input-prefix-color: hsla(from adaptive-contrast(var(--search-background)) h s l / 0.6);
334-
}
325+
@if not($input-suffix-color) and $search-background {
326+
$input-suffix-color: hsla(from adaptive-contrast(var(--search-background)) h s l / 0.9);
327+
}
335328

329+
@if $variant != 'indigo' {
336330
@if not($input-prefix-color--filled) and $search-background {
337331
$input-prefix-color--filled: adaptive-contrast(var(--search-background));
338332
}
@@ -341,18 +335,16 @@
341335
$input-prefix-color--focused: adaptive-contrast(var(--search-background));
342336
}
343337

344-
@if not($input-suffix-color) and $search-background {
345-
$input-suffix-color: hsla(from adaptive-contrast(var(--search-background)) h s l / 0.6);
346-
}
347-
348338
@if not($input-suffix-color--filled) and $search-background {
349339
$input-suffix-color--filled: adaptive-contrast(var(--search-background));
350340
}
351341

352342
@if not($input-suffix-color--focused) and $search-background {
353343
$input-suffix-color--focused: adaptive-contrast(var(--search-background));
354344
}
345+
}
355346

347+
@if $search-background != transparent {
356348
@if not($search-disabled-background) and $search-background {
357349
$search-disabled-background: hsla(from var(--search-background) h s l / 0.4);
358350
}
@@ -377,8 +369,7 @@
377369
@if not($search-disabled-shadow) {
378370
$search-disabled-shadow: elevation($search-disabled-elevation);
379371
}
380-
381-
// //end material search input
372+
//end search input
382373

383374
@if not($input-prefix-color) and $input-suffix-color {
384375
$input-prefix-color: var(--input-suffix-color);

0 commit comments

Comments
 (0)