Skip to content

Commit

Permalink
Merge pull request #537 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 24, 2023
2 parents a9507fb + 12edf1f commit 67f524b
Show file tree
Hide file tree
Showing 9 changed files with 51 additions and 9 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.

4 changes: 3 additions & 1 deletion assets/scss/blocks/full-width-columns-background.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@
}

.full-width-columns-background-block {
background: #625089;
background: brand-color('tertiary');
border-radius: 10px;
overflow: hidden;

.link {
display: inline-flex;
Expand Down
10 changes: 10 additions & 0 deletions assets/scss/blocks/resource-blocks.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
.block-editor-block-list__block{
.resource-blocks-block-container-list-item a {
height: auto;
}
}
.resource-blocks-block {
padding: 90px 0;
display: grid;
Expand Down Expand Up @@ -44,13 +49,18 @@
grid-template-columns: repeat(2, 1fr);
}

&__block{
padding: 0!important;
}

a {
border: 1px solid var(--Dark-Gray, #A1A5A5);
display: grid;
text-decoration: none;
padding: 45px;
border-radius: 10px;
height: 100%;

&:focus,
&:hover {
background: #82BC46;
Expand Down
9 changes: 9 additions & 0 deletions assets/scss/partials/_navigation.scss
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,15 @@ header.site-header {
}
}
}
&.submenu-column__single_menu {
.sub-menu {
@include media(">tablet") {
grid-template-columns: repeat(3, 1fr);
gap: 0 15px;
display: grid;
}
}
}
}

.sub_menu {
Expand Down
25 changes: 23 additions & 2 deletions assets/scss/partials/_singular.scss
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,19 @@
}
}

.content-sidebar{
.entry-content {
.alignfull {
max-width: unset!important;
width: auto!important;
position: relative;
left: 0!important;
right: 0!important;
margin-left: 0!important;
margin-right: 0!important;
}
}
}
.entry-content>*,
.block-area>* {

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

.comment img {
width: 56px;
height: 56px;

border-radius: 50%;
max-width: 56px;
@include media(">tablet") {
width: 56px;
height: 56px;
}
}

.img-thumbnail {
Expand Down Expand Up @@ -1835,6 +1852,10 @@ html {
}
}

&_item_info_author{
color: black;
}

&_item_image {
margin: 0 0 32px;

Expand Down
2 changes: 1 addition & 1 deletion inc/loop.php
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ function eqd_single_header() {
</div>
<div class="header_editorial_statement-container__copy">
<p>
At Student Loan Planner, we follow a strict <a href="<?php echo esc_url( get_site_url( null, '/editorial-ethics-policy/' ) ); ?>">editorial ethics policy</a>. This post may contain references to products from our partners within the guidelines of this policy. Read our <button class="modal-btn btn-style-link" aria-haspopup="true" aria-expanded="false" aria-controls="modal_disclosure" data-modal="modal_disclosure" aria-label="Open Disclosure Modal">advertising disclosure</button> to learn more.
At Student Loan Planner, we follow a strict <a href="<?php echo esc_url( get_site_url( null, '/editorial-ethics-policy/' ) ); ?>">editorial ethics policy</a>. This post may contain references to products from our partners within the guidelines of this policy. Read our <button class="modal-btn btn-style-link" aria-haspopup="true" aria-expanded="false" aria-controls="modal_disclosure" data-modal="modal_disclosure" aria-label="Open Disclosure Modal">advertising disclosure</button> to learn more.
</p>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions template-parts/blocks/query-loop/block.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "acf/query-loop-block",
"title": "Query Loop",
"description": "A block that allows you to query and loop through posts, pages, or custom post types.",
"title": "Posts by Author",
"description": "A block that allows you to display the most recent post by selected authors.",
"category": "custom-blocks",
"icon": "update",
"keywords": [
Expand Down

0 comments on commit 67f524b

Please sign in to comment.