Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stage #566

Merged
merged 7 commits into from
Oct 25, 2023
Merged

Stage #566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0034c76
Merge pull request #551 from equalizedigital/feature/local-dev-branch
tronsymphony Oct 24, 2023
58383d9
Merge pull request #553 from equalizedigital/feature/local-dev-branch
tronsymphony Oct 24, 2023
a22a797
Testimonial Slider
tronsymphony Oct 25, 2023
47315e4
Merge branch 'hotfix/filter-recommended-posts' into stage
SteveJonesDev Oct 25, 2023
b5a2972
Merge branch 'master' into stage
SteveJonesDev Oct 25, 2023
6b15b98
slider rename
tronsymphony Oct 25, 2023
aaf01f4
Merge pull request #565 from equalizedigital/feature/local-dev-branch
tronsymphony Oct 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion assets/css/editor-style.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/css/main.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/css/main.css.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/scss/blocks/doctor-mortgages-map-block.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@

&:hover {
background: none;
color: brand-color('primary');
color: black;
border: 2px solid brand-color('primary');
}
}
Expand Down
10 changes: 10 additions & 0 deletions assets/scss/blocks/media-reviews.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
2 changes: 1 addition & 1 deletion assets/scss/partials/_blocks-base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ input {


.wp-block-table {

margin-bottom: 20px;

table {
thead {
Expand Down
14 changes: 7 additions & 7 deletions assets/scss/partials/_singular.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
}
Expand Down
3 changes: 3 additions & 0 deletions inc/wordpress-cleanup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
7 changes: 2 additions & 5 deletions template-parts/blocks/featured-institution/template.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion template-parts/blocks/media-reviews-slider/block.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
43 changes: 27 additions & 16 deletions template-parts/blocks/media-reviews/media-reviews.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -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">
Expand Down
2 changes: 2 additions & 0 deletions template-parts/blocks/testimonial-slider/template.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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++ ) : ?>
Expand All @@ -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>
Expand Down
Loading