diff --git a/wp-content/themes/cosmopet/global-functions/multisite-functions.php b/wp-content/themes/cosmopet/global-functions/multisite-functions.php index 0e8472c..153ffc2 100644 --- a/wp-content/themes/cosmopet/global-functions/multisite-functions.php +++ b/wp-content/themes/cosmopet/global-functions/multisite-functions.php @@ -82,30 +82,6 @@ function custom_canonical_url() { } } -add_action('wp_head', 'add_facebook_pixel'); -function add_facebook_pixel() { - ?> - - - - - site_mode == 'production' and $site_env->site_region == 'ae') { + add_action('wp_footer', 'add_facebook_pixel_events'); function add_facebook_pixel_events() { - // 1. Событие AddToCart (Добавление в корзину) - if (is_product() || is_shop() || is_cart()) { - ?> - \ No newline at end of file diff --git a/wp-content/themes/cosmopet/static/css/forms.css b/wp-content/themes/cosmopet/static/css/forms.css index e724500..74e6ff7 100644 --- a/wp-content/themes/cosmopet/static/css/forms.css +++ b/wp-content/themes/cosmopet/static/css/forms.css @@ -22,6 +22,12 @@ top: 55px; right: -80px; } +.discount_block_ae .discount_top .discount_top-imgs{ + position: absolute; + top: 55px; + right: -27%; +} + .discount_block .discount_form{ position: relative; z-index: 1; @@ -85,6 +91,9 @@ overflow: hidden; cursor: pointer; } +.discount_block_ae .discount_cosmodog { + margin-top: -8rem!important; +} .discount_cosmodog .discount_cosmodog-img{ width: 100%; @@ -143,6 +152,14 @@ margin-bottom: 6rem; } +.discount_block_ae .discount__sale { + padding: 69px 0 80px; + border-radius: 60px; + background: none; + box-shadow: none; + margin-bottom: 6rem; +} + .discount__sale .discount_title { color: var(--interface-main_black, #121212); font-family: "Craftwork Grotesk"; @@ -153,6 +170,14 @@ text-transform: uppercase; } +.discount_block_ae .discount__sale .discount_title { + font-size: 82px; + font-weight: 700; + line-height: 98.4px; + color: var(--creme-white, #F4F1F0); + text-transform: uppercase; +} + .discount__sale .discount_title span { background: var(--Accent-1, radial-gradient(200.43% 141.42% at 100% 0%, #76CE75 90%, #BBE38D 100%)); background-clip: text; @@ -169,6 +194,36 @@ border: 2px solid var(--interface-main_black, #121212); } +.discount_block_ae .discount__sale .discount_form .discount_form-inp { + width: 280px; + height: 50px; + border: 2px solid var(--creme-white, #F4F1F0); + padding: 10px 18px; + font-size: 24px; + font-weight: 500; + line-height: 28.8px; + color: var(--creme-white, #F4F1F0); + border-radius: 28px; + opacity: .6; +} + +.discount_block_ae .discount__sale .discount_form .discount_form-btn { + font-size: 24px; + font-weight: 500; + line-height: 28.8px; + color: var(--creme-white, #F4F1F0); + width: 221px; + height: 50px; + padding: 10px; + white-space: nowrap; + display: flex; + align-items: center; + justify-content: center; + border-radius: 48px; + border: 2px solid var(--creme-white, #F4F1F0); + transition: .3s ease all; +} + .discount__sale .discount_form .discount_form-btn { color: var(--interface-main_black, #121212); border: 2px solid var(--interface-main_black, #121212); @@ -178,6 +233,15 @@ color: #FFF; } +.discount_block_ae .discount__sale .discount_form-text { + font-size: 14px; + line-height: 16.8px; + color: var(--creme-white, #F4F1F0); + opacity: .6; + max-width: 778px; + margin-bottom: 27px; +} + .discount__sale .discount_form-text { color: var(--interface-main_black, #121212); font-family: "Craftwork Grotesk"; @@ -200,6 +264,12 @@ line-height: normal; } +.discount_block_ae .discount__sale .discount_text { + font-size: 20px; + line-height: 24px; + color: var(--creme-white, #F4F1F0); +} + .discount__sale .discount_form .discount_form-inp::placeholder { color: var(--interface-main_black, #121212); } @@ -296,6 +366,10 @@ -webkit-text-fill-color: transparent; } +.discount_block_ae .discount_form .discount_form-inp::placeholder { + color: var(--creme-white, #F4F1F0); + } + @media only screen and (max-width: 1170px) { .discount_top .discount_title { font-size: 60px; @@ -432,6 +506,59 @@ width: 100%; } + .discount_block_ae .discount__sale .discount_top .discount_top-imgs { + right: -27%!important; + top: 0!important; + transform: scale(1.8)!important; + z-index: 0!important; + margin-bottom: -91%!important; + margin-top: 20%!important; + position: relative!important; + } + .discount_block_ae .discount__sale .discount_top .discount_top-imgs .dicount_dog-img { + width: 110vw!important; + height: auto; + } + .discount_block_ae .discount__sale .discount_title { + font-size: 30px!important; + line-height: 36px!important; + } + .discount_block_ae .discount__sale .discount_text { + max-width: 260px!important; + font-size: 12px!important; + line-height: 14.2px!important; + } + .discount_block_ae .dicsount__body { + margin-top: 120px!important; + } + .discount_block_ae .discount_form .discount_form-inp, .discount_block_ae .discount_form .discount_form-btn { + width: 100%!important; + height: 29px!important; + padding: 6px 13px!important; + font-size: 12px!important; + line-height: 14.4px!important; + text-align: left!important; + } + .discount_block_ae .discount_form .discount_form-inp::placeholder { + font-size: 12px!important; + line-height: 14.4px!important; + color: var(--creme-white, #F4F1F0); + } + .discount_block_ae .form-process { + width: 100%; + } + .discount_block_ae .discount__sale .discount_form { + flex-direction: column; + gap: 10px !important; + } + .discount_block_ae .discount_form .discount_form-btn { + justify-content: start; + padding: 5px 15px; + background: var(--creme-white, #F4F1F0); + color: #62c57e!important; + opacity: 0.6; + text-align: left!important; + } /* Узнайте о нас больше и получите скидку! - конец */ } diff --git a/wp-content/themes/cosmopet/static/css/front-page.css b/wp-content/themes/cosmopet/static/css/front-page.css index db029f5..1b07ce7 100644 --- a/wp-content/themes/cosmopet/static/css/front-page.css +++ b/wp-content/themes/cosmopet/static/css/front-page.css @@ -204,6 +204,9 @@ main { .about_slider{ padding-top: 110px; } +.about_slider_ae{ + padding-top: 0px; +} .about_slider .slider-container { position: relative; /* max-width: 636px; */ @@ -242,6 +245,7 @@ main { backdrop-filter: blur(6px); z-index: 1; box-shadow: -2px 5px 22.9px 0px rgba(0, 0, 0, 0.25); + gap: 45px; } .about_slider .carousel .carousel-item.active { @@ -316,6 +320,19 @@ main { /* GP | fix */ } +.seller_buy { + font-family: "Craftwork Grotesk"; + font-weight: 700; + text-transform: capitalize; + width: 100%; + height: 48px; + padding: 12px 24px 12px 24px; + gap: 8px; + border-radius: 20px; + color: #fff; + background: var(--interface-main_black, #121212); +} + /* Reviews start */ @@ -478,6 +495,10 @@ main { /* Reviews end */ +.truth_ae .truth_top .gift_img { + margin-left: -180px; +} + /* About us start */ .about_us{ padding-bottom: 54px; @@ -1300,17 +1321,17 @@ width: 330px; .home__title { color: var(--interface-background, #F2F2F2); font-family: "Craftwork Grotesk"; - font-size: 48px; + font-size: 64px; font-style: normal; font-weight: 700; - line-height: 56px; /* 116.667% */ + line-height: 120%; text-transform: uppercase; } @media (min-width: 1600px){ .home__title { - font-size: 64px; + font-size: 80px; line-height: 120%; } } @@ -2038,6 +2059,7 @@ width: 330px; .sec-bf{ position: relative; z-index: 3; + overflow: hidden; } .copied{ @@ -3577,4 +3599,25 @@ color: #f4f1f0; .modal__basket { width: 100%!important; } + .about_slider .carousel .carousel-item { + gap: 12px; + } + .section_wrap { + padding: 110px 0 0px; + background: radial-gradient(250% 285% at 120% -27.98%, #0F5881 0%, #1EA49C 36.98%, #76CE75 66.67%, #ECF39F 91.15%); + } + .truth_block .truth_link { + height: 29px; + border-width: 2px; + text-transform: uppercase; + } + .discount_block_ae .discount__sale .discount_form .discount_form-btn { + align-items: center; + justify-content: flex-start; + } + .footer-content__address { + font-size: 24px; + line-height: 133%; + margin-bottom: 20px; + } } \ No newline at end of file diff --git a/wp-content/themes/cosmopet/static/css/policy-page.css b/wp-content/themes/cosmopet/static/css/policy-page.css new file mode 100644 index 0000000..89fd811 --- /dev/null +++ b/wp-content/themes/cosmopet/static/css/policy-page.css @@ -0,0 +1,38 @@ +.policy-home { + margin-top: 5%; + margin-bottom: 5%; +} + +h1 { + font-family: "Craftwork Grotesk"; + font-size: 48px; + font-weight: 700; + line-height: 56px; + text-transform: uppercase; + margin-bottom: 60px; +} + +h3 { + font-size: 24px; + font-family: "Craftwork Grotesk"; + margin-top: 20px; + margin-bottom: 20px; +} + +p { + font-size: 18px; + font-family: "Craftwork Grotesk"; + margin-bottom: 10px; +} + +ul { + margin-bottom: 10px; +} + +li { + font-size: 18px; + font-family: "Craftwork Grotesk"; + margin-bottom: 10px; + list-style-type: disc; + margin-left: 25px; +} \ No newline at end of file diff --git a/wp-content/themes/cosmopet/temp-functions/blog-logic.php b/wp-content/themes/cosmopet/temp-functions/blog-logic.php index c146d1b..4cd9a1c 100644 --- a/wp-content/themes/cosmopet/temp-functions/blog-logic.php +++ b/wp-content/themes/cosmopet/temp-functions/blog-logic.php @@ -142,32 +142,32 @@ function get_comment_likes_count($comment_id) { } function is_user_liked_post($post_id) { -if (!is_user_logged_in()) { - return false; -} -global $wpdb; -$table_name = $wpdb->prefix . 'cosmopet_likes'; -$user_id = get_current_user_id(); -$result = $wpdb->get_var($wpdb->prepare( - "SELECT COUNT(*) FROM $table_name WHERE post_id = %d AND user_id = %d", - $post_id, $user_id -)); -return $result > 0; + if (!is_user_logged_in()) { + return false; + } + global $wpdb; + $table_name = $wpdb->prefix . 'cosmopet_likes'; + $user_id = get_current_user_id(); + $result = $wpdb->get_var($wpdb->prepare( + "SELECT COUNT(*) FROM $table_name WHERE post_id = %d AND user_id = %d", + $post_id, $user_id + )); + return $result > 0; } function is_user_liked_comment($comment_id) { -if (!is_user_logged_in()) { - return false; -} -global $wpdb; -$table_name = $wpdb->prefix . 'cosmopet_likes'; -$user_id = get_current_user_id(); -$result = $wpdb->get_var($wpdb->prepare( - "SELECT COUNT(*) FROM $table_name WHERE comment_id = %d AND user_id = %d", - $comment_id, $user_id -)); -return $result > 0; + if (!is_user_logged_in()) { + return false; + } + global $wpdb; + $table_name = $wpdb->prefix . 'cosmopet_likes'; + $user_id = get_current_user_id(); + $result = $wpdb->get_var($wpdb->prepare( + "SELECT COUNT(*) FROM $table_name WHERE comment_id = %d AND user_id = %d", + $comment_id, $user_id + )); + return $result > 0; } diff --git a/wp-content/themes/cosmopet/temp-functions/filters-logic.php b/wp-content/themes/cosmopet/temp-functions/filters-logic.php index 87c7b20..4abab5f 100644 --- a/wp-content/themes/cosmopet/temp-functions/filters-logic.php +++ b/wp-content/themes/cosmopet/temp-functions/filters-logic.php @@ -9,14 +9,14 @@ register_sidebar( array( 'after_title' => '', ) ); -// Для кнопки "Применить фильтр" -add_filter('wbw_filter_submit_button_text', 'change_wbw_filter_button_text'); -function change_wbw_filter_button_text($text) { - return 'Ваш текст'; // Например, "Фильтровать" или "Поиск" -} +// // Для кнопки "Применить фильтр" +// add_filter('wbw_filter_submit_button_text', 'change_wbw_filter_button_text'); +// function change_wbw_filter_button_text($text) { +// return 'Ваш текст'; // Например, "Фильтровать" или "Поиск" +// } -// Для кнопки сброса (если есть) -add_filter('wbw_filter_reset_button_text', 'change_wbw_reset_button_text'); -function change_wbw_reset_button_text($text) { - return 'Сбросить'; -} \ No newline at end of file +// // Для кнопки сброса (если есть) +// add_filter('wbw_filter_reset_button_text', 'change_wbw_reset_button_text'); +// function change_wbw_reset_button_text($text) { +// return 'Сбросить'; +// } \ No newline at end of file diff --git a/wp-content/themes/cosmopet/templates/_blocks/shop/archive-product-tease.twig b/wp-content/themes/cosmopet/templates/_blocks/shop/archive-product-tease.twig index 6ec9d5e..0599771 100644 --- a/wp-content/themes/cosmopet/templates/_blocks/shop/archive-product-tease.twig +++ b/wp-content/themes/cosmopet/templates/_blocks/shop/archive-product-tease.twig @@ -22,12 +22,30 @@
+ {% set for_whom = fn('wc_get_product_terms', post.id, 'pa_for-whom') %} + {% for option in for_whom %} + {% set term = get_term(option) %} + {{ term.name }} + {% endfor %} {% set compound = fn('wc_get_product_terms', post.id, 'pa_compound') %} {% for option in compound %} - {% set term = get_term(option) %} {{ term.name }} {% endfor %} + + {% set package_weight = fn('wc_get_product_terms', post.id, 'pa_package-weight') %} + {% for option in package_weight %} + {% set term = get_term(option) %} + {{ term.name }} + {% endfor %} + {% set features = fn('wc_get_product_terms', post.id, 'pa_features') %} + {% for option in features %} + + {% set term = get_term(option) %} + {{ term.name }} + {% endfor %} + +
{{ post.title }}
diff --git a/wp-content/themes/cosmopet/templates/_pages/front-page.twig b/wp-content/themes/cosmopet/templates/_pages/front-page.twig index 577e40f..88a4790 100644 --- a/wp-content/themes/cosmopet/templates/_pages/front-page.twig +++ b/wp-content/themes/cosmopet/templates/_pages/front-page.twig @@ -5,7 +5,7 @@ {% block content %} -
+

{{ function('pll_e', 'Заголовок (скрытый) H1 на главной') }}

@@ -95,7 +95,7 @@ {% endif %}
-
+
@@ -363,15 +363,25 @@ } {% endif %} -
+
+ {% if site_region == 'ae' %} + + + + + {% elseif site_region == 'ru' %} + + + {% endif %} +

{{ q_title }}

diff --git a/wp-content/themes/cosmopet/templates/_pages/policy.twig b/wp-content/themes/cosmopet/templates/_pages/policy.twig new file mode 100644 index 0000000..55cc95a --- /dev/null +++ b/wp-content/themes/cosmopet/templates/_pages/policy.twig @@ -0,0 +1,15 @@ +{% set bodyClass = 'main-np' %} + +{% extends 'layout.twig' %} + +{% block content %} +
+
+
+
+ {{ post.content }} +
+
+
+
+{% endblock %} \ No newline at end of file diff --git a/wp-content/themes/cosmopet/templates/_pages/shop/archive-product.twig b/wp-content/themes/cosmopet/templates/_pages/shop/archive-product.twig index fd1da69..555f1e6 100644 --- a/wp-content/themes/cosmopet/templates/_pages/shop/archive-product.twig +++ b/wp-content/themes/cosmopet/templates/_pages/shop/archive-product.twig @@ -54,7 +54,7 @@ {% endif %}
{% endif %} diff --git a/wp-content/themes/cosmopet/templates/footer.twig b/wp-content/themes/cosmopet/templates/footer.twig index b05e53b..fa76b11 100644 --- a/wp-content/themes/cosmopet/templates/footer.twig +++ b/wp-content/themes/cosmopet/templates/footer.twig @@ -1,11 +1,55 @@ {% set current_path = template_path ~ '/modules/footer' %} -