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

Feature/local dev branch
equalizedigital · Oct 24, 2023 · 3c0398a · 3c0398a
2 parents 67f524b + 52a3b8c
commit 3c0398a
Show file tree

Hide file tree

Showing 16 changed files with 103 additions and 75 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/table-of-contents.scss b/assets/scss/blocks/table-of-contents.scss
@@ -66,7 +66,7 @@
     }
 
     .table-of-contents-block-container-main {
-        display: block;
+        display: grid;
 
         @include media(">tablet") {
             grid-template-columns: 1fr 386px;

diff --git a/assets/scss/blocks/team-hightlight.scss b/assets/scss/blocks/team-hightlight.scss
@@ -136,6 +136,7 @@
                             opacity: 0;
                             margin-bottom: 0;
                             max-height: 0;
+                            border: none;
                         }
                     }
 

diff --git a/assets/scss/blocks/testimonial-slider.scss b/assets/scss/blocks/testimonial-slider.scss
@@ -1,5 +1,18 @@
 .testimonial-slider-block {
+    &-container{
+        &-header__title {
+            color: white;
+            text-align: center;
+            font-size: 35px;
+            font-style: normal;
+            font-weight: 700;
+            line-height: 40px;
+
+            margin: 0;
+        }
+    }
     &-container-testimonial-slider-testimonial {
+
         &__content {
             .content {
                 color: #000;
@@ -18,7 +31,7 @@
                 font-style: normal;
                 font-weight: 600;
                 line-height: 21px;
-                /* 87.5% */
+
                 margin: 0 0 20px;
                 display: block;
             }
@@ -37,16 +50,7 @@
                 gap: 10px;
             }
 
-            &-header__title {
-                color: white;
-                text-align: center;
-                font-size: 35px;
-                font-style: normal;
-                font-weight: 700;
-                line-height: 40px;
-                /* 114.286% */
-                margin: 0;
-            }
+
         }
     }
 

diff --git a/assets/scss/partials/_editor-class.scss b/assets/scss/partials/_editor-class.scss
@@ -222,6 +222,11 @@ blockquote.wp-block-quote {
 
 .facetwp_title_columns {
     gap: 27px;
+    flex-wrap: wrap;
+    @include media("<tablet") {
+        flex-direction: column;
+        align-items: flex-start!important;
+    }
 }
 
 .facetwp_title_columns .facet-reset {

diff --git a/assets/scss/partials/_modal.scss b/assets/scss/partials/_modal.scss
@@ -32,6 +32,9 @@
     iframe {
         max-width: 100%;
         width: 100%;
+        @include media(">tablet") {
+            min-height: 490px;
+        }
     }
 
     .modal_copy {

diff --git a/assets/scss/partials/_singular.scss b/assets/scss/partials/_singular.scss
@@ -1121,12 +1121,22 @@ img.wprm-comment-rating {
 			align-items: center;
 		}
 	}
-
+	.auth-editor-container {
+		display: flex;
+
+		gap: 20px;
+		@include media("<tablet") {
+			flex-wrap: wrap;
+		}
+	}
 	.entry-author {
 		display: flex;
-		flex-wrap: wrap;
+
 		align-items: center;
 		gap: 20px;
+		@include media("<tablet") {
+			flex-wrap: wrap;
+		}
 
 		.avatar {
 			border-radius: 50%;
@@ -1220,7 +1230,9 @@ img.wprm-comment-rating {
 		font-style: normal;
 		font-weight: 400;
 		line-height: 16px;
-		/* 114.286% */
+		a{
+			color: inherit;
+		}
 	}
 
 }

diff --git a/config.codekit3 b/config.codekit3
@@ -7,7 +7,7 @@
       "uuidString" : "F098CAB6-68FD-4BF6-AE0A-27C6B360832B"
     }
   ],
-  "creatorBuild" : "34484",
+  "creatorBuild" : "34518",
   "files" : {
     "\/.github\/workflows\/develop.yml" : {
       "cB" : 0,
@@ -5171,9 +5171,6 @@
         "active" : 0,
         "optionString" : "'except-parens'"
       },
-      "no-return-await" : {
-        "active" : 0
-      },
       "no-script-url" : {
         "active" : 0
       },

diff --git a/inc/layouts.php b/inc/layouts.php
@@ -334,39 +334,58 @@ function eqd_single_fullwidth_content() {
 					echo '</br>';}
 				?>
 
+
 			<div class="site-main-article__author-data">
+
+				<div class="auth-editor-container">
 				<div class="article_author">
 					<?php
-					$post_author    = get_the_author();
-					$id             = get_field( 'post_reviewed_by', get_the_ID() );
-					$id_post_editor = get_field( 'post_editor', get_the_ID() );
-
+					// Author
 					$id_meta        = get_the_author_meta( 'ID' );
-					$id_post_editor = get_field( 'post_editor', get_the_ID() );
 					$user_info_ID   = get_userdata( $id_meta );
 					$author_url_id  = get_author_posts_url( $id_meta );
+					?>
+					<span class="entry-author">
+						<?php echo get_avatar( $id_meta, 40 ); ?>
+
+						<span class="entry-info">
+							<span>
+								Written By <?php echo get_author_posts_link_by_id( $id_meta ); ?>
+							</span>
+						</span>
+					</span>
+				</div>
+
+				<div class="article_author">
+					<?php
+					// Author
+					$id_post_editor = get_field( 'post_editor', get_the_ID() );
 
 					if ( ! empty( $id_post_editor ) ) {
 						$edit_auth_id = $id_post_editor['ID'];
 						$author_info  = get_field( 'job_title', "user_$edit_auth_id" );
 					}
+
 					?>
 					<span class="entry-author">
-						<?php echo ! empty( $edit_auth_id ) ? get_avatar( $edit_auth_id, 40 ) : get_avatar( $id_meta, 40 ); ?>
+						<?php echo ! empty( $edit_auth_id ) ? get_avatar( $edit_auth_id, 40 ) : ''; ?>
 
 						<span class="entry-info">
 							<span>
-								<?php echo ! empty( $id_post_editor ) ? 'Edited by' : 'Written By'; ?>
-								<?php echo ! empty( $edit_auth_id ) ? get_author_posts_link_by_id( $edit_auth_id ) : get_author_posts_link_by_id( $id_meta ); ?>
+								<?php echo ! empty( $id_post_editor ) ? 'Edited by' : ''; ?>
+								<?php echo ! empty( $edit_auth_id ) ? get_author_posts_link_by_id( $edit_auth_id ) : ''; ?>
 							</span>
 							<span class="entry-data">
 								<?php echo ! empty( $author_info ) ? wp_kses_post( $author_info ) : ''; ?>
 							</span>
 						</span>
 					</span>
 				</div>
+				</div>
+
 				<?php
-						$review_by_auth_id = get_field( 'post_reviewed_by', get_the_ID() );
+				// Reviewed By
+				$review_by_auth_id = get_field( 'post_reviewed_by', get_the_ID() );
 				if ( $review_by_auth_id != false ) {
 					$profile_picture = get_avatar( $review_by_auth_id, 64 );
 					$user_info       = get_userdata( $review_by_auth_id );
@@ -376,17 +395,16 @@ function eqd_single_fullwidth_content() {
 				}
 
 				?>
-						<?php if ( $review_by_auth_id ) : ?>
+				<?php if ( $review_by_auth_id ) : ?>
 
 				<div class="reviewed_author">
 
 					<div class="profile">
-							<?php echo $profile_picture; ?>
+						<?php echo $profile_picture; ?>
 					</div>
 
 					<div class="author_info">
-					Reviewed By
-							<?php echo get_author_posts_link_by_id( $review_by_auth_id ); ?>
+						Reviewed By <?php echo get_author_posts_link_by_id( $review_by_auth_id ); ?>
 					</div>
 				</div>
 				<?php endif; ?>
@@ -395,10 +413,11 @@ function eqd_single_fullwidth_content() {
 
 			<section class="site-main-article__author-data-editorial_statement">
 				<div class="site-main-article__author-data-editorial_statement-container">
-					<div class="site-main-article__author-data-editorial_statement-container__title"><h2>Editorial Ethics at Student Loan Planner</h2></div>
+					<div class="site-main-article__author-data-editorial_statement-container__title">
+						<h2>Editorial Ethics at Student Loan Planner</h2>
+					</div>
 					<div class="site-main-article__author-data-editorial_statement-container__copy">
-						<p>
-						At Student Loan Planner, we follow a strict <a href="<?php echo esc_url( get_site_url( null, '/editorial-ethics-policy/' ) ); ?>">editorial ethics policy</a>. This post may contain references to products from our partners within the guidelines of this policy. Read our 
+						<p>At Student Loan Planner, we follow a strict <a href="<?php echo esc_url( get_site_url( null, '/editorial-ethics-policy/' ) ); ?>">editorial ethics policy</a>. This post may contain references to products from our partners within the guidelines of this policy. Read our 
 						<button class="modal-btn btn-style-link" aria-haspopup="true" aria-expanded="false" aria-controls="modal_disclosure" data-modal="modal_disclosure" aria-label="Open Disclosure Modal">advertising disclosure</button> to learn more.
 						</p>
 					</div>

diff --git a/single.php b/single.php
@@ -397,45 +397,38 @@ function eqd_single_after_entry_author_info() {
 
 		<?php endif; ?>
 		<?php
+			$post_editor_by_auth_id_footer = get_field( 'post_editor', get_the_ID() );
 
-
-
-			$post_editor_by_auth_id = get_field( 'post_editor', get_the_ID() );
-
-			$profile_picture = get_avatar( $post_editor_by_auth_id, 64 );
-			$user_info       = get_userdata( $post_editor_by_auth_id );
+			$profile_picture = get_avatar( $post_editor_by_auth_id_footer['ID'], 64 );
+			$user_info       = get_userdata( $post_editor_by_auth_id_footer['ID'] );
 
 		?>
-			<?php if ( !empty($post_editor_by_auth_id) ) : ?>
+			<?php if ( !empty($post_editor_by_auth_id_footer['ID']) ) : ?>
 
 			<div class="article_footer_data_author_reviewed_author editedby">
 				<div class="article_footer_data_author_profile">
 					<?php echo $profile_picture; ?>
 				</div>
 				<div class="article_footer_data_author_author_info">
-				Edited By
+					Edited By
 					<span class="name">
-					<?php  
-					echo get_author_posts_link_by_id($post_editor_by_auth_id['ID']); 
-
-
-					?>
+					<?php echo get_author_posts_link_by_id($post_editor_by_auth_id_footer['ID']);  ?>
 					</span>
 				</div>
 
 				<ul class="article_footer_data_author_socials">
-					<?php if ( ! empty( get_user_meta( $post_editor_by_auth_id['ID'], 'twitter', true ) ) ) { ?>
+					<?php if ( ! empty( get_user_meta( $post_editor_by_auth_id_footer['ID'], 'twitter', true ) ) ) { ?>
 					<li>
-					<a href="<?php echo wp_kses_post( get_user_meta( $post_editor_by_auth_id['ID'], 'twitter', true ) ); ?>">
+					<a href="<?php echo wp_kses_post( get_user_meta( $post_editor_by_auth_id_footer['ID'], 'twitter', true ) ); ?>">
 						<svg xmlns="http://www.w3.org/2000/svg" width="16" height="13" viewBox="0 0 16 13" fill="none">
 							<path d="M16 2.13735C15.4138 2.37735 14.7777 2.54075 14.1141 2.61224C14.7943 2.23948 15.3142 1.64203 15.5576 0.937348C14.9215 1.28458 14.2191 1.53479 13.4725 1.67267C12.8752 1.08543 12.0235 0.717773 11.0778 0.717773C9.26374 0.717773 7.79813 2.07607 7.79813 3.74586C7.79813 3.98586 7.82579 4.21565 7.88109 4.43522C5.15451 4.30756 2.73211 3.10245 1.11718 1.26926C0.835119 1.71862 0.674732 2.23948 0.674732 2.79096C0.674732 3.84288 1.25544 4.77224 2.13481 5.31352C1.59834 5.2982 1.08953 5.16033 0.647079 4.93565C0.647079 4.94586 0.647079 4.96118 0.647079 4.97139C0.647079 6.44203 1.78085 7.66245 3.27964 7.94331C3.00311 8.01479 2.71552 8.05054 2.41687 8.05054C2.20671 8.05054 2.00207 8.03011 1.79744 7.99437C2.21777 9.19948 3.42897 10.0727 4.86139 10.0982C3.73868 10.9101 2.32285 11.3952 0.785344 11.3952C0.519876 11.3952 0.259938 11.3799 0 11.3544C1.45455 12.2122 3.18009 12.7178 5.03284 12.7178C11.0722 12.7178 14.3685 8.1016 14.3685 4.09309C14.3685 3.96033 14.3685 3.83267 14.3574 3.6999C14.999 3.27097 15.5576 2.7399 15.9945 2.13224L16 2.13735Z" fill="black"/>
 						</svg>
 					</a>
 					</li>
 					<?php } ?>
-					<?php if ( ! empty( get_user_meta( $post_editor_by_auth_id['ID'], 'linkedin', true ) ) ) { ?>
+					<?php if ( ! empty( get_user_meta( $post_editor_by_auth_id_footer['ID'], 'linkedin', true ) ) ) { ?>
 					<li>
-						<a href="<?php echo wp_kses_post( get_user_meta( $post_editor_by_auth_id['ID'], 'linkedin', true ) ); ?>">
+						<a href="<?php echo wp_kses_post( get_user_meta( $post_editor_by_auth_id_footer['ID'], 'linkedin', true ) ); ?>">
 							<svg xmlns="http://www.w3.org/2000/svg" width="17" height="17" viewBox="0 0 17 17" fill="none">
 								<path d="M0.45864 5.32922H3.75985V16.0553H0.45864V5.32922ZM2.11092 0C3.16784 0 4.02408 0.865112 4.02408 1.93298C4.02408 3.00086 3.16784 3.86597 2.11092 3.86597C1.054 3.86597 0.197754 3.00086 0.197754 1.93298C0.197754 0.865112 1.054 0 2.11092 0Z" fill="black"/>
 								<path d="M5.83008 5.32993H8.99082V6.79656H9.05102C9.69655 5.68138 10.894 5.01903 12.1716 5.06634C15.5163 5.06634 16.1284 7.28657 16.1284 10.1725V16.056H12.8305V10.8416C12.8305 9.59804 12.8105 7.99623 11.118 7.99623C9.42562 7.99623 9.13799 9.34797 9.13799 10.7504V16.056H5.84346L5.83008 5.32993Z" fill="black"/>

diff --git a/template-parts/blocks/full-width-columns-background-block/block.json b/template-parts/blocks/full-width-columns-background-block/block.json
@@ -12,13 +12,5 @@
 	"acf": {
 		"mode": "preview",
 		"renderTemplate": "full-width-columns-background.php"
-	},
-	"example": {
-		"attributes": {
-			"mode": "preview",
-			"data": {
-				"preview_image_help": "screenshot.jpg"
-			}
-		}
 	}
 }
diff --git a/template-parts/blocks/full-width-columns-cta-inner/block.json b/template-parts/blocks/full-width-columns-cta-inner/block.json
@@ -14,13 +14,6 @@
 	"acf": {
 		"mode": "preview",
 		"renderTemplate": "template.php"
-	},
-	"example": {
-		"attributes": {
-			"mode": "preview",
-			"data": {
-				"preview_image_help": "screenshot.jpg"
-			}
-		}
 	}
+
 }
diff --git a/template-parts/blocks/full-width-columns-cta-inner/full-width-columns-background.php b/template-parts/blocks/full-width-columns-cta-inner/full-width-columns-background.php
@@ -9,8 +9,8 @@
  * @package Full-width-columns-background
  */
 
-if ( isset( $block['data']['preview_image_help'] ) ) :
-	echo wp_kses_post( Loader_Gutenberg::get_preview_image( $block['data']['preview_image_help'], $block['name'] ) );
+if ( isset( $block['example']['attributes']['data']['preview_image_help'] ) ) :
+	echo wp_kses_post( Loader_Gutenberg::get_preview_image( $block['example']['attributes']['data']['preview_image_help'], $block['name'] ) );
 	return;
 endif;
 

diff --git a/template-parts/blocks/testimonial-slider/template.php b/template-parts/blocks/testimonial-slider/template.php
@@ -65,7 +65,15 @@
 						<blockquote class="testimonial-slider-block-container-testimonial-slider-testimonial__content">
 							<span class="content"><?php echo wp_kses_post( $testimonial->post_content ); ?></span>
 							<span class="title"><?php echo wp_kses_post( get_the_title( $id_post ) ); ?></span>
-							<span class="date"><span><?php the_field( 'location', $id_post ); ?></span>|<span><?php the_field( 'date', $id_post ); ?></span></span>
+							<span class="date">
+								<span>
+									<?php the_field( 'location', $id_post ); ?>
+								</span>
+								 <?php if(!empty(get_field( 'date', $id_post ))){ echo '|'; } ?>
+								<span>
+									<?php the_field( 'date', $id_post ); ?>
+								</span>
+							</span>
 							<span class="rating">
 								<div class="stars" aria-hidden="true">
 								<?php for ( $i = 0; $i < 5; $i++ ) : ?>
@@ -75,7 +83,8 @@
 								<?php endfor; ?>
 								<div class="cover" style="width: calc(<?php echo 100 - ( $rating * 20 ); ?>% );"></div>
 							</div>
-							<?php echo $rating; ?> out of 5 stars.
+							<span class="screen-reader-text"><?php echo $rating; ?> out of 5 stars.</span>
+
 						</blockquote>
 					</div>
 					<?php