|
147 | 147 | $search-hover-elevation: map.get($input-group-schema, 'search-hover-elevation'); |
148 | 148 | $search-disabled-elevation: map.get($input-group-schema, 'search-disabled-elevation'); |
149 | 149 |
|
150 | | - @if $variant == 'material' and $box-background != transparent { |
| 150 | + @if $variant == 'material' { |
151 | 151 | @if not($box-background-hover) and $box-background { |
152 | 152 | $box-background-hover: var(--box-background); |
153 | 153 | } |
|
169 | 169 | } |
170 | 170 |
|
171 | 171 | @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); |
173 | 173 | } |
174 | 174 |
|
175 | 175 | @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); |
177 | 177 | } |
178 | 178 |
|
179 | 179 | @if not($idle-text-color) and $box-background { |
|
192 | 192 | $focused-text-color: adaptive-contrast(var(--box-background-focus)); |
193 | 193 | } |
194 | 194 |
|
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 | | - |
203 | 195 | @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); |
209 | 197 | } |
210 | 198 |
|
211 | 199 | @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); |
213 | 201 | } |
214 | 202 |
|
215 | 203 | @if not($input-prefix-color--filled) and $box-background { |
|
221 | 209 | } |
222 | 210 |
|
223 | 211 | @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); |
225 | 213 | } |
226 | 214 |
|
227 | 215 | @if not($input-suffix-color--filled) and $box-background { |
|
295 | 283 | } |
296 | 284 | } |
297 | 285 |
|
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 | + } |
303 | 290 |
|
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 | + } |
307 | 294 |
|
| 295 | + @if $variant == 'indigo' { |
| 296 | + @if not($box-background-hover) and $search-background { |
| 297 | + $box-background-hover: var(--search-background); |
| 298 | + } |
| 299 | + } @else { |
308 | 300 | @if not($idle-secondary-color) and $placeholder-color { |
309 | 301 | $idle-secondary-color: var(--placeholder-color); |
310 | 302 | } |
| 303 | + } |
311 | 304 |
|
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 | + } |
315 | 308 |
|
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 | + } |
319 | 312 |
|
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 | + } |
323 | 316 |
|
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 | + } |
327 | 320 |
|
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 | + } |
331 | 324 |
|
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 | + } |
335 | 328 |
|
| 329 | + @if $variant != 'indigo' { |
336 | 330 | @if not($input-prefix-color--filled) and $search-background { |
337 | 331 | $input-prefix-color--filled: adaptive-contrast(var(--search-background)); |
338 | 332 | } |
|
341 | 335 | $input-prefix-color--focused: adaptive-contrast(var(--search-background)); |
342 | 336 | } |
343 | 337 |
|
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 | | - |
348 | 338 | @if not($input-suffix-color--filled) and $search-background { |
349 | 339 | $input-suffix-color--filled: adaptive-contrast(var(--search-background)); |
350 | 340 | } |
351 | 341 |
|
352 | 342 | @if not($input-suffix-color--focused) and $search-background { |
353 | 343 | $input-suffix-color--focused: adaptive-contrast(var(--search-background)); |
354 | 344 | } |
| 345 | + } |
355 | 346 |
|
| 347 | + @if $search-background != transparent { |
356 | 348 | @if not($search-disabled-background) and $search-background { |
357 | 349 | $search-disabled-background: hsla(from var(--search-background) h s l / 0.4); |
358 | 350 | } |
|
377 | 369 | @if not($search-disabled-shadow) { |
378 | 370 | $search-disabled-shadow: elevation($search-disabled-elevation); |
379 | 371 | } |
380 | | - |
381 | | - // //end material search input |
| 372 | + //end search input |
382 | 373 |
|
383 | 374 | @if not($input-prefix-color) and $input-suffix-color { |
384 | 375 | $input-prefix-color: var(--input-suffix-color); |
|
0 commit comments