From 8807d31274113a36f91623ebd70ecc0637fd3d80 Mon Sep 17 00:00:00 2001 From: Disco DeDisco Date: Wed, 11 Mar 2026 14:50:08 -0400 Subject: [PATCH] unified header_title template values across dashboard applet destination pages; styled &/ added applet titles across all applets --- .../dashboard/static/apps/scripts/wallet.js | 17 ++++++++++++----- src/functional_tests/my_notes_page.py | 2 +- src/static_src/scss/_applets.scss | 1 + src/static_src/scss/_dashboard.scss | 16 +++++++++++----- src/static_src/scss/_wallet-tokens.scss | 18 +++++++++++++++--- .../dashboard/_partials/_applet-my-notes.html | 2 +- .../dashboard/_partials/_applet-wallet.html | 4 ++-- src/templates/apps/dashboard/my_notes.html | 3 ++- src/templates/apps/dashboard/note.html | 4 ++-- .../_partials/_applet-wallet-balances.html | 1 + .../_partials/_applet-wallet-payment.html | 2 +- .../_partials/_applet-wallet-tokens.html | 3 +++ 12 files changed, 52 insertions(+), 21 deletions(-) diff --git a/src/apps/dashboard/static/apps/scripts/wallet.js b/src/apps/dashboard/static/apps/scripts/wallet.js index b3067bf..506a770 100644 --- a/src/apps/dashboard/static/apps/scripts/wallet.js +++ b/src/apps/dashboard/static/apps/scripts/wallet.js @@ -23,15 +23,22 @@ const initWallet = () => { const section = addBtn.closest('section'); const rowPx = 3 * parseFloat(getComputedStyle(document.documentElement).fontSize); const updateRows = () => { - const rows = Math.ceil(section.scrollHeight / rowPx) + 1; + const sectionTop = section.getBoundingClientRect().top; + let maxBottom = sectionTop; + for (const child of section.children) { + if (child.hidden) continue; + maxBottom = Math.max(maxBottom, child.getBoundingClientRect().bottom); + } + const padBot = parseFloat(getComputedStyle(section).paddingBottom); + const rows = Math.ceil((maxBottom - sectionTop + padBot) / rowPx) + 1; section.style.setProperty('--applet-rows', String(rows)); }; paymentEl.on('ready', () => { updateRows(); - const iframe = document.querySelector('#id_stripe_payment_element iframe'); - if (iframe) { - const obs = new MutationObserver(updateRows); - obs.observe(iframe, { attributes: true, attributeFilter: ['style'] }); + const stripeContainer = document.getElementById('id_stripe_payment_element'); + if (stripeContainer) { + const obs = new ResizeObserver(updateRows); + obs.observe(stripeContainer); section._stripeObs = obs; } }); diff --git a/src/functional_tests/my_notes_page.py b/src/functional_tests/my_notes_page.py index 8735e93..11588e2 100644 --- a/src/functional_tests/my_notes_page.py +++ b/src/functional_tests/my_notes_page.py @@ -16,7 +16,7 @@ class MyNotesPage: self.test.wait_for( lambda: self.test.assertIn( email, - self.test.browser.find_element(By.TAG_NAME, "h2").text.lower(), + self.test.browser.find_element(By.CSS_SELECTOR, ".navbar-identity").text.lower(), ) ) return self diff --git a/src/static_src/scss/_applets.scss b/src/static_src/scss/_applets.scss index 9e7b9c5..ee3acd5 100644 --- a/src/static_src/scss/_applets.scss +++ b/src/static_src/scss/_applets.scss @@ -105,6 +105,7 @@ inset -0.125rem -0.125rem 0 rgba(var(--ninUser), 0.125), inset 0.125rem 0.125rem 0 rgba(0, 0, 0, 0.8) ; + background-color: rgba(0, 0, 0, 0.125); border-radius: 0.75rem; padding: 1rem; overflow: hidden; diff --git a/src/static_src/scss/_dashboard.scss b/src/static_src/scss/_dashboard.scss index 1de8c35..b3fd418 100644 --- a/src/static_src/scss/_dashboard.scss +++ b/src/static_src/scss/_dashboard.scss @@ -30,16 +30,14 @@ body.page-dashboard { } #id_applets_container { - #id_applet_my_lists { + #id_applet_my_notes { padding: 1.25rem 1.5rem; display: flex; flex-direction: column; - .my-lists-main { - font-size: 1.6rem; - } + h2 { flex-shrink: 0; margin-bottom: 0.25rem; } - .my-lists-container { + .my-notes-container { flex: 1; min-height: 0; overflow-y: auto; @@ -58,6 +56,14 @@ body.page-dashboard { } } + + #id_applet_wallet { + display: flex; + flex-direction: column; + gap: 0.25rem; + + h2 { flex-shrink: 0; margin-bottom: 0; } + } #id_applet_palette { padding: 0; diff --git a/src/static_src/scss/_wallet-tokens.scss b/src/static_src/scss/_wallet-tokens.scss index d76eb3b..d039908 100644 --- a/src/static_src/scss/_wallet-tokens.scss +++ b/src/static_src/scss/_wallet-tokens.scss @@ -87,11 +87,23 @@ body.page-wallet { .wallet-tokens { display: flex; - flex-direction: row; - align-items: center; - justify-content: space-evenly; + flex-direction: column; overflow: visible; + h2 { + flex-shrink: 0; + margin-bottom: 0; + } + + .token-row { + flex: 1; + display: flex; + flex-direction: row; + align-items: center; + justify-content: space-evenly; + overflow: visible; + } + .token { font-size: 1.5rem; } diff --git a/src/templates/apps/dashboard/_partials/_applet-my-notes.html b/src/templates/apps/dashboard/_partials/_applet-my-notes.html index febb8a5..1c591bf 100644 --- a/src/templates/apps/dashboard/_partials/_applet-my-notes.html +++ b/src/templates/apps/dashboard/_partials/_applet-my-notes.html @@ -2,7 +2,7 @@ id="id_applet_my_notes" style="--applet-cols: {{ entry.applet.grid_cols }}; --applet-rows: {{ entry.applet.grid_rows }};" > - My notes: +

My notes