From 17d657d7c6a9018407045dc3253e9d4bfc45c439 Mon Sep 17 00:00:00 2001 From: James Tsay Date: Wed, 25 Sep 2024 13:25:33 -0700 Subject: [PATCH 1/4] Style updates --- acrobat/blocks/prompt-card/prompt-card.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/acrobat/blocks/prompt-card/prompt-card.css b/acrobat/blocks/prompt-card/prompt-card.css index 95406622..94506c3c 100644 --- a/acrobat/blocks/prompt-card/prompt-card.css +++ b/acrobat/blocks/prompt-card/prompt-card.css @@ -69,14 +69,14 @@ flex: 1 0 0; flex-direction: column; justify-content: space-between; - padding: 20px 20px 24px; + padding: 16px 16px 24px; transition-delay: 3s; transition-property: border; max-width: 276px; } .prompt-blade:hover { - box-shadow: 3px 6px 6px 0 rgba(0, 0, 0, .16) + box-shadow: 0 3px 6px rgba(0, 0, 0, 16%) } .prompt-blade:active { @@ -153,7 +153,7 @@ font-style: normal; font-weight: 400; line-height: 150%; - padding: 2px 8px + padding: 2px 16px } .prompt-copy-btn:after { From e41b220b6d35d0b72751289200761f71646e4881 Mon Sep 17 00:00:00 2001 From: James Tsay Date: Fri, 27 Sep 2024 14:25:44 -0700 Subject: [PATCH 2/4] Bug fix --- acrobat/blocks/prompt-card/prompt-card.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/acrobat/blocks/prompt-card/prompt-card.js b/acrobat/blocks/prompt-card/prompt-card.js index 4b5b45a1..0154b2be 100644 --- a/acrobat/blocks/prompt-card/prompt-card.js +++ b/acrobat/blocks/prompt-card/prompt-card.js @@ -79,7 +79,7 @@ async function createBlocks(element, blockArray, templateCfg) { } element.remove(); - if (templateCfg.rows && parentNode.classList.contains('section')) { + if (templateCfg?.rows && parentNode.classList.contains('section')) { const resizeObserver = new ResizeObserver(() => { const computedStyle = window.getComputedStyle(parentNode); if (/^(\d+(\.\d+)?(px|fr|em|rem|%))( (\d+(\.\d+)?(px|fr|em|rem|%)))*$/.test(computedStyle.gridTemplateColumns)) { From 50bfee8ede4deecd314f914ccec5e12773ccb703 Mon Sep 17 00:00:00 2001 From: James Tsay Date: Fri, 27 Sep 2024 14:40:20 -0700 Subject: [PATCH 3/4] Fix test --- test/scripts/scripts-preloads.test.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/scripts/scripts-preloads.test.js b/test/scripts/scripts-preloads.test.js index 0d00f757..177a4a6f 100644 --- a/test/scripts/scripts-preloads.test.js +++ b/test/scripts/scripts-preloads.test.js @@ -1,10 +1,12 @@ import { expect } from '@esm-bundle/chai'; +import { waitForElement } from '../helpers/waitfor.js'; describe('Test scripts.js configurable preloads', () => { it('has preload metadata', async () => { document.head.innerHTML = ''; document.body.innerHTML = '
'; await import('../../acrobat/scripts/scripts.js'); + await waitForElement('link[rel="stylesheet"][href="/acrobat/styles/styles.css"]'); const js = document.querySelector('link[rel="preload"][href="https://main--milo--adobecom.hlx.page/libs/blocks/marquee/marquee.js"]'); const css = document.querySelector('link[rel="stylesheet"][href="https://main--milo--adobecom.hlx.page/libs/blocks/marquee/marquee.css"]'); const other = document.querySelector('link[rel="preload"][href="https://www.example.com/abc.js"]'); From 73baf4b4be26ffad541cb2e786a1b76a33426549 Mon Sep 17 00:00:00 2001 From: James Tsay Date: Fri, 27 Sep 2024 14:55:46 -0700 Subject: [PATCH 4/4] Fix a test --- test/scripts/scripts-preloads.test.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/test/scripts/scripts-preloads.test.js b/test/scripts/scripts-preloads.test.js index 177a4a6f..4aa79465 100644 --- a/test/scripts/scripts-preloads.test.js +++ b/test/scripts/scripts-preloads.test.js @@ -6,12 +6,11 @@ describe('Test scripts.js configurable preloads', () => { document.head.innerHTML = ''; document.body.innerHTML = '
'; await import('../../acrobat/scripts/scripts.js'); - await waitForElement('link[rel="stylesheet"][href="/acrobat/styles/styles.css"]'); - const js = document.querySelector('link[rel="preload"][href="https://main--milo--adobecom.hlx.page/libs/blocks/marquee/marquee.js"]'); - const css = document.querySelector('link[rel="stylesheet"][href="https://main--milo--adobecom.hlx.page/libs/blocks/marquee/marquee.css"]'); + const js = document.querySelector('link[rel="preload"][href="https://main--milo--adobecom.hlx.live/libs/blocks/marquee/marquee.js"]'); + const css = document.querySelector('link[rel="stylesheet"][href="https://main--milo--adobecom.hlx.live/libs/blocks/marquee/marquee.css"]'); const other = document.querySelector('link[rel="preload"][href="https://www.example.com/abc.js"]'); const acrobatcss = document.querySelector('link[rel="stylesheet"][href="/acrobat/styles/styles.css"]'); - const milocss = document.querySelector('link[rel="stylesheet"][href="https://main--milo--adobecom.hlx.page/libs/styles/styles.css"]'); + const milocss = document.querySelector('link[rel="stylesheet"][href="https://main--milo--adobecom.hlx.live/libs/styles/styles.css"]'); expect(js).not.to.be.null; expect(css).not.to.be.null; expect(other).not.to.be.null;