Skip to content

Commit

Permalink
Merge pull request #586 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
tronsymphony authored Oct 25, 2023
2 parents 2797412 + 0bf12eb commit f0b172e
Show file tree
Hide file tree
Showing 10 changed files with 65 additions and 57 deletions.
2 changes: 1 addition & 1 deletion assets/css/main.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/css/main.css.map
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/js/menu-min.js
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions assets/js/src/menu.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -236,12 +236,12 @@
var ifToClick = true;
$(window).on("resize", function () {
if (nav.hasClass("menu-mobile-open")) {
if ($(window).width() > 880 && ifToClick) {
if ($(window).width() > 1070 && ifToClick) {
navIcon.click();
nav.removeClass("menu-mobile-open");
$("html").removeClass("overflow-hidden");
ifToClick = false;
} else if ($(window).width() <= 880 && !ifToClick) {
} else if ($(window).width() <= 1070 && !ifToClick) {
ifToClick = true;
}
}
Expand Down
81 changes: 37 additions & 44 deletions assets/scss/partials/_navigation.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ header.site-header {
margin: 0 auto;
padding: 0 25px;

@include media(">tablet") {
@include media(">1070px") {
overflow: auto;
}
}
Expand All @@ -46,7 +46,7 @@ header.site-header {
.site-header {
position: relative;

@include media("<tablet") {
@include media("<1070px") {
&:after {
content: close-quote;
position: absolute;
Expand All @@ -60,7 +60,7 @@ header.site-header {
}

&.scroll_active {
@include media("<tablet") {
@include media("<1070px") {
z-index: 1;
}
}
Expand All @@ -71,7 +71,7 @@ header.site-header {
align-items: center;

&:after {
@include media("<tablet") {
@include media("<1070px") {
content: close-quote;
position: absolute;
top: 0;
Expand All @@ -86,7 +86,7 @@ header.site-header {
display: flex;
width: 100%;

@include media(">=tablet") {}
@include media(">=1070px") {}

.main-logo {
display: flex;
Expand All @@ -99,15 +99,15 @@ header.site-header {
justify-content: space-between;
width: 100%;

@include media("<medium") {
@include media("<1070px") {
position: static;
}

@include media("<large") {}

@include media("<medium") {}
@include media("<1070px") {}

@include media("<=mobile_menu") {
@include media("<=1070px") {
display: none;
}

Expand All @@ -117,13 +117,6 @@ header.site-header {
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;
}

li:not(:last-child) {
ul li {
Expand All @@ -146,10 +139,10 @@ header.site-header {
display: inline-flex;

align-items: center;
@include media(">tablet") {
@include media(">1070px") {
height: 80px;
}
@include media("<tablet") {
@include media("<1070px") {
color: white;
font-size: 23px;
font-style: normal;
Expand All @@ -174,7 +167,7 @@ header.site-header {
width: auto;
height: 50%;

@include media("<tablet") {
@include media("<1070px") {
height: 100%;
// background: brand-color('primary');
}
Expand All @@ -185,7 +178,7 @@ header.site-header {
>li {
list-style: none;

@include media("<tablet") {
@include media("<1070px") {
width: 100%;
}

Expand All @@ -196,20 +189,20 @@ header.site-header {
}

.chevron {
@include media(">tablet") {
@include media(">1070px") {
display: none;
}
}

&.has-submenus {
&.submenu-column__two {
.sub_menu {
@include media(">tablet") {
@include media(">1070px") {
grid-template-columns: .65fr .35fr;
}
.menu-column:nth-child(4){
.sub-menu{
@include media(">tablet") {
@include media(">1070px") {
grid-template-columns: repeat(2, 1fr);
gap: 0 15px;
display: grid;
Expand All @@ -221,15 +214,15 @@ header.site-header {

&.submenu-column__three {
.sub_menu {
@include media(">tablet") {
@include media(">1070px") {
grid-template-columns: repeat(3, 1fr);
gap: 0 15px;
}
}
}
&.submenu-column__single_menu {
.sub-menu {
@include media(">tablet") {
@include media(">1070px") {
grid-template-columns: repeat(3, 1fr);
gap: 0 15px;
display: grid;
Expand All @@ -252,7 +245,7 @@ header.site-header {
margin: 0 auto;
padding: 31px 51px;

@include media("<tablet") {
@include media("<1070px") {
padding: 0;
background-color: brand-color('tertiary');
}
Expand Down Expand Up @@ -282,7 +275,7 @@ header.site-header {
display: flex;
padding: 45px 24px;

@include media(">tablet") {
@include media(">1070px") {
display: none;
}
}
Expand All @@ -301,7 +294,7 @@ header.site-header {
min-width: 0;
align-self: flex-start;

@include media(">tablet") {
@include media(">1070px") {
display: none;

}
Expand Down Expand Up @@ -342,7 +335,7 @@ header.site-header {
}

.menu-column {
@include media("<tablet") {
@include media("<1070px") {
padding: 20px 24px;
background: white;

Expand All @@ -369,7 +362,7 @@ header.site-header {
opacity: 0;
visibility: hidden;

@include media("<tablet") {
@include media("<1070px") {
display: none;
}
}
Expand Down Expand Up @@ -450,13 +443,13 @@ header.site-header {
width: 100%;
height: 5px;

@include media("<tablet") {
@include media("<1070px") {
display: none;
}

}

@include media('>=medium') {
@include media('>=1070px') {

&::before {
transform: rotate(-135deg);
Expand All @@ -467,11 +460,11 @@ header.site-header {
}

.sub_menu {
@include media(">tablet") {
@include media(">1070px") {
display: grid;
}

@include media("<=mobile_menu") {
@include media("<=1070px") {

&.open {
// display: flex;
Expand Down Expand Up @@ -513,7 +506,7 @@ header.site-header {
align-items: center;
justify-content: center;

@include media("<tablet") {
@include media("<1070px") {
display: none;
}

Expand Down Expand Up @@ -556,7 +549,7 @@ header.site-header {
align-items: center;
padding: 30px 0 20px;

@include media("<=mobile_menu") {
@include media("<=1070px") {
display: none;
}

Expand All @@ -577,12 +570,12 @@ header.site-header {
padding: 20px 30px;
display: none;

@include media("<tablet") {
@include media("<1070px") {
padding: 90px 24px 0;
background-color: brand-color('tertiary');
}

@include media("<=mobile_menu") {
@include media("<=1070px") {
overflow-y: auto;
}

Expand All @@ -596,13 +589,13 @@ header.site-header {
flex-direction: column;
align-items: flex-start;

@include media("<tablet") {
@include media("<1070px") {
margin-top: 71px;
}

>li {

@include media(">tablet") {
@include media(">1070px") {
display: flex;
flex-direction: column;
align-items: flex-start;
Expand Down Expand Up @@ -630,7 +623,7 @@ header.site-header {
width: 100%;
}

@include media(">tablet") {
@include media(">1070px") {
display: none;
}
}
Expand Down Expand Up @@ -681,7 +674,7 @@ body {
}
}

@include media(">mobile_menu") {
@include media(">1070px") {
#nav-icon {
display: none;
}
Expand All @@ -693,7 +686,7 @@ body {
.nav-icon {
display: inline-block;

@include media(">tablet") {
@include media(">1070px") {
display: none;
}
span {
Expand Down Expand Up @@ -781,7 +774,7 @@ body {
margin: 0 -24px;
margin-top: auto;

@include media(">tablet") {
@include media(">1070px") {
display: none;
}

Expand Down Expand Up @@ -870,7 +863,7 @@ body {
align-items: center;
gap: 30px;

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

Expand Down
1 change: 1 addition & 0 deletions assets/scss/partials/_singular.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -926,6 +926,7 @@ img.wprm-comment-rating {
position: relative;
grid-column-start: 1;
grid-column-end: 13;
width: 100%;

@include media(">tablet") {
padding: 86px 0;
Expand Down
8 changes: 7 additions & 1 deletion inc/template-tags.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,13 @@ function eqd_tha_page_header() {
function eqd_single_sidebar() {
// Standard Format.
if ( is_single() && get_post_type() == 'post' ) {
if ( get_field( 'post_format_style' ) == 'standard' ) :
$layout_style = get_field( 'post_format_style' );

if( empty( $layout_style ) ) {
$layout_style = 'standard';
}

if ( get_field( 'post_format_style' ) == 'standard' || $layout_style == true ) :
?>
<div class="sidebar_container">
<div class="sidebar_social">
Expand Down
10 changes: 8 additions & 2 deletions index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,18 @@
get_header();

$container_class = null;

if ( get_field( 'post_format_style' ) == 'full-width' ) {
$container_class .= ' site-main-article-content__full-width';
}
$layout_style = get_field( 'post_format_style' );

if( empty( $layout_style ) ) {
$layout_style = 'standard';
}

$container_class .= ' post_type_layout_' . $layout_style . ' ';

$container_class .= ' post_type_layout_' . get_field( 'post_format_style' ) . ' ';
// var_dump($container_class);
tha_content_before();

echo '<div class="' . $container_class . esc_attr( eqd_class( 'content-area', 'wrap', apply_filters( 'eqd_content_area_wrap', true ) ) ) . '">';
Expand Down
Loading

0 comments on commit f0b172e

Please sign in to comment.