Skip to content

Commit 7b7f4a7

Browse files
committed
improve things
1 parent 583677a commit 7b7f4a7

File tree

2 files changed

+81
-4
lines changed

2 files changed

+81
-4
lines changed

src/components/settingsPage.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,12 @@ function listItems($list, items, callback, options = {}) {
327327
item.checkbox === undefined &&
328328
typeof item.value !== "boolean"
329329
) {
330+
$item.classList.add("has-tail-value");
331+
332+
if (item.select) {
333+
$item.classList.add("has-tail-select");
334+
}
335+
330336
$trailingValueText = (
331337
<small
332338
className={`setting-trailing-value ${item.select ? "is-select" : ""}`}

src/components/settingsPage.scss

Lines changed: 75 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ wc-page.detail-settings-page {
269269
flex-direction: column;
270270
min-width: 0;
271271
overflow: visible;
272-
gap: 0.14rem;
272+
gap: 0.18rem;
273273
padding-right: 0.35rem;
274274

275275
> .text {
@@ -311,8 +311,21 @@ wc-page.detail-settings-page {
311311

312312
.detail-settings-list > .list-item.has-subtitle > .container,
313313
.settings-section-card > .list-item.has-subtitle > .container {
314-
padding-top: 0.12rem;
315-
padding-right: 0.55rem;
314+
gap: 0.24rem;
315+
padding-top: 0.14rem;
316+
padding-right: 0.6rem;
317+
}
318+
319+
.detail-settings-list > .list-item.has-subtitle.has-tail-value > .container,
320+
.settings-section-card > .list-item.has-subtitle.has-tail-value > .container {
321+
padding-right: 0.95rem;
322+
}
323+
324+
.detail-settings-list > .list-item.has-subtitle.has-tail-value > .setting-tail,
325+
.settings-section-card > .list-item.has-subtitle.has-tail-value > .setting-tail {
326+
align-self: flex-start;
327+
margin-top: 0.16rem;
328+
margin-left: 1.3rem;
316329
}
317330

318331
.detail-settings-list > .list-item.compact > .container,
@@ -342,7 +355,23 @@ wc-page.detail-settings-page {
342355
box-sizing: border-box;
343356

344357
&.is-select {
345-
gap: 0.15rem;
358+
min-width: clamp(6.75rem, 30vw, 8.5rem);
359+
max-width: min(45vw, 11.5rem);
360+
min-height: 2.35rem;
361+
padding: 0 0.8rem 0 0.95rem;
362+
gap: 0.55rem;
363+
justify-content: space-between;
364+
border: 1px solid var(--border-color);
365+
border: 1px solid color-mix(in srgb, var(--border-color), transparent 12%);
366+
border-radius: 0.56rem;
367+
background: color-mix(
368+
in srgb,
369+
var(--secondary-color),
370+
var(--popup-background-color) 42%
371+
);
372+
box-shadow:
373+
inset 0 0 0 1px color-mix(in srgb, var(--border-color), transparent 44%),
374+
0 1px 2px rgba(0, 0, 0, 0.12);
346375
}
347376
}
348377

@@ -352,6 +381,17 @@ wc-page.detail-settings-page {
352381
color: inherit;
353382
text-transform: none;
354383
white-space: nowrap;
384+
385+
&.is-select {
386+
flex: 1;
387+
min-width: 0;
388+
overflow: hidden;
389+
text-overflow: ellipsis;
390+
font-size: 0.94rem;
391+
font-weight: 500;
392+
letter-spacing: -0.01em;
393+
color: color-mix(in srgb, var(--popup-text-color), transparent 14%);
394+
}
355395
}
356396

357397
.setting-value-icon,
@@ -368,6 +408,14 @@ wc-page.detail-settings-page {
368408
min-width: 1rem;
369409
height: 1rem;
370410
font-size: 1rem;
411+
412+
.setting-value-display.is-select & {
413+
width: 0.95rem;
414+
min-width: 0.95rem;
415+
height: 0.95rem;
416+
font-size: 1rem;
417+
color: color-mix(in srgb, var(--secondary-text-color), transparent 22%);
418+
}
371419
}
372420

373421
.settings-chevron {
@@ -512,6 +560,29 @@ wc-page.detail-settings-page {
512560
overflow: hidden;
513561
text-overflow: ellipsis;
514562
}
563+
564+
.setting-value-display.is-select {
565+
min-width: 6.25rem;
566+
max-width: 9rem;
567+
padding-left: 0.85rem;
568+
padding-right: 0.7rem;
569+
}
570+
}
571+
572+
.detail-settings-list > .list-item.has-tail-select:focus .setting-value-display.is-select,
573+
.detail-settings-list > .list-item.has-tail-select:active .setting-value-display.is-select,
574+
.settings-section-card
575+
> .list-item.has-tail-select:focus
576+
.setting-value-display.is-select,
577+
.settings-section-card
578+
> .list-item.has-tail-select:active
579+
.setting-value-display.is-select {
580+
border-color: color-mix(in srgb, var(--active-color), transparent 48%);
581+
background: color-mix(
582+
in srgb,
583+
var(--popup-background-color),
584+
var(--active-color) 9%
585+
);
515586
}
516587

517588
.icon {

0 commit comments

Comments
 (0)