fix: image with caption margins and puppeteer fix (#231)

Author: jawinn

.github/workflows/tests.yaml

@@ -25,7 +25,7 @@ jobs:
         run: |
           BRANCH_NAME="${GITHUB_HEAD_REF:-${GITHUB_REF##*/}}"
           echo "Branch Name: ${BRANCH_NAME}"
-          BASE_URL="https://${BRANCH_NAME}--adobe-design-website--adobe.hlx.page/"
+          BASE_URL="https://${BRANCH_NAME}--adobe-design-website--adobe.aem.page/"
           echo "BASE_URL=${BASE_URL}"
           echo "BASE_URL=${BASE_URL}" >> $GITHUB_ENV
 

README.md

@@ -4,8 +4,8 @@ This project contains code that is featured in the [AEM Block Collection](https:
 
 ## Environments
 
-- Preview: https://main--adobe-design-website--adobe.hlx.page/
-- Live: https://main--adobe-design-website--adobe.hlx.live/
+- Preview: https://main--adobe-design-website--adobe.aem.page/
+- Live: https://main--adobe-design-website--adobe.aem.live/
 
 ## Quick Start
 

blocks/article-header/article-header.css

@@ -196,3 +196,7 @@
     line-height: 1.25;
   }
 }
+
+.article-header + .image-with-caption {
+  margin-block-start: 0;
+}

blocks/quote/quote.css

@@ -15,7 +15,7 @@
   }
 
   @media (min-width: 80rem) {
-    padding-block: 4.5rem;
+    padding-block: 3.0rem;
     margin-block: 4.0rem;
   }
 }

styles/global-blocks.css

@@ -413,19 +413,10 @@
   display: flex;
   flex-direction: column;
   gap: var(--image-with-caption-gap);
-  margin: 0;
-  margin-block-end: 1.5rem;
-
-  & .image-with-caption--full-bleed {
-    margin-block-end: 2.5rem;
-  }
+  margin: 1.5rem 0;
 
   @media (min-width: 48rem) {
-    margin-block-end: 2.5rem;
-  }
-
-  @media (min-width: 80rem) {
-    margin-block-end: 4rem;
+    margin-block: 2.5rem;
   }
 
   & .image-with-caption__image img {
@@ -468,6 +459,11 @@
   }
 }
 
+.article-content article > :is(h2, h3) + .image-with-caption,
+.article-content article > div:has(> h2:last-child, > h3:last-child) + .image-with-caption {
+  margin-block-start: 1.5rem;
+}
+
 .image-with-caption div:has(p):not([class]) + .image-with-caption {
   margin-block-start: 2rem;