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

Feature/local dev branch
equalizedigital · Oct 23, 2023 · e9be7d1 · e9be7d1
2 parents 37cd468 + 873cbc4
commit e9be7d1
Show file tree

Hide file tree

Showing 13 changed files with 244 additions and 177 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/detailed-links.scss b/assets/scss/blocks/detailed-links.scss
@@ -17,6 +17,7 @@
                 border-radius: 10px;
                 max-width: 380px;
                 margin: 0 auto;
+                color: inherit;
                 &_text {
 
                     text-align: center;

diff --git a/assets/scss/blocks/resource-links.scss b/assets/scss/blocks/resource-links.scss
@@ -4,6 +4,7 @@
         max-width: $container-width;
         padding: 0 $container-padding;
         margin: 50px auto;
+
         @include media(">tablet") {
             margin: 150px auto 0;
         }
@@ -65,8 +66,9 @@
                 position: relative;
                 width: 100%;
                 min-width: 327px;
+
                 @include media(">tablet") {
-                display: none;
+                    display: none;
                 }
 
                 .field {
@@ -119,7 +121,7 @@
                 &.active {
                     display: grid;
                 }
-                
+
                 li {
                     display: flex;
                     align-items: center;
@@ -128,7 +130,8 @@
                     padding: 10px 15px;
                     border-bottom: 1px solid var(--dark-gray, #A1A5A5);
                 }
-                a{
+
+                a {
                     display: flex;
                     align-items: center;
                     justify-content: flex-start;
@@ -195,6 +198,7 @@
             font-weight: 700;
             line-height: 40px;
             margin-bottom: 40px;
+
             @include media("<tablet") {
                 text-align: left;
             }
@@ -209,9 +213,10 @@
     &-container {
         max-width: 1120px;
         margin: 0 auto;
-        
+
         max-width: $container-width;
         padding: 0 $container-padding;
+
         @include media(">tablet") {
             padding: 100px $container-padding;
         }
@@ -226,6 +231,7 @@
 
         &-header {
             display: none;
+
             .title {
                 color: brand-color('tertiary');
                 font-size: 35px;
@@ -234,6 +240,7 @@
                 line-height: 40px;
                 margin-bottom: 40px;
             }
+
             @include media(">tablet") {
                 display: block;
             }
@@ -242,7 +249,8 @@
         &-content {
             display: grid;
             gap: 53px;
-            grid-template-columns:  1fr;
+            grid-template-columns: 1fr;
+
             @include media(">tablet") {
                 grid-template-columns: 1fr 1fr;
                 gap: 110px;
@@ -253,18 +261,15 @@
             }
 
             &-loop-item {
-                border-bottom: 1px solid #D9D9D9;
-                padding: 0 20px 20px;
+
+                padding: 0 20px ;
                 text-decoration: none;
                 display: flex;
-    flex-direction: column;
-    justify-content: center;
-
+                flex-direction: column;
+                justify-content: center;
 
-                &:nth-child(1) {
-                    padding-top: 20px;
-                    border-top: 1px solid #D9D9D9;
-                }
+
+
 
                 .author {
                     display: flex;
@@ -280,7 +285,7 @@
                         display: flex;
                         align-items: center;
                         justify-content: center;
-                  
+
                     }
                 }
 
@@ -365,6 +370,21 @@
             &-loop {
                 display: grid;
                 gap: 20px;
+                align-items: flex-start;
+                &-ul{
+                    list-style: none;
+                    padding: 0!important;
+                    margin: 0;
+                    &-li{
+                        padding:  20px 0!important;
+
+                        border-top: 1px solid #D9D9D9;
+                        &:nth-child(1) {
+                            padding-top:20px !important;
+                            border-top: 1px solid #D9D9D9;
+                        }
+                    }
+                }
             }
         }
     }

diff --git a/assets/scss/partials/_editor-class.scss b/assets/scss/partials/_editor-class.scss
@@ -147,13 +147,12 @@
 
 blockquote.wp-block-quote {
     max-width: 740px;
-    margin: 0px auto 10px !important;
+    margin: 60px auto 10px !important;
     padding: 100px 24px 50px;
     display: grid;
     gap: 27px;
     background: var(--Purple, #625089);
     position: relative;
-    margin: 0;
 
     &::before {
         content: '';

diff --git a/assets/scss/partials/_singular.scss b/assets/scss/partials/_singular.scss
@@ -612,6 +612,7 @@ img.wprm-comment-rating {
 		margin: 0 0 60px;
 		list-style: none;
 		gap: 20px;
+		padding: 0;
 
 		a {
 			display: flex;
@@ -1652,6 +1653,16 @@ section.refinance_lender_section {
 
 /* Sidebar
 --------------------------------------------- */
+.archive {
+	.sidebar_container{
+		@include media("<tablet") {
+			display: block;
+		}
+		@media screen and(max-width:1200px) and (min-height:768px) {
+			margin-right: 20px;
+		}
+	}
+}
 .sidebar_container {
 	position: relative;
 	margin-top: -60px;

diff --git a/inc/loop.php b/inc/loop.php
@@ -90,7 +90,7 @@ function eqd_single_header() {
 		$background_image        = get_field( 'background_image', $page_id );
 		$title_max_width_desktop = get_field( 'title_max_width_desktop', $page_id );
 		$link                    = get_field( 'single_post_link', $page_id );
-
+		$output = null;
 		$container_class         = '';
 		if ( get_field( 'post_format_style' ) == 'full-width' ) {
 			$container_class .= 'hero_relative';

diff --git a/inc/template-tags.php b/inc/template-tags.php
@@ -137,7 +137,7 @@ function eqd_tha_footer_cta() {
 				<h2 class="title"><?php echo $cta_title; ?></h2>
 				<div class="text"><?php echo $copy; ?></div>
 
-				<?php if(!empty($link['url'])): ?>
+				<?php if ( ! empty( $link['url'] ) ) : ?>
 				<div class="link">
 					<a class="btn btn-dark-bg" href="<?php echo wp_kses_post( $link['url'] ); ?>">
 						<?php echo wp_kses_post( $link['title'] ); ?>
@@ -215,8 +215,8 @@ function eqd_tha_page_header() {
 			if ( ! empty( $background_image['url'] ) ) {
 				$bg_url = $background_image['url'];
 			}
-		} elseif( is_tax()){
-			$term = get_queried_object();
+		} elseif ( is_tax() ) {
+			$term    = get_queried_object();
 			$term_id = $term->term_id;
 
 			$alternative_title       = get_field( 'alternative_title', 'category_' . $term_id );
@@ -239,7 +239,7 @@ function eqd_tha_page_header() {
 			$center_text             = get_field( 'center_text', $page_id );
 			$heading_link            = get_field( 'heading_link' );
 			$padding_size            = get_field( 'padding_size', $page_id );
-			$container_class = null;
+			$container_class         = null;
 
 			if ( is_archive() ) {
 				$term             = get_queried_object();
@@ -283,12 +283,13 @@ function eqd_tha_page_header() {
 
 				<h1 class="title" style="<?php echo wp_kses_post( ! empty( $title_max_width_desktop ) ? 'max-width:' . $title_max_width_desktop . '%;' : '' ); ?>">
 
-					<?php if ( is_search() ) : 
+					<?php
+					if ( is_search() ) :
 						// Search
 						$search_term = get_search_query();
 						?>
-						Search: <?php  echo wp_kses_post($search_term ); ?>
-					<?php else: ?>
+						Search: <?php echo wp_kses_post( $search_term ); ?>
+					<?php else : ?>
 
 						<?php if ( ! empty( $sub_heading ) ) : ?>
 							<div class="sub_heading"><?php echo wp_kses_post( $sub_heading ); ?></div>
@@ -297,12 +298,12 @@ function eqd_tha_page_header() {
 						<?php
 						if ( is_tax() ) {
 							$current_term = get_queried_object();
-							if ( $current_term->taxonomy !== 'occupation') {
+							if ( $current_term->taxonomy !== 'occupation' ) {
 								echo 'Resources for ';
 							}
 						}
-						if(!empty( $alternative_title )){
-							echo wp_kses_post($alternative_title  );
+						if ( ! empty( $alternative_title ) ) {
+							echo wp_kses_post( $alternative_title );
 						} else {
 							if ( is_page() ) {
 								echo wp_kses_post( get_the_title() );
@@ -314,15 +315,15 @@ function eqd_tha_page_header() {
 								echo 'Not found, error 404';
 							}
 						}
-						
+
 						?>
 					<?php endif; ?>
 				</h1>
 
 				<span class="subtitle">
 					<?php
-					if ( !is_search() ) {
-						if(!empty($subtitle)){
+					if ( ! is_search() ) {
+						if ( ! empty( $subtitle ) ) {
 							echo wp_kses_post( $subtitle );
 						} else {
 							echo wp_kses_post( get_field( 'title_copy', 'option' ) );
@@ -339,14 +340,15 @@ function eqd_tha_page_header() {
 
 			</div>
 
-			<?php 
-			if ( !is_search() ) {
-				if ( ! empty( $bg_url ) ) : ?>
+			<?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;
 			}
 			?>