Skip to content

Commit

Permalink
Merge pull request #568 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 Oct 25, 2023
2 parents aaf01f4 + 3d46973 commit 75bad73
Show file tree
Hide file tree
Showing 11 changed files with 134 additions and 44 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.

20 changes: 14 additions & 6 deletions assets/js/src/global.js
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,6 @@ document.addEventListener('DOMContentLoaded', function () {

widgetTitles.forEach(function (title) {
var menuFooterContainer = title.nextElementSibling;
// console.log(menuFooterContainer)
if (menuFooterContainer && menuFooterContainer.classList.contains('menu-footer-container')) {
var containerId = menuFooterContainer.id;
title.setAttribute('aria-controls', containerId);
Expand Down Expand Up @@ -608,12 +607,10 @@ window.addEventListener("DOMContentLoaded", function () {
// resource links
let accordionButtons = document.querySelectorAll('.accordion-block-container-accordion__button');

console.log(accordionButtons,accordionButtons.length,'ed')

if (accordionButtons.length > 0) {
// Accordion
accordionButtons.forEach(button => {
console.log(accordionButtons)

button.addEventListener('click', () => {
const contentId = button.getAttribute('aria-controls');
Expand Down Expand Up @@ -824,12 +821,22 @@ window.addEventListener("load", function () {
//

window.addEventListener('DOMContentLoaded', () => {

let toc_container_entry_content = document.querySelectorAll('.post_type_layout_standard .entry-content');
let toc_container = document.querySelectorAll('.toc_container');
if (toc_container.length > 0) {

if (toc_container.length > 0 || toc_container_entry_content.length>0) {

// Get all <h2> elements within .toc_container
let tocContainer = document.querySelector('.toc_container');
let h2Elements = tocContainer.querySelectorAll('h2');
let tocContainer;
let h2Elements;
if (toc_container.length > 0) {
tocContainer = document.querySelector('.toc_container');
h2Elements = tocContainer.querySelectorAll('h2');
} else if(toc_container_entry_content.length>0){
tocContainer = document.querySelector('.post_type_layout_standard .entry-content');
h2Elements = document.querySelectorAll('.post_type_layout_standard .entry-content >h2');
}

// Create an empty array to store the IDs
const uniqueIds = [];
Expand Down Expand Up @@ -899,6 +906,7 @@ window.addEventListener('DOMContentLoaded', () => {
let activeListItemMobile = null;
let activeListItemSidebar = null;
let toc_content_load_point = document.querySelector('.toc_content_load_point');

const observer = new IntersectionObserver(entries => {

entries.forEach(entry => {
Expand Down
14 changes: 14 additions & 0 deletions assets/scss/blocks/calculator-signup.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,20 @@
}
}

.post_type_layout_standard {
.calculator-signup-container-content {
@include media(">tablet") {
min-height: 230px;
}
}
.calculator-signup-container-content .title {
@include media(">tablet") {
font-size: 25px;
line-height: 30px;
}
}
}

.calculator-signup-block {
background: #625089;
padding: 0;
Expand Down
7 changes: 7 additions & 0 deletions assets/scss/blocks/table-of-contents.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@
}
}

.toc-nav {
&.placeholder{
display: none;
}
}

.table-of-contents-block {
max-width: $container-width;
margin: 0 auto;
Expand Down Expand Up @@ -109,6 +115,7 @@
}

.toc-nav {

ul {
padding: 0;
margin: 0;
Expand Down
7 changes: 2 additions & 5 deletions assets/scss/partials/_editor-class.scss
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,9 @@
}

.list-2col {
display: grid;
grid-template-columns: 1fr;
gap: 0 40px;

padding: 0;
@include media(">tablet") {
grid-template-columns: 1fr 1fr;
columns: 2;
}
li {
width: 100%;
Expand Down
72 changes: 49 additions & 23 deletions assets/scss/partials/_singular.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,15 @@
/* Entry Content
--------------------------------------------- */

.content-sidebar{
.content-sidebar {}

}

.content{
.content {
.entry-content {
max-width: 1120px;
}
}

.full-width-content{
.full-width-content {
.entry-content {
max-width: $container-width;
}
Expand All @@ -30,22 +28,23 @@
max-width: $container-width;
// padding: 30px 0;
margin: 0 auto;

@include media(">tablet") {
// padding: 100px $container-padding;
}

.alignfull {
max-width: unset!important;
width: 100vw!important;
max-width: unset !important;
width: 100vw !important;
position: relative;
left: 50%!important;
right: 50%!important;
margin-left: -50vw!important;
margin-right: -50vw!important;
left: 50% !important;
right: 50% !important;
margin-left: -50vw !important;
margin-right: -50vw !important;
}
}

.content-sidebar{
.content-sidebar {
.entry-content {
.alignfull {
// max-width: unset!important;
Expand All @@ -58,6 +57,7 @@
}
}
}

.entry-content>*,
.block-area>* {

Expand Down Expand Up @@ -180,12 +180,13 @@ img.wprm-comment-rating {
}

.comment img {

border-radius: 50%;
max-width: 56px;

@include media(">tablet") {
width: 56px;
height: 56px;
height: 56px;
}
}

Expand All @@ -198,6 +199,7 @@ img.wprm-comment-rating {
.comment-list {
margin: 0 0 32px;
list-style: none;

li:first-child {
border-top: 0px;
}
Expand Down Expand Up @@ -452,6 +454,7 @@ img.wprm-comment-rating {
max-width: 1168px;
margin: 0 auto;
gap: 60px 116px;

@include media("<tablet") {
display: flex;
flex-direction: column-reverse;
Expand All @@ -474,6 +477,7 @@ img.wprm-comment-rating {
@include media("<tablet") {
width: 100%;
}

.entry-title {
color: white;
font-size: 35px;
Expand Down Expand Up @@ -548,6 +552,7 @@ img.wprm-comment-rating {
display: grid;
grid-template-columns: 1fr;
gap: 0 116px;

@include media(">tablet") {
padding: 0 24px 160px;
gap: 0 40px;
Expand Down Expand Up @@ -682,11 +687,11 @@ img.wprm-comment-rating {
}

&-loop {
padding: 0 0;
padding: 0 0;

@include media(">tablet") {
padding: 72px 0 0;

}

h2 {
Expand Down Expand Up @@ -902,6 +907,19 @@ img.wprm-comment-rating {

/* Inner Page Hero
--------------------------------------------- */
.post_type_layout_standard {

}

.post_type_layout_full-width {
.inner-hero-container .title {
@include media(">tablet") {
min-width: auto;
max-width: 650px;
}
}
}

.inner-hero {
background-color: brand-color('tertiary');
padding: 60px 0;
Expand Down Expand Up @@ -1116,7 +1134,7 @@ img.wprm-comment-rating {
flex-direction: column;
}

&.site-main-article__author-data_editor{
&.site-main-article__author-data_editor {
gap: 20px;
}

Expand All @@ -1125,18 +1143,22 @@ img.wprm-comment-rating {
align-items: center;
}
}

.auth-editor-container {
display: flex;
gap: 20px;

@include media("<tablet") {
flex-wrap: wrap;
}
}

.entry-author {
display: flex;

align-items: center;
gap: 20px;

@include media("<tablet") {
flex-wrap: wrap;
}
Expand Down Expand Up @@ -1234,7 +1256,8 @@ img.wprm-comment-rating {
font-style: normal;
font-weight: 400;
line-height: 16px;
a{

a {
color: inherit;
}
}
Expand Down Expand Up @@ -1565,10 +1588,10 @@ section.refinance_lender_section {
grid-template-columns: auto 1fr;
align-items: center;
gap: 20px;

@include media(">tablet") {
display: flex;

align-items: center;
}
}
Expand Down Expand Up @@ -1599,6 +1622,7 @@ section.refinance_lender_section {
padding-inline-start: 0px;
gap: 20px;
list-style: none;

@include media(">tablet") {
margin-left: auto;
justify-content: center;
Expand Down Expand Up @@ -1687,15 +1711,17 @@ section.refinance_lender_section {
/* Sidebar
--------------------------------------------- */
.archive {
.sidebar_container{
.sidebar_container {
@include media("<tablet") {
display: block;
}

@media screen and(max-width:1200px) and (min-width:768px) {
margin-right: 20px;
}
}
}

.sidebar_container {
position: relative;
margin-top: -60px;
Expand Down Expand Up @@ -1868,7 +1894,7 @@ html {
}
}

&_item_info_author{
&_item_info_author {
color: black;
}

Expand Down
Loading

0 comments on commit 75bad73

Please sign in to comment.