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

Feature/local dev branch
equalizedigital · Nov 22, 2023 · be88662 · be88662
2 parents 1c9c3a5 + b12d29c
commit be88662
Show file tree

Hide file tree

Showing 9 changed files with 105 additions and 32 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/modules/_base-styles.scss b/assets/scss/modules/_base-styles.scss
@@ -33,7 +33,7 @@
 		} @else if 2 == $size {
 			@include font-sizes( 25px, 25px, 35px );
 		} @else if 3 == $size {
-			@include font-sizes( 20px, 20px, 20px );
+			@include font-sizes( 20px, 20px, 28px );
 		} @else if 4 == $size {
 			@include font-sizes( 18px, 18px, 20px );
 		} @else if 5 == $size {

diff --git a/assets/scss/partials/_blocks-base.scss b/assets/scss/partials/_blocks-base.scss
@@ -167,6 +167,12 @@ h2 {
 
 }
 
+.entry-content {
+	h3 {
+		color: brand-color('tertiary');
+	}
+}
+
 h3 {
 	@include style('title', 3);
 	font-style: normal;
@@ -346,6 +352,7 @@ input {
 			line-height: 18px;
 			padding: 5px;
 			text-align: left;
+
 			@include media(">tablet") {
 				padding: 18px 20px;
 			}
@@ -358,6 +365,7 @@ input {
 			font-weight: 400;
 			line-height: 18px;
 			padding: 5px;
+
 			@include media(">tablet") {
 				padding: 10px 20px;
 			}

diff --git a/assets/scss/partials/_singular.scss b/assets/scss/partials/_singular.scss
@@ -945,7 +945,7 @@ img.wprm-comment-rating {
 --------------------------------------------- */
 .post_type_layout_standard {
 	.entry-content {
-		padding: 40px auto;
+		padding: 40px 0;
 	}
 }
 
@@ -1005,6 +1005,29 @@ img.wprm-comment-rating {
 		z-index: 1;
 	}
 
+	&.inner-hero-alternate-style {
+		padding: 40px 0 0;
+		min-height: 0;
+		background-color: white;
+
+		.inner-hero-container {
+			padding: 0;
+		}
+
+		&:after {
+			display: none;
+		}
+
+		.title {
+			// margin: 0;
+			color: black;
+		}
+
+		.subtitle {
+			color: black;
+		}
+	}
+
 	&.inner-hero-center-text {
 		text-align: center;
 
@@ -1153,6 +1176,7 @@ img.wprm-comment-rating {
 		align-items: center;
 		gap: 20px;
 
+
 		.avatar {
 			border-radius: 50%;
 		}
@@ -1214,7 +1238,11 @@ img.wprm-comment-rating {
 		display: flex;
 
 		align-items: center;
-		gap: 20px;
+		gap: 8px;
+
+		@include media(">tablet") {
+			gap: 20px;
+		}
 
 		@include media("<tablet") {
 			flex-wrap: wrap;
@@ -1224,6 +1252,11 @@ img.wprm-comment-rating {
 			border-radius: 50%;
 			width: 45px;
 			height: 45px;
+
+			@include media("<tablet") {
+				width: 30px;
+				height: 30px;
+			}
 		}
 
 		.entry-info {
@@ -1298,13 +1331,22 @@ img.wprm-comment-rating {
 		display: flex;
 		gap: 20px;
 		align-items: center;
+
+		@include media("<tablet") {
+			gap: 8px;
+		}
 	}
 
 	.reviewed_author img {
 		border-radius: 50%;
 		width: 45px;
 		height: 45px;
 		max-width: 45px;
+
+		@include media("<tablet") {
+			width: 30px;
+			height: 30px;
+		}
 	}
 
 	.author_info {

diff --git a/inc/layouts.php b/inc/layouts.php
@@ -334,6 +334,17 @@ function eqd_single_fullwidth_content() {
 					echo '</br>';}
 				?>
 
+
+			<?php 
+			$term_list = wp_get_post_terms(get_the_ID(), 'category', ['fields' => 'all']);
+			foreach($term_list as $term) {
+				if( get_post_meta(get_the_ID(), '_yoast_wpseo_primary_category',true) == $term->term_id ) {
+					$hide_editorial_section_on_posts = get_field( 'hide_editorial_section_on_posts',  'category_' . $term->term_id );
+				}
+			}
+
+			if ( !$hide_editorial_section_on_posts ) :
+			?>
 			<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">
@@ -346,6 +357,7 @@ function eqd_single_fullwidth_content() {
 					</div>
 				</div>
 			</section>
+			<?php endif; ?>
 
 			<div class="site-main-article__author-data <?php if( !empty(get_field( 'post_editor', get_the_ID() )) ){ echo "site-main-article__author-data_editor"; } ?>">
 				<div class="auth-editor-container">

diff --git a/inc/template-tags.php b/inc/template-tags.php
@@ -297,6 +297,10 @@ function eqd_tha_page_header() {
 			$container_class .= ' inner-hero-center-text';
 		}
 
+		$alternate_header_style = get_field( 'alternate_header_style' );
+		if ( $alternate_header_style ) {
+			$container_class .= 'inner-hero-alternate-style';
+		}
 		?>
 		<header class="inner-hero <?php echo wp_kses_post( $container_class ); ?>">
 			<div class="inner-hero-container">
@@ -340,37 +344,43 @@ function eqd_tha_page_header() {
 					<?php endif; ?>
 				</h1>
 
-				<span class="subtitle">
-					<?php
-					if ( ! is_search() ) {
-						if ( ! empty( $subtitle ) ) {
-							echo wp_kses_post( $subtitle );
-						} else {
-							echo wp_kses_post( get_field( 'title_copy', 'option' ) );
+					<span class="subtitle">
+						<?php
+						if ( ! is_search() ) {
+							if ( ! empty( $subtitle ) ) {
+								echo wp_kses_post( $subtitle );
+							} else {
+								echo wp_kses_post( get_field( 'title_copy', 'option' ) );
+							}
 						}
-					}
-					?>
-				</span>
-
-				<?php if ( ! empty( $heading_link ) ) : ?>
-					<span class="link">
-						<a href="<?php echo $heading_link['url'] ? $heading_link['url'] : ''; ?>" class="btn btn-dark-bg"><?php echo $heading_link['title'] ? $heading_link['title'] : ''; ?></a>
+						?>
 					</span>
+
+				<?php if ( !$alternate_header_style ): ?>
+
+					<?php if ( ! empty( $heading_link ) ) : ?>
+						<span class="link">
+							<a href="<?php echo $heading_link['url'] ? $heading_link['url'] : ''; ?>" class="btn btn-dark-bg"><?php echo $heading_link['title'] ? $heading_link['title'] : ''; ?></a>
+						</span>
+					<?php endif; ?>
+
 				<?php endif; ?>
 
 			</div>
 
-			<?php
-			if ( ! is_search() ) {
-				if ( ! empty( $bg_url ) ) :
-					?>
-				<span class="hero_image">
-					<img src="<?php echo $bg_url; ?>" alt="<?php the_title(); ?>" />
-				</span>
-					<?php
-				endif;
-			}
-			?>
+			<?php if ( !$alternate_header_style ): ?>
+				<?php
+				if ( ! is_search() ) {
+					if ( ! empty( $bg_url ) ) :
+						?>
+					<span class="hero_image">
+						<img src="<?php echo $bg_url; ?>" alt="<?php the_title(); ?>" />
+					</span>
+						<?php
+					endif;
+				}
+				?>
+			<?php endif; ?>
 
 		</header>
 

diff --git a/single-slp_contacts.php b/single-slp_contacts.php
@@ -128,7 +128,8 @@
 						$contact_email = get_field( 'contact_email_address' );
 						if ( !empty($contact_email)  ) : ?>
 							<h2>Get Started</h2>
-							<?php echo do_shortcode( '[wpforms id="82543"]' ); ?>
+							<?php $form_code = get_field('form_shortcode'); ?>
+							<?php echo do_shortcode( $form_code ); ?>
 						<?php endif; ?>
 
 					</div>