feat: desktop layout — macro split sidebar next to muscle heatmap

On desktop (≥1024px), protein/balance/adherence cards sit in a row above
the muscle heatmap, with the macro split card as a vertical sidebar on the
right spanning the full height. Includes ring/triangle legend for
actual vs target. Mobile layout unchanged.
This commit is contained in:
2026-04-08 16:25:53 +02:00
parent 61d80fe0bc
commit 74d5562fed
2 changed files with 80 additions and 15 deletions

View File

@@ -1,6 +1,6 @@
{ {
"name": "homepage", "name": "homepage",
"version": "1.13.1", "version": "1.13.2",
"private": true, "private": true,
"type": "module", "type": "module",
"scripts": { "scripts": {

View File

@@ -265,8 +265,8 @@
/> />
{/if} {/if}
{#if ns} <div class="muscle-nutrition-layout">
<div class="nutrition-grid"> {#if ns}
<div class="lifetime-card protein-card"> <div class="lifetime-card protein-card">
<div class="card-icon"><Beef size={24} /></div> <div class="card-icon"><Beef size={24} /></div>
{#if ns.avgProteinPerKg != null} {#if ns.avgProteinPerKg != null}
@@ -391,15 +391,25 @@
<span class="macro-label">{macro.label}</span> <span class="macro-label">{macro.label}</span>
</div> </div>
{/each} {/each}
<div class="macro-legend">
<span class="macro-legend-item">
<svg viewBox="0 0 12 12" width="12" height="12"><circle cx="6" cy="6" r="4" fill="none" stroke="var(--color-text-secondary)" stroke-width="2"/></svg>
{lang === 'en' ? 'Actual' : 'Ist'}
</span>
<span class="macro-legend-item">
<svg viewBox="0 0 12 12" width="12" height="12"><path d="M6,2 L10,10 L2,10 Z" fill="var(--color-text-secondary)"/></svg>
{lang === 'en' ? 'Target' : 'Ziel'}
</span>
</div>
</div> </div>
</div> </div>
{/if} {/if}
</div> {/if}
{/if}
<div class="section-block"> <div class="section-block muscle-heatmap-block">
<h2 class="section-title">{t('muscle_balance', lang)}</h2> <h2 class="section-title">{t('muscle_balance', lang)}</h2>
<MuscleHeatmap data={data.muscleHeatmap} /> <MuscleHeatmap data={data.muscleHeatmap} />
</div>
</div> </div>
</div> </div>
@@ -695,11 +705,38 @@
} }
/* Nutrition masonry grid */ /* Nutrition masonry grid */
.nutrition-grid { .muscle-nutrition-layout {
display: grid; display: grid;
grid-template-columns: repeat(3, 1fr); grid-template-columns: 1fr 1fr 1fr;
gap: 0.6rem; gap: 0.6rem;
} }
.muscle-nutrition-layout .muscle-heatmap-block {
grid-column: 1 / -1;
}
@media (min-width: 1024px) {
.muscle-nutrition-layout {
grid-template-columns: 1fr 1fr 1fr 1fr;
grid-template-rows: auto 1fr;
}
.muscle-nutrition-layout .macro-card {
grid-column: 4;
grid-row: 1 / 3;
flex-direction: column !important;
align-items: center !important;
}
.muscle-nutrition-layout .macro-card .macro-rings {
flex-direction: column;
align-items: center;
gap: 0.5rem;
}
.muscle-nutrition-layout .macro-card .macro-header {
text-align: center;
margin-bottom: 1.25rem;
}
.muscle-nutrition-layout .muscle-heatmap-block {
grid-column: 1 / 4;
}
}
.protein-card::before { background: var(--nord14); } .protein-card::before { background: var(--nord14); }
.balance-card::before { background: var(--color-text-secondary); } .balance-card::before { background: var(--color-text-secondary); }
.balance-card.surplus::before { background: var(--nord14); } .balance-card.surplus::before { background: var(--nord14); }
@@ -726,10 +763,10 @@
color: var(--nord13); color: var(--nord13);
background: color-mix(in srgb, var(--nord13) 15%, transparent); background: color-mix(in srgb, var(--nord13) 15%, transparent);
} }
.nutrition-grid .card-icon { .muscle-nutrition-layout .card-icon {
flex-shrink: 0; flex-shrink: 0;
} }
.nutrition-grid .card-hint { .muscle-nutrition-layout .card-hint {
display: block; display: block;
width: 100%; width: 100%;
text-align: center; text-align: center;
@@ -783,7 +820,7 @@
opacity: 0.5; opacity: 0.5;
} }
/* Macro split card — spans full row, horizontal layout */ /* Macro split card — spans full row on mobile, sidebar on desktop */
.macro-card { .macro-card {
grid-column: 1 / -1; grid-column: 1 / -1;
padding: 1rem 1.25rem; padding: 1rem 1.25rem;
@@ -791,6 +828,13 @@
align-items: center !important; align-items: center !important;
gap: 1.25rem !important; gap: 1.25rem !important;
} }
@media (min-width: 1024px) {
.macro-card {
grid-column: auto;
padding: 0.75rem;
gap: 0.75rem !important;
}
}
.macro-header { .macro-header {
font-size: 1.15rem; font-size: 1.15rem;
font-weight: 700; font-weight: 700;
@@ -855,9 +899,27 @@
font-size: 7px; font-size: 7px;
font-weight: 700; font-weight: 700;
} }
.macro-legend {
display: none;
}
@media (min-width: 1024px) {
.macro-legend {
display: flex;
gap: 1rem;
justify-content: center;
margin-top: 0.75rem;
font-size: 0.7rem;
color: var(--color-text-secondary);
}
.macro-legend-item {
display: flex;
align-items: center;
gap: 0.3rem;
}
}
@media (max-width: 600px) { @media (max-width: 600px) {
.nutrition-grid { .muscle-nutrition-layout {
grid-template-columns: repeat(3, 1fr); grid-template-columns: repeat(3, 1fr);
} }
.macro-card { .macro-card {
@@ -868,9 +930,12 @@
} }
} }
@media (max-width: 400px) { @media (max-width: 400px) {
.nutrition-grid { .muscle-nutrition-layout {
grid-template-columns: 1fr; grid-template-columns: 1fr;
} }
.muscle-nutrition-layout .muscle-heatmap-block {
grid-column: 1;
}
.macro-card { .macro-card {
grid-column: 1; grid-column: 1;
flex-direction: column !important; flex-direction: column !important;