diff --git a/src/routes/wish/_counter.svelte b/src/routes/wish/_counter.svelte index 33458db6..07b1607f 100644 --- a/src/routes/wish/_counter.svelte +++ b/src/routes/wish/_counter.svelte @@ -292,9 +292,14 @@ rare = 0; saveData(); } + + $: hidden = id === 'beginners' && total === 0 && !manualInput; -
+

{name}

{#if manualInput} diff --git a/src/routes/wish/_monthlyGraph.svelte b/src/routes/wish/_monthlyGraph.svelte index 46a049c2..473a9312 100644 --- a/src/routes/wish/_monthlyGraph.svelte +++ b/src/routes/wish/_monthlyGraph.svelte @@ -83,6 +83,6 @@ $: data, createGraph(); -
+
diff --git a/src/routes/wish/_summary.svelte b/src/routes/wish/_summary.svelte index 3b4a6b75..8a5e1393 100644 --- a/src/routes/wish/_summary.svelte +++ b/src/routes/wish/_summary.svelte @@ -234,32 +234,51 @@ {#if !loading} -
- {#if avg[types[0].id]} - - {/if} - {#if avg[types[1].id]} - - {/if} -
-
- {#if avg[types[2].id]} - - {/if} - {#if avg[types[3].id]} - - {/if} -
- {$t('wish.wishesWorth')} primogem - {numberFormat.format(wishCount * 160)} +
+
+ {#if avg[types[0].id]} + + {/if} + {#if avg[types[2].id]} + + {/if} + {#if avg[types[1].id]} + + {/if} +
+ {#if avg[types[3].id]} + +
+ {/if} +
+
+ {$t('wish.wishesWorth')} primogem + {numberFormat.format(wishCount * 160)} +
+ + + {$t('wish.globalWishTally')} + +
+
- - - {$t('wish.globalWishTally')} -
{/if} + + diff --git a/src/routes/wish/_summaryItem.svelte b/src/routes/wish/_summaryItem.svelte index f33c0c3f..923ac5eb 100644 --- a/src/routes/wish/_summaryItem.svelte +++ b/src/routes/wish/_summaryItem.svelte @@ -6,6 +6,7 @@ export let avg; export let type; + export let order = 0; export let legendaryPity = 90; export let colorMultiplier = 120; @@ -22,7 +23,10 @@ $: textSize = avg.legendary.total > 20 ? 'text-sm' : 'text-base'; -
+
@@ -124,4 +128,14 @@ background: rgba(0, 0, 0, 0.35); @apply rounded-xl; } + + @screen md { + .summary-item { + margin: 0; + display: grid; + grid-template-rows: 1fr auto; + margin-bottom: 1rem; + break-inside: avoid; + } + }
{$t(`wish.types.${type.id}`)}