Merge pull request #944 from equalizedigital/feature/local-dev-branch

Feature/local dev branch
equalizedigital · Nov 9, 2023 · 451d066 · 451d066
2 parents e72695e + 0af8d4c
commit 451d066
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 5 deletions.
diff --git a/assets/css/editor-style.css b/assets/css/editor-style.css
diff --git a/assets/css/main.css b/assets/css/main.css
diff --git a/assets/css/main.css.map b/assets/css/main.css.map
diff --git a/assets/scss/blocks/featured-in.scss b/assets/scss/blocks/featured-in.scss
@@ -2,7 +2,6 @@
     &-container {
         margin: 0 auto;
         max-width: $container-width;
-        padding: 0 $container-padding;
         &-header {
             display: flex;
             justify-content: center;

diff --git a/assets/scss/partials/_editor-class.scss b/assets/scss/partials/_editor-class.scss
@@ -165,7 +165,7 @@ blockquote{
         &:not(.is-style-plain) {
 
             max-width: 740px;
-            margin: 60px auto 10px !important;
+            margin: 60px auto 20px !important;
             padding: 100px 24px 50px;
             display: grid;
             gap: 27px;

diff --git a/template-parts/blocks/full-width-columns-background-block/full-width-columns-background.php b/template-parts/blocks/full-width-columns-background-block/full-width-columns-background.php
@@ -36,6 +36,7 @@
 $acf_title                          = get_field( 'title' );
 $content                            = get_field( 'content' );
 $image                              = get_field( 'image' );
+$placeholder_image_retina_display                              = get_field( 'placeholder_image_retina_display' );
 $youtube_video_id                   = get_field( 'youtube_video_id' );
 $acf_link                           = get_field( 'link' );
 $reverse_order_of_image_and_content = get_field( 'reverse_order_of_image_and_content' );
@@ -60,6 +61,11 @@
 		<div class="full-width-columns-background-container__video" >
 			<?php if ( $image ) : ?>
 				<img src="<?php echo wp_kses_post( $image['url'] ); ?>" alt="<?php echo wp_kses_post( $image['alt'] ); ?>">	
+
+				<img src="<?php echo wp_kses_post( $image['url'] ); ?>"
+				srcset="<?php echo wp_kses_post( $image['url'] ); ?> 1x, <?php echo wp_kses_post( $placeholder_image_retina_display ['url'] ); ?> 2x"
+				alt="<?php echo wp_kses_post( $image['alt'] ); ?>">
+
 			<?php endif; ?>
 			<?php if(!empty($youtube_video_id)): ?>
 			<button class="modal-btn btn-dark-bg full-width-columns-background-container__video__button" aria-haspopup="dialog" data-modal="modal1" aria-label="Open Video" id="play-iframe" >