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

Feature/local dev branch
equalizedigital · Nov 22, 2023 · 5b4fd8a · 5b4fd8a
2 parents c2e6a32 + c19e6d1
commit 5b4fd8a
Show file tree

Hide file tree

Showing 9 changed files with 127 additions and 31 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/accordion.scss b/assets/scss/blocks/accordion.scss
@@ -32,11 +32,9 @@
         .accordion-block-container-accordion__content {
             padding: 20px 20px 0;
             display: none;
-            color: var(--Black, #000);
-            font-size: 14px;
+            color: black;
             font-style: normal;
             font-weight: 400;
-            line-height: 24px;
 
 
             &.active-content {

diff --git a/assets/scss/partials/_navigation.scss b/assets/scss/partials/_navigation.scss
@@ -16,7 +16,7 @@ header.site-header {
 		}
 
 		#nav-icon {
-			z-index: 100!important;
+			z-index: 100 !important;
 
 			span {
 				background-color: white;
@@ -29,12 +29,13 @@ header.site-header {
 			}
 		}
 
-		.nav-icon, #nav-icon{
+		.nav-icon,
+		#nav-icon {
 			display: none;
 		}
 
-		.mobile-header-link{
-			z-index: 1!important;
+		.mobile-header-link {
+			z-index: 1 !important;
 		}
 	}
 
@@ -49,6 +50,7 @@ header.site-header {
 
 		.mobile-header-link {
 			display: none;
+
 			@include media("<1070px") {
 				position: absolute;
 				top: 8px;
@@ -59,6 +61,12 @@ header.site-header {
 				padding: 8px 15px;
 				font-size: 16px;
 			}
+
+			&:focus-within,
+			&:focus,
+			&:focus-visible {
+				outline: 2px solid white;
+			}
 		}
 	}
 }
@@ -188,7 +196,7 @@ header.site-header {
 								top: 50%;
 								transform: translate(0%, -50%);
 								bottom: 0;
-								border: 2px solid blue;
+								border: 2px solid white;
 								width: auto;
 								height: 50%;
 
@@ -330,6 +338,12 @@ header.site-header {
 									display: none;
 								}
 
+								&:focus-within,
+								&:focus,
+								&:focus-visible {
+									outline: 2px solid white;
+								}
+
 								.sub_menu_back__icon {
 									position: relative;
 									width: 10px;
@@ -737,6 +751,12 @@ body {
 	top: 15px;
 	left: 15px;
 
+	&:focus-within,
+	&:focus,
+	&:focus-visible {
+		outline: 2px solid white;
+	}
+
 	span {
 		display: block;
 		position: absolute;
@@ -819,6 +839,12 @@ body {
 			font-weight: 600;
 			line-height: 30px;
 			border-radius: 0;
+
+			&:focus-within,
+			&:focus,
+			&:focus-visible {
+				outline: 2px solid white;
+			}
 		}
 	}
 
@@ -852,6 +878,8 @@ body {
 			padding: 24px 0;
 			padding-left: 40px;
 			transition: all .3s;
+
+
 		}
 
 		input:focus+label {
@@ -869,6 +897,12 @@ body {
 			border: none;
 			padding: 24px 0;
 			padding-left: 40px;
+
+			&:focus-within,
+			&:focus,
+			&:focus-visible {
+				outline: 2px solid white;
+			}
 		}
 
 		input::placeholder {
@@ -904,6 +938,12 @@ body {
 		padding: 0;
 		margin-left: 20px;
 
+		&:focus-within,
+		&:focus,
+		&:focus-visible {
+			outline: 2px solid white;
+		}
+
 		img {
 			width: 20px;
 			height: 20px;
@@ -919,6 +959,12 @@ body {
 		min-height: 43px;
 		display: inline-flex;
 		align-items: center;
+
+		&:focus-within,
+		&:focus,
+		&:focus-visible {
+			outline: 2px solid white;
+		}
 	}
 
 
@@ -966,6 +1012,12 @@ body {
 		justify-content: center;
 		cursor: pointer;
 
+		&:focus-within,
+		&:focus,
+		&:focus-visible {
+			outline: 2px solid white;
+		}
+
 		img {
 			width: 100%;
 			height: 100%;
@@ -989,6 +1041,8 @@ body {
 		font-weight: 400;
 		line-height: 1;
 		border: none;
+
+
 	}
 
 	form:hover {
@@ -1000,6 +1054,15 @@ body {
 		}
 	}
 
+	input {
+
+		&:focus-within,
+		&:focus,
+		&:focus-visible {
+			outline: 2px solid white;
+		}
+	}
+
 	input:focus+label {
 		top: -20px;
 	}
@@ -1029,6 +1092,17 @@ body {
 	gap: 20px;
 	align-items: center;
 	justify-content: center;
+
+	.btn {
+		padding: 8px 15px;
+		min-width: 0;
+
+		&:focus-within,
+		&:focus,
+		&:focus-visible {
+			outline: 2px solid white;
+		}
+	}
 }
 
 .search-popup label {

diff --git a/assets/scss/partials/_singular.scss b/assets/scss/partials/_singular.scss
@@ -947,6 +947,10 @@ img.wprm-comment-rating {
 	.entry-content {
 		padding: 40px 0;
 	}
+	.inner-hero-container .title{
+		font-size: 22px;
+		line-height: 24px;
+	}
 }
 
 .post_type_layout_full-width {
@@ -1131,11 +1135,13 @@ img.wprm-comment-rating {
 			font-style: normal;
 			font-weight: 700;
 			margin: 0 0 20px;
-			font-size: 22px;
-			line-height: 24px;
+
 			min-width: 100%;
 			max-width: 750px;
 
+			font-size: 35px;
+			line-height: 40px;
+
 			@include media(">tablet") {
 				font-size: 42px;
 				line-height: 42px;
@@ -1204,6 +1210,11 @@ img.wprm-comment-rating {
 
 /* site-main-article-content
 --------------------------------------------- */
+.side-main-article-container.inner-hero-alternate-style {
+	.hero_featured_image {
+		margin-top: 30px;
+	}
+}
 
 .site-main-article-content {
 	.site-main-article__author-data {

diff --git a/assets/scss/partials/_site-header.scss b/assets/scss/partials/_site-header.scss
@@ -7,21 +7,23 @@
 }
 
 .title-area {
-    float: left;
-    width: 100%;
-    max-width: 150px;
-    text-align: left;
-    z-index: 1100;
-    position: relative;
-    margin: 11px auto;
-    margin-right: 10px;
+	float: left;
+	width: 100%;
+	max-width: 150px;
+	text-align: left;
+	z-index: 1100;
+	position: relative;
+	margin: 11px auto;
+	margin-right: 10px;
+
 	@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;
 	}
+
 	@include media("<1070px") {
 		position: absolute;
 		top: 0;
@@ -30,6 +32,8 @@
 		margin: 8px auto;
 	}
 
+
+
 	h1.site-title,
 	p.site-title {
 		margin: 0;
@@ -47,6 +51,12 @@
 			width: 120px;
 			height: 35px;
 			display: flex;
+
+			&:focus-within,
+			&:focus,
+			&:focus-visible {
+				outline: 2px solid white;
+			}
 		}
 	}
 

diff --git a/inc/template-tags.php b/inc/template-tags.php
@@ -249,7 +249,6 @@ function eqd_tha_page_header() {
 				$bg_url = $background_image['url'];
 			}
 		} else {
-
 			// Load values and assing defaults.
 			$page_id                 = get_the_ID();
 			$alternative_title       = get_field( 'alternative_title', $page_id );
@@ -268,11 +267,9 @@ function eqd_tha_page_header() {
 					$bg_url = $background_image['url'];
 				}
 			} else {
-				$background_image    = get_field( 'background_image', $page_id );
-				$thumbnail_id        = get_post_thumbnail_id( $page_id );
-				$thumbnail_url_array = wp_get_attachment_image_src( $thumbnail_id, 'full' );
-				if ( isset( $thumbnail_url_array[0] ) ) {
-					$background_image = $thumbnail_url_array[0];
+				$image = get_the_post_thumbnail_url($page_id);
+				if ( $image ) {
+					$background_image = $image;
 				}
 				$bg_url = $background_image;
 			}
@@ -373,9 +370,9 @@ function eqd_tha_page_header() {
 				if ( ! is_search() ) {
 					if ( ! empty( $bg_url ) ) :
 						?>
-					<span class="hero_image">
-						<img src="<?php echo $bg_url; ?>" alt="<?php the_title(); ?>" />
-					</span>
+						<span class="hero_image">
+							<img src="<?php echo $bg_url; ?>" alt="<?php the_title(); ?>" />
+						</span>
 						<?php
 					endif;
 				}

diff --git a/index.php b/index.php
@@ -23,6 +23,12 @@
 
 $container_class .= ' post_type_layout_' . $layout_style . ' ';
 
+$side_container_class         = '';
+if ( get_field( 'post_format_style' ) == 'full-width' ) {
+} else {
+	$side_container_class .= 'inner-hero-alternate-style';
+}
+
 tha_content_before();
 
 	echo '<div class="' . $container_class . esc_attr( eqd_class( 'content-area', 'wrap', apply_filters( 'eqd_content_area_wrap', true ) ) ) . '">';
@@ -35,7 +41,7 @@
 
 			tha_single_header();
 
-			echo "<div class='side-main-article-container'>";
+			echo "<div class='side-main-article-container $side_container_class'>";
 				tha_content_before_container();
 				echo "<div class=\"site-main-article-content $container_class\">";