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

Feature/local dev branch
equalizedigital · Nov 9, 2023 · 144e87a · 144e87a
2 parents 75a68ec + e15bb7a
commit 144e87a
Show file tree

Hide file tree

Showing 28 changed files with 337 additions and 159 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/js/global-min.js b/assets/js/global-min.js
diff --git a/assets/js/src/global.js b/assets/js/src/global.js
@@ -741,9 +741,9 @@ window.addEventListener("load", function () {
 		if (highlightButton) {
 			let items = document.querySelectorAll('.team-hightlight-block-container-team-hightlight-member');
 			let initText = highlightButtonText.innerText;
-			if (items.length >= 4) {
+			let tabOpen = false;
 
-				let tabOpen = false;
+			if (items.length >= 4) {
 
 				if (windowWidth <= 768) {
 					items.forEach(function (item, index) {
@@ -764,7 +764,6 @@ window.addEventListener("load", function () {
 				}
 
 				highlightButton.addEventListener('click', function () {
-					console.log('eee')
 					// Remove the "hidden" class and add an "animate" class for each item
 					items.forEach(function (item) {
 
@@ -909,7 +908,6 @@ window.addEventListener('DOMContentLoaded', () => {
 
 
 		const observer = new IntersectionObserver(entries => {
-			console.log(observer)
 			entries.forEach(entry => {
 				const id = entry.target.getAttribute('id');
 				if (entry.intersectionRatio > 0) {

diff --git a/assets/scss/blocks/form-column.scss b/assets/scss/blocks/form-column.scss
@@ -54,6 +54,8 @@
                         position: relative;
                         border-radius: 10px;
                         z-index: 12;
+                        box-shadow: 0px 15px 27px rgba(161,165,165,0.25);
+
                         @include media(">tablet") {
                             padding: 70px 85px;
                         }

diff --git a/assets/scss/blocks/full-width-columns-background.scss b/assets/scss/blocks/full-width-columns-background.scss
@@ -78,14 +78,15 @@
 
         &-content {
             padding: 45px $container-padding;
-
+            // text-align: center;
             @include media(">tablet") {
                 padding: 106px 80px;
                 width: 50%;
                 padding: 90px 20px 70px;
                 width: 50%;
                 max-width: 500px;
                 margin: 0 auto;
+                text-align: unset;
 
             }
 

diff --git a/assets/scss/blocks/full-width-columns-cta-inner.scss b/assets/scss/blocks/full-width-columns-cta-inner.scss
@@ -69,6 +69,7 @@
 
         &-content {
             padding: 45px $container-padding;
+            text-align: center;
 
             @include media(">tablet") {
                 padding: 106px 80px;
@@ -77,7 +78,7 @@
                 width: 50%;
                 max-width: 500px;
                 margin: 0 auto;
-
+                text-align: unset;
             }
 
             .title {

diff --git a/assets/scss/blocks/tab-block.scss b/assets/scss/blocks/tab-block.scss
@@ -115,7 +115,7 @@ button.tab-block-container__heading__button:hover {
 
     .tab-block-container-tab-block_content_items_item_container:nth-last-child(1) {
         //border: none;
-        padding-bottom: 0;
+        // padding-bottom: 0;
         @include media(">tablet") {
             padding-bottom: 0;
         }

diff --git a/assets/scss/blocks/tabbed-content.scss b/assets/scss/blocks/tabbed-content.scss
@@ -41,7 +41,7 @@
         &__nav-item {
             padding: 0;
             display: flex;
-            min-width: 182px;
+            min-width: 120px;
             @include media(">tablet") {
                 min-width: 137px;
             }

diff --git a/assets/scss/blocks/table-of-contents.scss b/assets/scss/blocks/table-of-contents.scss
@@ -1,7 +1,9 @@
 .page {
     .table-of-contents-block.post_format_style-standard {
         .toc-nav-container {
-            display: block;
+            @include media(">tablet") {
+                display: block;
+            }
         }
 
         .table-of-contents-block-container-main {
@@ -153,18 +155,9 @@
         /* These are technically the same, but use both */
         overflow-wrap: break-word;
         word-wrap: break-word;
-
-        -ms-word-break: break-all;
-        /* This is the dangerous one in WebKit, as it breaks things wherever */
-        word-break: break-all;
         /* Instead use this non-standard one: */
-        word-break: break-word;
+        word-break: break-word; 
 
-        /* Adds a hyphen where the word breaks, if supported (No Blink) */
-        -ms-hyphens: auto;
-        -moz-hyphens: auto;
-        -webkit-hyphens: auto;
-        hyphens: auto;
     }
 }
 
@@ -323,6 +316,9 @@
         display: inline-flex;
         justify-content: flex-end;
         align-items: center;
+        .btn, .wp-block-button__link{
+            min-width: 48px;
+        }
     }
 
     .contents-nav-mobile-header-dropdown-select .text {

diff --git a/assets/scss/blocks/team-hightlight.scss b/assets/scss/blocks/team-hightlight.scss
@@ -2,7 +2,7 @@
     padding: 40px 0 20px;
 
     @include media(">tablet") {
-        padding: 100px 0 150px;
+        padding: 100px 0 50px;
     }
 
     &-styling-1 {
@@ -18,7 +18,6 @@
         .team-hightlight-block-container-team-hightlight-member__photo img{
             @include media("<tablet") {
                 height: 33vw;
-
             }
         }
 
@@ -36,6 +35,7 @@
         }
 
         .team-hightlight-block-container-team-hightlight {
+            grid-template-columns: repeat(2, 1fr);
             @include media(">tablet") {
                 grid-template-columns: repeat(4, 1fr);
             }
@@ -45,8 +45,11 @@
             grid-template-columns: 1fr;
             border: none;
             max-height: none;
+
 
-            @include media(">tablet") {}
+            @include media("<tablet") {
+                border-radius: 0;
+            }
         }
 
         .team-hightlight-block-container-header__title {
@@ -68,12 +71,9 @@
                 width: 100%;
                 object-fit: cover;
                 object-position: center;
-                border-radius: 0px;
 
                 @include media(">tablet") {
                     height: 220px;
-                border-radius: 10px;
-
                 }
             }
         }
@@ -82,7 +82,7 @@
     &-container {
         max-width: 1168px;
         margin: 0 auto;
-        padding: 0 24px;
+        // padding: 0 24px;
 
         &-header {
             margin-bottom: 20px;
@@ -111,7 +111,7 @@
             &-hightlight {
                 padding: 0 !important;
                 display: grid;
-                grid-template-columns: repeat(2, 1fr);
+                grid-template-columns: repeat(1, 1fr);
                 gap: 0 20px;
                 @include media(">tablet") {
                     gap: 20px;

diff --git a/assets/scss/blocks/vendor-information-block.scss b/assets/scss/blocks/vendor-information-block.scss
@@ -64,10 +64,9 @@
             display: flex;
             justify-content: space-between;
             align-items: center;
-
+            margin-top: 20px;
             @include media("<tablet") {
                 flex-direction: column;
-                margin-top: 20px;
             }
 
             &.btn {
@@ -88,11 +87,12 @@
                 font-size: 15px;
                 font-style: normal;
                 font-weight: 400;
-                line-height: 70px;
+                line-height: 20px;
                 display: flex;
                 gap: 14px;
                 align-items: center;
                 justify-content: center;
+                margin-left: auto;
 
                 span {
                     display: inline-flex;
@@ -325,11 +325,10 @@
                 .subtext {
                     color: #000;
                     text-align: center;
-                    font-size: 12px;
+                    font-size: 16px;
                     font-style: normal;
                     font-weight: 300;
-                    line-height: 13px;
-                    //108.333%
+                    line-height: 20px;
                 }
             }
 

diff --git a/assets/scss/blocks/vendor-repeater.scss b/assets/scss/blocks/vendor-repeater.scss
@@ -7,10 +7,11 @@
             justify-content: center;
         }
     }
+
     &_container_items_table {
         border: 1px solid #D9D9D9;
         display: table;
-        
+
 
         @include media("<tablet") {
             display: none;
@@ -19,12 +20,16 @@
         thead {
             display: none;
         }
+
         .btn {
             min-width: 175px;
             display: inline-flex;
             align-items: center;
             justify-content: center;
+            font-size: 15px;
+            line-height: 20px;
         }
+
         img {
             max-width: 150px;
             margin: 0 auto;
@@ -69,6 +74,7 @@
                     &:nth-last-child(1) {
                         border-right: none;
                     }
+
                     a {
                         text-decoration: none;
                     }
@@ -102,7 +108,8 @@
             font-style: normal;
             font-weight: 600;
             line-height: 20px;
-            a{
+
+            a {
                 text-decoration: none;
                 color: inherit;
                 font-weight: inherit;
@@ -265,6 +272,7 @@
             max-width: 160px;
             margin: 0 auto;
             display: inline-flex;
+
             @include media("<tablet") {
                 margin: 0;
             }
@@ -306,13 +314,15 @@ section.vendor_disclosure {
                 display: inline;
                 font-weight: bold;
             }
-            
+
         }
+
         li::marker {
             font-weight: 700;
             vertical-align: super;
             font-size: 80%;
         }
+
         a {
             color: var(--WCAG-Green, #547C2D);
         }

diff --git a/assets/scss/modules/_base-styles.scss b/assets/scss/modules/_base-styles.scss
@@ -33,7 +33,7 @@
 		} @else if 2 == $size {
 			@include font-sizes( 25px, 25px, 35px );
 		} @else if 3 == $size {
-			@include font-sizes( 20px, 20px, 30px );
+			@include font-sizes( 20px, 20px, 20px );
 		} @else if 4 == $size {
 			@include font-sizes( 18px, 18px, 20px );
 		} @else if 5 == $size {

diff --git a/assets/scss/partials/_archive.scss b/assets/scss/partials/_archive.scss
@@ -104,6 +104,13 @@
 		}
 	}
 }
+
+.press-archive-page{
+	.site-main-article-content {
+		padding-bottom: 0;
+	}
+}
+
 .archive {
 	.site-main-article-content {
 		max-width: 1168px;