Skip to content

Commit

Permalink
Merge pull request #1054 from equalizedigital/feature/local-dev-branch
Browse files Browse the repository at this point in the history
Feature/local dev branch
  • Loading branch information
tronsymphony authored Nov 28, 2023
2 parents 6c481b1 + 3076b15 commit c8c18f9
Show file tree
Hide file tree
Showing 15 changed files with 61 additions and 71 deletions.
2 changes: 1 addition & 1 deletion assets/css/editor-style.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/css/main.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/css/main.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/js/global-min.js

Large diffs are not rendered by default.

36 changes: 12 additions & 24 deletions assets/js/src/global.js
Original file line number Diff line number Diff line change
Expand Up @@ -398,40 +398,25 @@ document.addEventListener('DOMContentLoaded', function () {
var containerId = menuFooterContainer.id;
title.setAttribute('aria-controls', containerId);
}
});


widgetTitles.forEach(title => {
title.setAttribute('tabindex', '0');
title.setAttribute('role', 'button');
title.setAttribute('aria-expanded', 'false');
// Add click event listener to each .widget-title

// title.addEventListener('keypress', function () {

// // Check if there's a next sibling element
// this.classList.toggle('active');
// let sibling = this.nextElementSibling;
// if (sibling) {
// var isExpanded = title.getAttribute('aria-expanded') === 'true';
// // Add class to the sibling
// this.nextElementSibling.classList.toggle('active'); // Replace 'your-class-name-here' with your desired class name
// this.setAttribute('aria-expanded', isExpanded ? 'false' : 'true');

// }
// });

});
widgetTitles.forEach(function (title) {

title.addEventListener('click', function () {
// Check if there's a next sibling element
this.classList.toggle('active');
let sibling = this.nextElementSibling;
if (sibling) {
var isExpanded = title.getAttribute('aria-expanded') === 'true';
// Add class to the sibling
this.nextElementSibling.classList.toggle('active'); // Replace 'your-class-name-here' with your desired class name
// if (sibling) {
var isExpanded = title.getAttribute('aria-expanded');
this.nextElementSibling.classList.toggle('active');
this.setAttribute('aria-expanded', isExpanded ? 'false' : 'true');
}
});
// }
},true);
});

}
Expand All @@ -440,13 +425,16 @@ document.addEventListener('DOMContentLoaded', function () {

window.addEventListener('resize', function () {
if (window.innerWidth < 768) {
footerMenuFunctions()
setTimeout(() => {
footerMenuFunctions()
}, 500);
} else {
widgetTitlesRespo.forEach(title => {
title.removeAttribute('tabindex');
title.removeAttribute('role');
title.removeAttribute('aria-expanded');
title.removeAttribute('aria-controls');
title.removeEventListener('click',arguments.callee)
});
}
});
Expand Down
1 change: 1 addition & 0 deletions assets/scss/partials/_blocks-core.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/* Button
--------------------------------------------- */
.post-button,
.btn,
.wp-block-button__link {
@include style('callout', 5, true);
Expand Down
5 changes: 5 additions & 0 deletions assets/scss/partials/_blocks-plugin.scss
Original file line number Diff line number Diff line change
Expand Up @@ -102,3 +102,8 @@ div.wpforms-container {
}
}
}


.anww-external-link-icon {
margin-left:5px;
}
6 changes: 3 additions & 3 deletions assets/scss/partials/_navigation.scss
Original file line number Diff line number Diff line change
Expand Up @@ -1034,8 +1034,8 @@ body {
.input-group input::placeholder,
.input-group input {
min-width: 420px;
padding: 0;
color: #fff;
padding: 0 5px;
color: black;
font-size: 15px;
font-style: normal;
font-weight: 400;
Expand All @@ -1059,7 +1059,7 @@ body {
&:focus-within,
&:focus,
&:focus-visible {
outline: 2px solid white;
outline: 1px solid white;
}
}

Expand Down
32 changes: 17 additions & 15 deletions assets/scss/partials/_singular.scss
Original file line number Diff line number Diff line change
Expand Up @@ -672,7 +672,7 @@ img.wprm-comment-rating {
&-details {
padding: 40px 0 0;
margin-bottom: 20px;
color: var(--Black, #000);
color: black;
font-size: 16px;
font-style: normal;
font-weight: 400;
Expand Down Expand Up @@ -867,7 +867,7 @@ img.wprm-comment-rating {

a {
background: #82BC46;
color: var(--Black, #000);
color: black;
text-align: center;
font-size: 14px;
font-style: normal;
Expand Down Expand Up @@ -945,7 +945,7 @@ img.wprm-comment-rating {
--------------------------------------------- */
.post_type_layout_standard {
.entry-content {
padding: 40px 0;
padding: 0px 0 40px;
}

}
Expand All @@ -963,12 +963,15 @@ img.wprm-comment-rating {
line-height: 24px;
}
}
.inner-hero {
margin-bottom: 40px;
}
}

.home {
.inner-hero {
@include media(">tablet") {
padding: 132px 0;
padding: 40px 0;
}
}
}
Expand All @@ -983,16 +986,16 @@ img.wprm-comment-rating {

.inner-hero {
background-color: brand-color('tertiary');
padding: 60px 0;
padding: 20px 0;
position: relative;
grid-column-start: 1;
grid-column-end: 13;
width: 100%;
min-height: 200px;
min-height: 140px;

@include media(">tablet") {
padding: 60px 0;
min-height: 280px;
padding: 40px 0;
min-height: 200px;
display: flex;
flex-direction: column;
justify-content: center;
Expand Down Expand Up @@ -1207,7 +1210,7 @@ img.wprm-comment-rating {
font-style: normal;
font-weight: 400;
line-height: 16px;
color: white;
color: black;

a {
color: inherit;
Expand Down Expand Up @@ -1472,7 +1475,7 @@ img.wprm-comment-rating {
max-width: 171px;

h2 {
color: var(--Black, #000);
color: black;
font-size: 16px;
font-style: normal;
font-weight: 700;
Expand All @@ -1481,7 +1484,7 @@ img.wprm-comment-rating {
}

&-container__copy {
color: var(--Black, #000);
color: black;
font-size: 14px;
font-style: normal;
font-weight: 400;
Expand Down Expand Up @@ -1678,7 +1681,7 @@ section.refinance_lender_section {
}

button.btn-text {
color: var(--Black, #000);
color: black;
text-align: center;
font-size: 14px;
font-style: normal;
Expand Down Expand Up @@ -1802,7 +1805,7 @@ section.refinance_lender_section {
}

.author_name {
color: var(--Black, #000);
color: black;
font-size: 18px;
font-style: normal;
font-weight: 600;
Expand Down Expand Up @@ -1833,12 +1836,11 @@ section.refinance_lender_section {
}

&_author_entry-data {
color: var(--Black, #000);
color: black;
font-size: 16px;
font-style: normal;
font-weight: 400;
line-height: 24px;
/* 150% */
}

&_author_entry-info {
Expand Down
2 changes: 1 addition & 1 deletion author.php
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@
?>
</span>
<div class="author_recommended_posts_content_post-inf__link">
<a href="<?php echo $author_url; ?>">
<a href="<?php the_permalink( $post->ID ); ?>">
By <?php echo ! empty( $id_post_editor ) ? $first_name . ' ' . $last_name : get_the_author(); ?>
</a>
</div>
Expand Down
21 changes: 4 additions & 17 deletions inc/loop.php
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,15 @@ function eqd_single_header() {
$link = get_field( 'single_post_link', $page_id );
$output = null;
$container_class = '';

if ( get_field( 'post_format_style' ) == 'full-width' ) {
$container_class .= 'hero_relative';
} else {
$container_class .= 'inner-hero-alternate-style';
}
if ( get_field( 'post_format_style' ) == 'full-width' ) {
$container_class .= ' inner-hero-alternate-style';
}
?>
<header class="inner-hero <?php echo wp_kses_post( $container_class ); ?>">
<div class="inner-hero-container">
Expand Down Expand Up @@ -159,23 +163,6 @@ function eqd_single_header() {

</div>

<?php
// Background image.
if ( get_field( 'post_format_style' ) == 'full-width' ) :
?>
<span class="hero_image">
<?php if ( ! empty( $background_image['ID'] ) ) : ?>
<?php echo wp_get_attachment_image( $background_image['ID'], 'full' ); ?>
<?php endif; ?>

<?php
$featured_image = get_the_post_thumbnail_url( get_the_ID() );
if ( $featured_image ) {
?>
<?php echo '<img src="' . esc_url( $featured_image ) . '" />'; ?>
<?php } ?>
</span>
<?php endif; ?>
</header>

<?php
Expand Down
9 changes: 8 additions & 1 deletion inc/template-tags.php
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,12 @@ function eqd_tha_page_header() {
$alternate_header_style = get_field( 'alternate_header_style' );
if ( $alternate_header_style ) {
$container_class .= 'inner-hero-alternate-style';
} elseif ( is_page() ) {
if ( ! is_front_page() ) {
$container_class .= 'inner-hero-alternate-style';
}
}

?>
<header class="inner-hero <?php echo wp_kses_post( $container_class ); ?>">
<div class="inner-hero-container">
Expand Down Expand Up @@ -368,12 +373,14 @@ function eqd_tha_page_header() {
<?php if ( !$alternate_header_style ): ?>
<?php
if ( ! is_search() ) {
if ( ! empty( $bg_url ) ) :
if(!is_page()):
if ( ! empty( $bg_url ) ) :
?>
<span class="hero_image">
<img src="<?php echo $bg_url; ?>" alt="<?php the_title(); ?>" />
</span>
<?php
endif;
endif;
}
?>
Expand Down
4 changes: 2 additions & 2 deletions single-slp_contacts.php
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,8 @@
</div>
<div class="slp-contact-info-loop">
<?php
$contact_email = get_field( 'contact_email_address' );
if ( !empty($contact_email) ) : ?>
$form_shortcode = get_field( 'form_shortcode' );
if ( !empty($form_shortcode) ) : ?>
<h2>Get Started</h2>
<?php $form_code = get_field('form_shortcode'); ?>
<?php echo do_shortcode( $form_code ); ?>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,16 +60,16 @@
</div>
<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'] ); ?>" alt="<?php echo wp_kses_post( $image['alt'] ); ?>"> -->

<img src="<?php echo wp_kses_post( $image['url'] ); ?>"
<img decoding="async" loading="lazy" 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" >
<img class="play" src="<?php echo wp_kses_post( get_template_directory_uri() ) . '/assets/icons/utility'; ?>/play.svg" alt="play video" >
<img decoding="async" loading="lazy" class="play" src="<?php echo wp_kses_post( get_template_directory_uri() ) . '/assets/icons/utility'; ?>/play.svg" alt="play video" >
</button>
<?php endif; ?>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
<?php endif; ?>
<?php if(!empty($youtube_video_id)): ?>
<button class="modal-btn full-width-columns-background-container__video__button" aria-haspopup="dialog" data-modal="modal1" aria-label="Open Video" id="play-iframe" >
<img class="play" src="<?php echo wp_kses_post( get_template_directory_uri() ) . '/assets/icons/utility'; ?>/play.svg" alt="play video" >
<img decoding="async" loading="lazy" class="play" src="<?php echo wp_kses_post( get_template_directory_uri() ) . '/assets/icons/utility'; ?>/play.svg" alt="play video" >
</button>
<?php endif; ?>
</div>
Expand Down

0 comments on commit c8c18f9

Please sign in to comment.