diff --git a/package.json b/package.json index 663d547a..ea039592 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "homepage", - "version": "1.57.2", + "version": "1.57.3", "private": true, "type": "module", "scripts": { diff --git a/src/lib/components/recipes/IngredientsPage.svelte b/src/lib/components/recipes/IngredientsPage.svelte index 38ec7bdb..f4094874 100644 --- a/src/lib/components/recipes/IngredientsPage.svelte +++ b/src/lib/components/recipes/IngredientsPage.svelte @@ -239,6 +239,8 @@ const multiplierOptions = [ { value: 3, label: '3x' } ]; +const isCustomMultiplier = $derived(!multiplierOptions.some(o => o.value === multiplier)); + // Calculate yeast IDs for each yeast ingredient const yeastIds = $derived.by(() => { /** @type {Record} */ @@ -449,7 +451,7 @@ const nutritionFlatIngredients = $derived.by(() => { flex-basis: 0; flex-grow: 1; padding-block: 1rem; - padding-inline: 2rem; + padding-inline: 1.25rem; } .ingredients_grid{ display: grid; @@ -462,18 +464,21 @@ const nutritionFlatIngredients = $derived.by(() => { } .multipliers{ display: flex; - gap: 0.5rem; + gap: 0.3rem; justify-content: center; flex-wrap: wrap; } /* Size overrides for multiplier buttons */ .multipliers button{ - min-width: 2em; + min-width: 1.8em; font-size: 1.1rem; border-radius: var(--radius-sm); + padding-inline: 0.35em; } -/* Hover scale override - larger than default */ -.multipliers :is(button, form):is(:hover, :focus-within){ +/* Hover/focus on a whole pill (number button or custom-multiplier wrapper) + flips its background to primary; :focus-within covers focus on the + nested / {#each multiplierOptions as opt} {/each} - + + + {#if hasDefaultForm}