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

Feature/local dev branch
equalizedigital · Oct 24, 2023 · c33e3bf · c33e3bf
2 parents 96be002 + 623627a
commit c33e3bf
Show file tree

Hide file tree

Showing 12 changed files with 64 additions and 54 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/calculator-signup.scss b/assets/scss/blocks/calculator-signup.scss
@@ -1,13 +1,16 @@
-.table-of-contents-block{
+.table-of-contents-block {
     .calculator-signup-block {
         border-radius: 10px;
-        overflow: hidden;
+
     }
 }
+
 .calculator-signup-block {
     background: #625089;
     padding: 0;
     margin: 0 0;
+    border-radius: 10px;
+    overflow: hidden;
 
     @include media(">tablet") {
         margin: 0 0;
@@ -25,13 +28,14 @@
 
     &-image {
         margin: 0;
+
         @include media(">tablet") {
             position: absolute;
             top: 0;
             left: 0;
             bottom: 0;
             display: flex;
-            width: 40%;
+            width: 35%;
         }
 
         img {
@@ -47,18 +51,23 @@
         display: flex;
         flex-direction: column;
         justify-content: center;
+
         @include media(">tablet") {
             padding: 40px 65px;
             width: 70vw;
-            margin: 0 auto 0 40%;
+            margin: 0 auto 0 35%;
+            min-height: 400px;
         }
+
         @include media(">desktop") {
-            padding: 80px 130px;
+            padding: 40px 10%;
         }
-        .btn{
+
+        .btn {
             margin-top: 20px;
             display: inline-block;
         }
+
         &-list {
             margin: 30px 0 0;
             display: grid;
@@ -79,15 +88,16 @@
                 line-height: 40px;
             }
         }
-        a {
-        }
+
+        a {}
+
         .text {
             color: #FFF;
             font-size: 18px;
             font-style: normal;
             font-weight: 400;
-            line-height: 28px; 
-            
+            line-height: 28px;
+
         }
     }
 }
@@ -97,7 +107,8 @@
     grid-template-columns: 30px 1fr;
     gap: 20px;
     color: #FFF;
-    a{
+
+    a {
         color: white;
     }
 }

diff --git a/assets/scss/blocks/resource-links.scss b/assets/scss/blocks/resource-links.scss
@@ -368,9 +368,10 @@
             }
 
             &-loop {
-                display: grid;
-                gap: 20px;
                 align-items: flex-start;
+                display: flex;
+                flex-direction: column;
+
                 &-ul{
                     list-style: none;
                     padding: 0!important;

diff --git a/assets/scss/partials/_navigation.scss b/assets/scss/partials/_navigation.scss
@@ -116,6 +116,10 @@ header.site-header {
 					display: flex;
 					align-items: center;
 					gap: 28px;
+					padding: 0;
+					@media screen and (max-width:1150px) and (min-width:900px) {
+						gap: 10px;
+					}
 
 					@media screen and (max-width:900px) and (min-width:768px) {
 						gap: 10px;

diff --git a/assets/scss/partials/_singular.scss b/assets/scss/partials/_singular.scss
@@ -1042,7 +1042,7 @@ img.wprm-comment-rating {
 			@include media(">tablet") {
 				line-height: 70px;
 				font-size: 70px;
-				min-width: unset;
+				min-width: 95%;
 			}
 		}
 
@@ -1116,14 +1116,17 @@ img.wprm-comment-rating {
 			flex-direction: column;
 		}
 
+		&.site-main-article__author-data_editor{
+			gap: 20px;
+		}
+
 		.article_author {
 			display: flex;
 			align-items: center;
 		}
 	}
 	.auth-editor-container {
 		display: flex;
-
 		gap: 20px;
 		@include media("<tablet") {
 			flex-wrap: wrap;
@@ -1222,6 +1225,7 @@ img.wprm-comment-rating {
 		border-radius: 50%;
 		width: 45px;
 		height: 45px;
+		max-width: 45px;
 	}
 
 	.author_info {

diff --git a/assets/scss/partials/_site-header.scss b/assets/scss/partials/_site-header.scss
@@ -16,6 +16,10 @@
     position: relative;
     margin: 19px auto 11px;
     margin-right: 100px;
+	@media screen and (max-width:1150px) and (min-width:900px) {
+		margin-right: 10px;
+	}
+
 	@media screen and (max-width:900px) and (min-width:768px) {
 		margin-right: 20px;
 	}

diff --git a/config.codekit3 b/config.codekit3
@@ -7,7 +7,7 @@
       "uuidString" : "F098CAB6-68FD-4BF6-AE0A-27C6B360832B"
     }
   ],
-  "creatorBuild" : "34484",
+  "creatorBuild" : "34518",
   "files" : {
     "\/.github\/workflows\/develop.yml" : {
       "cB" : 0,
@@ -5171,9 +5171,6 @@
         "active" : 0,
         "optionString" : "'except-parens'"
       },
-      "no-return-await" : {
-        "active" : 0
-      },
       "no-script-url" : {
         "active" : 0
       },

diff --git a/inc/layouts.php b/inc/layouts.php
@@ -335,10 +335,10 @@ function eqd_single_fullwidth_content() {
 				?>
 
 
-			<div class="site-main-article__author-data">
 
+			<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">
-				<div class="article_author">
+					<div class="article_author">
 					<?php
 					// Author
 					$id_meta        = get_the_author_meta( 'ID' );
@@ -347,7 +347,6 @@ function eqd_single_fullwidth_content() {
 					?>
 					<span class="entry-author">
 						<?php echo get_avatar( $id_meta, 40 ); ?>
-
 						<span class="entry-info">
 							<span>
 								Written By <?php echo get_author_posts_link_by_id( $id_meta ); ?>

diff --git a/partials/content/header/main.php b/partials/content/header/main.php
@@ -27,24 +27,10 @@
 
 			if ( $menu_items and is_array( $menu_items ) ) :
 				foreach ( $menu_items as $item ) {
-					$link         = $item['link'];
-					$columns      = $item['columns'];
-					$column_count = count( $columns );
-					$current_url  = home_url( $_SERVER['REQUEST_URI'] );
-
-					switch ( $column_count ) {
-						case 1:
-							$number_of_columns = 'one column';
-							break;
-						case 2:
-							$number_of_columns = 'two column';
-							break;
-						case 3:
-							$number_of_columns = 'three column';
-							break;
-						default:
-							$number_of_columns = 'one column';
-					}
+					$link              = $item['link'];
+					$columns           = $item['columns'];
+					$number_of_columns = $item['number_of_columns'];
+					$current_url       = home_url( $_SERVER['REQUEST_URI'] );
 					?>
 
 					<li class="main-nav-link-li 
@@ -54,7 +40,7 @@
 					?>
 					">
 
-						<?php if ( isset( $link[ 'url'] ) && '#' === $link['url'] ) { ?>
+						<?php if ( '#' === $link['url'] ) { ?>
 							<button aria-label="<?php echo $link['title']; ?>" type="button" class="menu-item-main-link 
 															<?php
 															if ( empty( $columns ) ) {

diff --git a/template-parts/blocks/tabbed-content/tabbed-content.php b/template-parts/blocks/tabbed-content/tabbed-content.php
@@ -90,15 +90,15 @@ class="
 					?>
 					<div class="tablet_chevron">
 					<svg xmlns="http://www.w3.org/2000/svg" width="97" height="91" viewBox="0 0 97 91" fill="none">
-	<rect x="97" y="91" width="97" height="91" transform="rotate(-180 97 91)" fill="url(#paint0_linear_1229_724)"/>
-	<path d="M76.6211 53.2427L84.2424 45.6213L76.6211 38" stroke="white" stroke-linecap="round"/>
-	<defs>
-	<linearGradient id="paint0_linear_1229_724" x1="133" y1="117.731" x2="167.5" y2="117.731" gradientUnits="userSpaceOnUse">
-		<stop stop-color="#625089"/>
-		<stop offset="1" stop-color="#625089" stop-opacity="0"/>
-	</linearGradient>
-	</defs>
-</svg>
+						<rect x="97" y="91" width="97" height="91" transform="rotate(-180 97 91)" fill="url(#paint0_linear_1229_724)"/>
+						<path d="M76.6211 53.2427L84.2424 45.6213L76.6211 38" stroke="white" stroke-linecap="round"/>
+						<defs>
+						<linearGradient id="paint0_linear_1229_724" x1="133" y1="117.731" x2="167.5" y2="117.731" gradientUnits="userSpaceOnUse">
+							<stop stop-color="#625089"/>
+							<stop offset="1" stop-color="#625089" stop-opacity="0"/>
+						</linearGradient>
+						</defs>
+					</svg>
 					</div>
 				</div>
 
@@ -139,7 +139,11 @@ class="tabbed-content__content__pane
 											echo '<a href="' . $row['rating']['url'] . '">';
 										}
 										?>
-										<?php echo $row['rating']['title']; ?>
+										<?php 
+										if(!empty($row['rating']['title'])){
+										echo $row['rating']['title']; 
+										}
+										?>
 										<?php
 										if(!empty($row['rating']['url'])){
 											echo '</a>';