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

Feature/local dev branch
equalizedigital · Oct 25, 2023 · aaf01f4 · aaf01f4
2 parents b5a2972 + 6b15b98
commit aaf01f4
Show file tree

Hide file tree

Showing 12 changed files with 57 additions and 34 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/doctor-mortgages-map-block.scss b/assets/scss/blocks/doctor-mortgages-map-block.scss
@@ -223,7 +223,7 @@
 
 		&:hover {
 			background: none;
-			color: brand-color('primary');
+			color: black;
 			border: 2px solid brand-color('primary');
 		}
 	}

diff --git a/assets/scss/blocks/media-reviews.scss b/assets/scss/blocks/media-reviews.scss
@@ -3,6 +3,16 @@
     color: black;
     padding-bottom: 100px;
 
+    &.media-reviews-block_padding_1 {
+        padding: 0;
+        .media-reviews-container{
+            padding: 20px 24px;
+        }
+        .media-reviews-container-review-items-read{
+            margin: 0;
+        }
+    }
+
     &-purple {
         color: white;
         background-color: brand-color('tertiary');

diff --git a/assets/scss/partials/_blocks-base.scss b/assets/scss/partials/_blocks-base.scss
@@ -310,7 +310,7 @@ input {
 
 
 .wp-block-table {
-
+margin-bottom: 20px;
 
 	table {
 		thead {

diff --git a/assets/scss/partials/_singular.scss b/assets/scss/partials/_singular.scss
@@ -48,13 +48,13 @@
 .content-sidebar{
 	.entry-content {
 		.alignfull {
-			max-width: unset!important;
-			width: auto!important;
-			position: relative;
-			left: 0!important;
-			right: 0!important;
-			margin-left: 0!important;
-			margin-right: 0!important;
+			// max-width: unset!important;
+			// width: auto!important;
+			// position: relative;
+			// left: 0!important;
+			// right: 0!important;
+			// margin-left: 0!important;
+			// margin-right: 0!important;
 		}
 	}
 }

diff --git a/inc/wordpress-cleanup.php b/inc/wordpress-cleanup.php
@@ -79,6 +79,9 @@ function eqd_clean_body_classes( $classes ) {
 		'admin-bar',
 		'logged-in',
 		'wp-embed-responsive',
+		'content-sidebar',
+		'content',
+		'full-width-content',
 	);
 
 	// AdThrive Classes.

diff --git a/template-parts/blocks/featured-institution/template.php b/template-parts/blocks/featured-institution/template.php
@@ -50,13 +50,10 @@
 $show_degrees                 = get_field( 'show_degrees' );
 $show_contact                 = get_field( 'show_contact' );
 $show_feature_list            = get_field( 'show_feature_list' );
-
-
+$block_id            = get_field( 'block_id' );
 $time_stamp = time() . wp_rand( 0, 23 );
-
-
 ?>
-<section id="<?php echo esc_attr( $classid ); ?>" class="<?php echo esc_attr( $class_name ); ?>">
+<section id="<?php echo !empty($block_id)?  $block_id:esc_attr( $classid ); ?>" class="<?php echo esc_attr( $class_name ); ?>">
 
 	<h3 class="screen-reader-text"><?php echo get_the_title($select_institutional_contact); ?></h3>
 	<div class="vendor_information_block_container">

diff --git a/template-parts/blocks/media-reviews-slider/block.json b/template-parts/blocks/media-reviews-slider/block.json
@@ -1,6 +1,6 @@
 {
 	"name": "acf/media-reviews-slider-block",
-	"title": "media reviews slider",
+	"title": "Testimonial Slider",
 	"description": "Media reviews slider block.",
 	"category": "custom-blocks",
 	"icon": "star-empty",

diff --git a/template-parts/blocks/media-reviews/media-reviews.php b/template-parts/blocks/media-reviews/media-reviews.php
@@ -37,10 +37,17 @@
 $block_style = get_field('block_style');
 $select_testimonials = get_field('select_testimonials');
 $testimonial_block_style = get_field('testimonial_block_style');
+$remove_padding = get_field('remove_padding');
 
 if ($testimonial_block_style) :
 	$className .= ' media-reviews-block_' . $testimonial_block_style;
 endif;
+
+if ($remove_padding) :
+	$className .= ' media-reviews-block_padding_' . $remove_padding;
+endif;
+
+
 ?>
 <section id="<?php echo esc_attr($id); ?>" class="<?php echo esc_attr($className); ?> <?php echo $block_style == 'purple'?'media-reviews-block-purple':''; ?>">
     <div class="media-reviews-container">
@@ -87,23 +94,27 @@
 										?>	
 									</div>
 								</div>
-								<div class="rating">
-									<?php 
-									$rating = get_field('rating',get_the_ID());
-									$rating?$rating:$rating=0;
-									?>
-									<div class="rating-stars">
-										<span class="star">
-												<?php for ($i = 0; $i < 5; $i++): ?>
-													<svg width="18" height="17" viewBox="0 0 18 17" fill="none" xmlns="http://www.w3.org/2000/svg">
-													<path d="M7.77387 0.881322C8.07577 -0.034611 9.37143 -0.0346103 9.67334 0.881322L10.9884 4.8711C11.1236 5.28107 11.5065 5.55805 11.9382 5.55805H16.1631C17.1353 5.55805 17.5357 6.80498 16.7453 7.37105L13.3521 9.80121C12.9966 10.0558 12.8478 10.5119 12.9847 10.9273L14.2866 14.877C14.5894 15.7958 13.5411 16.5663 12.7546 16.003L9.30586 13.5331C8.95773 13.2838 8.48948 13.2838 8.14134 13.5331L4.69265 16.003C3.90614 16.5663 2.8578 15.7958 3.16065 14.877L4.46254 10.9273C4.59944 10.5119 4.4506 10.0558 4.09507 9.80121L0.701879 7.37105C-0.0885191 6.80498 0.311942 5.55805 1.28414 5.55805H5.50903C5.94069 5.55805 6.32363 5.28107 6.45876 4.8711L7.77387 0.881322Z" fill="#F19E3E"/>
-													</svg>
-												<?php endfor; ?>
-
-												<div class="cover" style="width: calc(<?php echo 100 - ( $rating * 20 ); ?>% );"></div>
-										</span>
+								<?php 
+										$rating = get_field('rating',get_the_ID());
+										$rating?$rating:$rating=0;
+										?>
+								<?php
+								if(!empty($rating)): ?>
+									<div class="rating">
+
+										<div class="rating-stars">
+											<span class="star">
+													<?php for ($i = 0; $i < 5; $i++): ?>
+														<svg width="18" height="17" viewBox="0 0 18 17" fill="none" xmlns="http://www.w3.org/2000/svg">
+														<path d="M7.77387 0.881322C8.07577 -0.034611 9.37143 -0.0346103 9.67334 0.881322L10.9884 4.8711C11.1236 5.28107 11.5065 5.55805 11.9382 5.55805H16.1631C17.1353 5.55805 17.5357 6.80498 16.7453 7.37105L13.3521 9.80121C12.9966 10.0558 12.8478 10.5119 12.9847 10.9273L14.2866 14.877C14.5894 15.7958 13.5411 16.5663 12.7546 16.003L9.30586 13.5331C8.95773 13.2838 8.48948 13.2838 8.14134 13.5331L4.69265 16.003C3.90614 16.5663 2.8578 15.7958 3.16065 14.877L4.46254 10.9273C4.59944 10.5119 4.4506 10.0558 4.09507 9.80121L0.701879 7.37105C-0.0885191 6.80498 0.311942 5.55805 1.28414 5.55805H5.50903C5.94069 5.55805 6.32363 5.28107 6.45876 4.8711L7.77387 0.881322Z" fill="#F19E3E"/>
+														</svg>
+													<?php endfor; ?>
+
+													<div class="cover" style="width: calc(<?php echo 100 - ( $rating * 20 ); ?>% );"></div>
+											</span>
+										</div>
 									</div>
-								</div>
+								<?php endif; ?>
 							</div>
 
 							<div class="content">

diff --git a/template-parts/blocks/testimonial-slider/template.php b/template-parts/blocks/testimonial-slider/template.php
@@ -74,6 +74,7 @@
 									<?php the_field( 'date', $id_post ); ?>
 								</span>
 							</span>
+							<?php if(!empty($rating)): ?>
 							<span class="rating">
 								<div class="stars" aria-hidden="true">
 								<?php for ( $i = 0; $i < 5; $i++ ) : ?>
@@ -84,6 +85,7 @@
 								<div class="cover" style="width: calc(<?php echo 100 - ( $rating * 20 ); ?>% );"></div>
 							</div>
 							<span class="screen-reader-text"><?php echo $rating; ?> out of 5 stars.</span>
+							<?php endif; ?>
 
 						</blockquote>
 					</div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -310,7 +310,7 @@ input { @@
     .wp-block-table {
+    margin-bottom: 20px;
     	table {
     		thead {
@@ Expand Down @@