6607 Добавление недостающих блоков на главную

wp-content/themes/cosmopet/functions.php

@@ -325,6 +325,7 @@ add_filter('theme_page_templates', function ($templates) {
     return $templates;
 });
 
+/* Подключаем все файлы с глобальными функциями */
 includeFilesFromFolder(get_template_directory() . '/global-functions');
 
 

wp-content/themes/cosmopet/global-functions/multilang-functions.php

@@ -48,6 +48,15 @@ add_action('init', function () {
                 ],
                 'group' => 'General',
             ],
+            [
+                'name' => 'Заголовок (скрытый) H1 на главной',
+                'string' => 'КОРМ БУДУЩЕГО ДЛЯ ВАШЕГО ПИТОМЦА',
+                'translations' => [
+                    'ru' => 'КОРМ БУДУЩЕГО ДЛЯ ВАШЕГО ПИТОМЦА',
+                    'en' => 'FOOD OF THE FUTURE FOR YOUR PET',
+                ],
+                'group' => 'General',
+            ],
             [
                 'name' => 'НАПИШИТЕ НАМ',
                 'string' => 'НАПИШИТЕ НАМ',

wp-content/themes/cosmopet/global-functions/multisite-functions.php

@@ -1,5 +1,41 @@
 <?php
 
+/* Start | Работа с проверкой мультисайтовости и стендов */
+class SiteEnvironment
+{
+    public string $mode;
+    public string $region;
+    
+    public function __construct(string $host = null)
+    {
+        $map = [
+            'cosmopet.ru' => ['mode' => 'production', 'region' => 'ru'],
+            'cosmopet.ae' => ['mode' => 'production', 'region' => 'ae'],
+            'cosmopet-test-ru.cp.good-production.xyz' => ['mode' => 'develope', 'region' => 'ru'],
+            'cosmopet-test-ae.cp.good-production.xyz' => ['mode' => 'develope', 'region' => 'ae'],
+        ];
+
+        $host = strtolower($host ?: $_SERVER['SERVER_NAME']);
+        $config = $map[$host] ?? ['mode' => 'develope', 'region' => 'unknown'];
+
+        $this->site_mode = $config['mode'];
+        $this->site_region = $config['region'];
+    }
+}
+
+
+add_filter('timber/twig', function (\Twig\Environment $twig) {
+    $site_env = new SiteEnvironment();
+    $twig->addGlobal('site_region', $site_env->site_region);
+    $twig->addGlobal('site_mode', $site_env->site_mode);
+    return $twig;
+});
+/* End | Работа с проверкой мультисайтовости и стендов */
+
+
+
+
+
 add_filter('woocommerce_currency_symbol', 'change_aed_currency_symbol', 10, 2);
 
 function change_aed_currency_symbol($currency_symbol, $currency) {
@@ -426,4 +462,4 @@ function woocommerce_ajax_add_to_cart() {
     }
 
     wp_die();
-}
+}}

wp-content/themes/cosmopet/modules/forms/components/discount/assets/css/discount-form.css

@@ -2279,6 +2279,8 @@ justify-content: center;
     -webkit-text-fill-color: transparent;
 }
 
+
+
 @media screen and (max-width: 991px) {
     .reviews__left {
         width: 100%;
@@ -2450,6 +2452,7 @@ justify-content: center;
     .truth_content-wrap {
         padding: 0 30px;
     }
+    
 }
 
 @media screen and (max-width: 540px) {

wp-content/themes/cosmopet/modules/layout/assets/css/gp-style-core.css

@@ -2073,3 +2073,93 @@ textarea{
 }
 }
 
+.container, .container-fluid {
+    width: 100%;
+    padding-right: 15px;
+    padding-left: 15px;
+    margin-right: auto;
+    margin-left: auto;
+}
+
+.about_slider .prev, .about_slider .next {
+    position: absolute;
+    top: 50%;
+    transform: translateY(-50%);
+    cursor: pointer;
+    z-index: 99;
+    background-color: unset;
+}
+
+.about_slider .next {
+    right: 29vw;
+}
+
+.about_slider .prev {
+    left: 29vw;
+}
+
+.about_slider .carousel-item {
+    height: 546px;
+    padding: 35px 50px 25px 50px;
+    padding: 50px 53px;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    /* background: var(--creme-white, #F4F1F0); */
+    background: #ffffff30;
+    backdrop-filter: blur(6px);
+    z-index: 1;
+    box-shadow: -2px 5px 22.9px 0px rgba(0, 0, 0, 0.25);
+}
+
+.about_slider .swiper-slide-active {
+    backdrop-filter: blur(6px);
+    width: 429px!important;
+    z-index: 3;
+}
+
+.about_slider .carousel-item img {
+    width: auto;
+}
+
+.about_slider .slide_info {
+    display: flex;
+    flex-direction: column;
+    gap: 15px;
+}
+
+.about_slider .carousel-item::after {
+    content: '';
+    background-image: url(/wp-content/themes/cosmopet/static/front-page/img/border.png);
+    background-size: cover;
+    /* background: linear-gradient(21.69deg, #F44242 23.69%, #569EF0 66.57%); */
+    display: block;
+    position: absolute;
+    width: calc(100% + 4px);
+    height: calc(100% + 4px);
+    border-radius: 60px;
+    top: -2px;
+    left: -2px;
+    z-index: -2;
+    transform: translateZ(-1px);
+}
+
+.about_slider .slide_title {
+    text-transform: uppercase;
+    font-size: 24px;
+    font-weight: 700;
+    line-height: 28.8px;
+    color: #121212;
+}
+
+.about_slider .slide_text {
+    font-size: 20px;
+    font-weight: 500;
+    line-height: 24px;
+    color:#121212;
+}
+
+.discount_block .discount_cosmodog {
+    margin-top: 60px;
+}

wp-content/themes/cosmopet/modules/layout/assets/js/gp-main.js

@@ -414,6 +414,71 @@ if (document.querySelector('.header').classList.contains('white')) {
 }
 // scroll
 
+document.addEventListener('DOMContentLoaded', function () {
+    const aboutSwiper = new Swiper('.about_slider', {
+        loop: true,
+        centeredSlides: true,
+        grabCursor: true,
+        slidesPerView: 'auto',
+        spaceBetween: 30,
+        effect: 'coverflow',
+        coverflowEffect: {
+            rotate: 0,
+            stretch: 0,
+            depth: 150,
+            modifier: 2.5,
+            slideShadows: false,
+        },
+        navigation: {
+            nextEl: '.about_slider_nav.next',
+            prevEl: '.about_slider_nav.prev',
+        },
+        breakpoints: {
+            0: {
+                slidesPerView: 1.5,
+            },
+            480: {
+                slidesPerView: 2.5,
+            },
+            768: {
+                slidesPerView: 3.5,
+            },
+            1024: {
+                slidesPerView: 5,
+            },
+        },
+    });
+});
+
+document.addEventListener('DOMContentLoaded', function () {
+    const petsSlider = new Swiper(".discount_cosmodog__slider", {
+        slidesPerView: 1,
+        spaceBetween: 0,
+        effect: "fade",
+        fadeEffect: {
+            crossFade: true,
+        },
+        loop: true,
+        autoplay: {
+            delay: 5000,
+            disableOnInteraction: false,
+        },
+    });
+});
+
+document.addEventListener('DOMContentLoaded', function () {
+	const marketSlider = new Swiper(".marketplace__swiper", {
+		slidesPerView: 'auto',
+		spaceBetween: 13,
+		freeMode: true, // свободная прокрутка
+
+		mousewheel: {
+			enabled: true,
+			// sensitivity: 1,
+			// releaseOnEdges: true,
+		},
+	});
+});
 
 
 

wp-content/themes/cosmopet/static/front-page/css/style.css

@@ -1076,6 +1076,7 @@ border-bottom: 2px solid var(--interface-main_black, rgba(18, 18, 18, 1))
     max-width: 778px;
     margin-bottom: 27px;
 }
+
 .discount_block .discount_text{
     font-size: 20px;
     line-height: 24px;
@@ -4281,3 +4282,269 @@ color: #f4f1f0;
 .invisible {
     visibility: hidden;
 }
+
+
+/* Discount start */
+.discount{
+    padding-top: 50px;
+    padding-bottom: 50px;
+}
+.discount .discount_block{
+    display: flex;
+    flex-direction: column;
+}
+.discount .discount_top{
+    position: relative;
+    margin-bottom: 50px;
+}
+.discount_top .discount_title{
+    font-size: 82px;
+    font-weight: 700;
+    line-height: 98.4px;
+    color: var(--creme-white, #F4F1F0);   
+    text-transform: uppercase; 
+}
+.discount_top .discount_top-imgs{
+    position: absolute;
+    top: 55px;
+    right: -80px;
+}
+.discount_block .discount_form{
+    position: relative;
+    z-index: 1;
+    display: flex;
+    align-items: center;
+    gap: 16px;
+    margin-bottom: 6px;
+}
+.discount_form .discount_form-btn {
+    background: inherit;
+    min-height: unset;
+}
+.discount_form .discount_form-btn:hover{
+    background: var(--btn-color);
+    border-color: var(--btn-color);
+    color: #3ab18f;
+}
+.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_form .discount_form-inp::placeholder{
+    font-size: 24px;
+    font-weight: 500;
+    line-height: 28.8px;
+    color: var(--creme-white, #F4F1F0);
+}
+.discount_form .discount_form-btn {
+    text-transform: lowercase;
+}
+.discount_block .discount_form-text{
+    font-size: 14px;
+    line-height: 16.8px;
+    color: var(--creme-white, #F4F1F0);
+    opacity: .6;
+    max-width: 778px;
+    margin-bottom: 27px;
+}
+.discount_block .discount_text{
+    font-size: 20px;
+    line-height: 24px;
+    color: var(--creme-white, #F4F1F0);
+}
+
+.discount_block .discount_cosmodog{
+    position: relative;
+    width: 100%;
+    height: 626px;
+    border-radius: 60px;
+    border: 2px solid var(--creme-white, #F4F1F0);
+    display: flex;
+    align-items: end;
+    justify-content: center;
+    overflow: hidden;
+    cursor: pointer;
+}
+.discount_cosmodog .discount_cosmodog-img{
+
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+
+}
+
+.discount_cosmodog__slider{
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+}
+.discount_cosmodog .discount_cosmodog-img.active{
+    opacity: 1;
+}
+.discount_cosmodog:hover .discount_cosmodog-img:nth-child(2) {
+    opacity: 1;
+}
+.discount_cosmodog .discount_cosmodog_info{
+    position: relative;
+    z-index: 1;
+    padding: 33px;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: end;
+    background: linear-gradient(0deg, #F4F1F0 56%, rgba(244, 241, 240, 0) 100%);
+    width: 100%;
+    height: 219px;
+}
+.discount_cosmodog .discount_cosmodog-title{
+    font-size: 40px;
+    font-weight: 700;
+    line-height: 48px;
+    text-align: center;
+    color: var(--grey-black, #121212);
+    text-transform: uppercase;
+}
+.discount_cosmodog .discount_cosmodog-text{
+    font-size: 24px;
+    font-weight: 500;
+    line-height: 28.8px;
+    text-align: center;
+}
+
+/* Discount end */
+
+@media only screen and (max-width: 1170px) {
+    .discount_top .discount_title {
+        font-size: 60px;
+        max-width: 550px;
+        line-height: 65px;
+    }
+    .discount_top .discount_top-imgs {
+        position: absolute;
+        top: 20px;
+        right: -50px;
+    }
+    .discount_top .discount_top-imgs .dicount_dog-img {
+        width: 400px;
+    }
+
+    
+}
+
+@media (max-width: 576px){
+     /* Узнайте о нас больше и получите скидку! */
+    .discount {
+        padding: 0px 0 43px;
+    }
+    .discount_top .discount_title,
+    .blog_block .blog_title,
+    .truth_block .truth_block-title,
+    .about_us .about_us-title,
+    .sellers_top .sellers_title {
+        font-size: 30px;
+        line-height: 36px;
+    }
+
+    .discount_block .discount_text {
+        max-width: 260px;
+    }
+
+    .discount_top .discount_top-imgs {
+        right: -136px;
+        top: 87px;
+    }
+
+    .discount_top .discount_top-imgs .dicount_dog-img {
+        width: 314px;
+        width: 110vw;
+    }
+
+    .discount_form .discount_form-inp {
+        height: 29px;
+        padding: 6px 13px;
+        font-size: 12px;
+        line-height: 14.4px;
+    }
+
+    .discount_form .discount_form-inp::placeholder {
+        font-size: 12px;
+        line-height: 14.4px;
+    }
+.discount_block .discount_text {
+        font-size: 12px;
+        line-height: 14.2px;
+    }
+   .discount_block .discount_form .discount_form-inp{
+    width: 100%;
+    }
+    .discount_form .discount_form-btn {
+        justify-content: start;
+        padding: 5px 15px;
+        background: var(--creme-white, #F4F1F0);
+        color: #62c57e;
+        opacity: 0.6;
+    }
+    .discount_form img{
+        display: none;
+    }
+    .discount_form span{
+        width: 100%;
+    }
+
+    .discount_block .discount_cosmodog {
+        border-radius: 25px;
+        height: 415px;
+    }
+
+    .discount_cosmodog .discount_cosmodog_info {
+        height: 245px;
+        gap: 14px;
+        padding: 10px 19px;
+    }
+
+    .discount_cosmodog .discount_cosmodog-title {
+        text-align: start;
+        font-size: 26px;
+        line-height: 31.2px;
+        max-width: 202px;
+        margin-right: auto;
+    }
+
+    .discount_cosmodog .discount_cosmodog-text {
+        font-size: 12px;
+        line-height: 14.4px;
+        max-width: 231px;
+        text-align: start;
+        margin-right: auto;
+    }
+
+    .discount_top .discount_top-imgs {
+        right: -20%;
+        top: 0;
+        transform: scale(1.8);
+        z-index: 0;
+        margin-bottom: -91%;
+        margin-top: 20%;
+        position: relative;
+    }
+    
+    .discount_block .wpcf7 {
+        order: 3;
+    }
+
+    /* Узнайте о нас больше и получите скидку! - конец */
+}
+
+.discount_block{
+    padding-bottom: 80px;
+}

wp-content/themes/cosmopet/static/front-page/img/discount-line-w.svg

@@ -1,3 +1,3 @@
 <svg width="236" height="23" viewBox="0 0 236 23" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M224.291 1L234.5 11.5M234.5 11.5L224.291 22M234.5 11.5L1 11.5" stroke="#121212" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M224.291 1L234.5 11.5M234.5 11.5L224.291 22M234.5 11.5L1 11.5" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>

wp-content/themes/cosmopet/static/front-page/js/main.js

@@ -447,6 +447,10 @@ document.addEventListener('DOMContentLoaded', function () {
             slidesPerView: 1,
             spaceBetween: 0,
             loop: true,
+            effect: 'fade',
+            fadeEffect: {
+                crossFade: true // enables slides to cross fade into each other
+            },
             autoplay: {
                 delay: 3000, // Интервал переключения слайдов (3 секунды)
                 disableOnInteraction: false,

wp-content/themes/cosmopet/templates/forms/discount.twig

@@ -1,15 +1,24 @@
-<section class="discount__sale sec-bf">
+<section class="{% if class %} {{ class }}{% else %}discount__sale{% endif %} sec-bf">
         <div class="container">
             <div class="discount_top">
                 <h3 class="discount_title">{{sub_title}}</span>
                 </h3>
                 <div class="discount_top-imgs">
+                {% if class %}
+                 <img class="dicount_dog-img img--desktop"
+                        src="{{ theme.link }}/static/front-page/img/labrador%20with%20stars.png"
+                        alt="">
+                    <img class="dicount_dog-img img--mobile"
+                        src="{{ theme.link }}/static/front-page/img/labrador%20with%20stars%20--%20mobile.png"
+                        alt="">
+                {% else %}
                     <img class="dicount_dog-img img--desktop"
                         src="{{ theme.link }}/static/front-page/img/dicsount-sale.png"
                         alt="">
                     <img class="dicount_dog-img img--mobile"
                         src="{{ theme.link }}/static/front-page/img/dicsount-sale-mob.png"
                         alt="">
+                        {% endif %}
                 </div>
             </div>
             <div class="dicsount__body">
@@ -20,7 +29,7 @@
 
 <div class="discount_form ">
   <span class="" data-name="subscriber"><input size="40" class="discount_form-inp" aria-required="true" aria-invalid="false" placeholder="{{ function('pll_e', 'Эл.почта') }}" value="" type="email" name="subscriber"></span>
-  <img src="/wp-content/themes/cosmopet/static/front-page/img/discount-line-w.svg" data-src="https://cosmopet.shop/wp-content/themes/woodmart/images/svg/discount-line-w.svg" decoding="async" class=" lazyloaded"><noscript><img src="https://cosmopet.shop/wp-content/themes/woodmart/images/svg/discount-line-w.svg" data-eio="l"></noscript>
+  <img src="/wp-content/themes/cosmopet/static/front-page/img/discount-line{% if class %}-w{% endif %}.svg">
   
   <input type="hidden" name="from_url" value="{{ current_url }}">
 <input type="hidden" name="form_name" value="Subscribtion form">
@@ -32,5 +41,23 @@
                             {{ function('pll_e', 'Подписываясь на рассылку, я даю согласие на обработку персональных данных, на получение рекламных сообщений и новостей о товарах и услугах') }}</p>
 							<p class="discount_text">{{sub_text}}</p>
 						</div>
+
+                        <div class="discount_cosmodog">
+                            <div class="discount_cosmodog__slider swiper">
+                                <div class="swiper-wrapper">
+                                    {% for i in 1..14 %}
+                                        <div class="swiper-slide">
+                                            <img src="/wp-content/themes/cosmopet/static/front-page/img/pets/tag_cosmopet_{{ i }}.jpg" alt="Cosmopet image {{ i }}" class="discount_cosmodog-img">
+                                        </div>
+                                    {% endfor %}
+                                </div>
+                            </div>
+
+                            <div class="discount_cosmodog_info">
+                                <h2 class="discount_cosmodog-title">#cosmodog  #cosmocat</h2>
+                                <p class="discount_cosmodog-text">Отметьте своего питомца тэгом, и мы покажем его
+											каждому</p>
+                            </div>
+                        </div>
         </div>
     </section>

wp-content/themes/cosmopet/templates/front-page/front-page.twig

@@ -6,11 +6,8 @@
 {% block content %}
 
     <section class="home">
-<<<<<<< HEAD
-        <h1 class="home__title invisible">КОРМ БУДУЩЕГО ДЛЯ ВАШЕГО ПИТОМЦА</h1>
-=======
-        <h1 class="home__title invisible">FOOD OF THE FUTURE FOR YOUR PET</h1>
->>>>>>> web_87
+        <h1 class="home__title invisible">{{ function('pll_e', 'Заголовок (скрытый) H1 на главной') }}</h1>
+
         <div class="container">
             <div class="home__swiper">
                 <div class="swiper-wrapper">    
@@ -96,6 +93,96 @@
             </div>
         </div>
         {% endif %}
+
+        <div class="container-fluid">
+            <div class="about_slider swiper">
+                <div class="swiper-buttons">
+                    <button class="about_slider_nav prev">
+                        <img src="/wp-content/themes/cosmopet/static/front-page/img/slider-prev.svg" alt="">
+                    </button>
+                    <button class="about_slider_nav next">
+                        <img src="/wp-content/themes/cosmopet/static/front-page/img/slider-next.svg" alt="">
+                    </button>
+                </div>
+
+                <div class="swiper-wrapper">
+                    <div class="slide swiper-slide carousel-item">
+                        <img src="/wp-content/themes/cosmopet/static/front-page/img/about_slider-img1.png" alt="">
+                        <div class="slide_info">
+                            <h3 class="slide_title">Пребиотики MOS и FOS</h3>
+                            <p class="slide_text">
+                                Поддерживают здоровый баланс кишечной микрофлоры и снижают риск
+								возникновения
+								заболеваний кишечника
+                            </p>
+                        </div>
+                    </div>
+                    <div class="slide swiper-slide carousel-item">
+                        <img src="/wp-content/themes/cosmopet/static/front-page/img/about_slider-img2.png" alt="">
+                        <div class="slide_info">
+                            <h3 class="slide_title">Омега 3 и жирные кислоты</h3>
+                            <p class="slide_text">
+                                Улучшают работу мозга и поддерживают его активность в норме,
+								сохраняют здоровье
+								кожи и блеск шерсти
+                            </p>
+                        </div>
+                    </div>
+                    <div class="slide swiper-slide swiper-slide-active carousel-item">
+                        <img src="/wp-content/themes/cosmopet/static/front-page/img/about_slider-img3.png" alt="">
+                        <div class="slide_info">
+                            <h3 class="slide_title">Юкка Шидигера</h3>
+                            <p class="slide_text">
+                                Стимулирует пищеварение и связывает вещества, отвечающие за
+								специфический запах
+								стула. Результат: туалет как по часам<br> (а неприятного запаха<br> – меньше).
+                            </p>
+                        </div>
+                    </div>
+                    <div class="slide swiper-slide carousel-item">
+                        <img src="/wp-content/themes/cosmopet/static/front-page/img/about_slider-img4.png" alt="">
+                        <div class="slide_info">
+                            <h3 class="slide_title">Кальций, фосфор и витамин D</h3>
+                            <p class="slide_text">
+                                В оптимальном соотношении поддерживают здоровье костей,
+								способствуют
+								восстановлению суставов и поддержанию их подвижности
+                            </p>
+                        </div>
+                    </div>
+                    <div class="slide swiper-slide carousel-item">
+                        <img src="/wp-content/themes/cosmopet/static/front-page/img/about_slider-img5.png" alt="">
+                        <div class="slide_info">
+                            <h3 class="slide_title">E-protein</h3>
+                            <p class="slide_text">
+                                Легкоперевариваемый энтопротеин, который к тому же превосходит по
+								питательности
+								традиционное мясо. Будучи новым источником белка не вызывает аллергии<br> у питомцев
+                            </p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="marketplace">
+            <div class="container">
+                <div class="marketplace__title">отзывы Покупателей</div>
+
+                <div class="marketplace__swiper swiper">
+                    <div class="swiper-wrapper">
+                        {% for i in 1..9 %}
+                            <div class="swiper-slide">
+                                <div class="marketplace__slide">
+                                    <img src="/wp-content/themes/cosmopet/static/front-page/img/scrollable-{{ i }}.svg" alt="Review {{ i }}">
+                                </div>
+                            </div>
+                        {% endfor %}
+                    </div>
+                </div>
+            </div>
+        </div>
+
     </section>
     {% endif %}
 
@@ -693,6 +780,7 @@
 {% endif %}
 
 {% if show_promo %}
+    {% set class = 'discount_block' %}
     {% include 'forms/discount.twig' %}
 {% endif %}
 

wp-content/themes/cosmopet/templates/header.twig

@@ -22,9 +22,11 @@
                         <li class="header-pc-menu__list-li">
                             <a href="/product-category/lakomstva-dlya-koshek/">{% if current_lang == 'ru' %}Лакомства{% elseif current_lang == 'en' %}Treats{% endif %}</a>
                         </li>
+                        {% if site_region == 'ru' %}
                             <li class="header-pc-menu__list-li">
                                 <a href="/product-category/aksessuary/">{% if current_lang == 'ru' %}Аксессуары{% elseif current_lang == 'en' %}Accessories{% endif %}</a>
                             </li>
+                        {% endif %}
                     </ul>
                 </div>
                 <div class="header-pc-menu__item">

wp-content/themes/cosmopet/templates/layout.twig

@@ -2,13 +2,14 @@
 <!DOCTYPE html>
 <html lang="ru">
     <head>
+        
         {{ function('wp_head') }}
+
         <title>{{ function('wp_title') }} </title>
         <meta charset="UTF-8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-<<<<<<< HEAD
         <!-- Top.Mail.Ru counter -->
         <script type="text/javascript">
             var _tmr = window._tmr || (window._tmr = []);
@@ -26,30 +27,12 @@
 
         <!-- Yandex.Metrika counter -->
         <script type="text/javascript" >
-=======
-        <meta name="yandex-verification" content="2da3f924c37aec09" />
-        <meta name="facebook-domain-verification" content="0t1n3h5uw4gdcpc1smgnnceaya7ek9" />
-        <meta name="google-site-verification" content="rHrHfWw6KM9echj8buJwfSPdVJLPECX0uhRTtyRX5F4" />	
-        <!-- Google tag (gtag.js) -->
-        <script async src="https://www.googletagmanager.com/gtag/js?id=G-WTY3GTXP5J"></script>
-        <script async>
-        window.dataLayer = window.dataLayer || [];
-        function gtag(){dataLayer.push(arguments);}
-        gtag('js', new Date());
-
-        gtag('config', 'G-WTY3GTXP5J');
-        </script>
-
-        <!-- Yandex.Metrika counter -->
-        <script async type="text/javascript" >
->>>>>>> web_87
         (function(m,e,t,r,i,k,a){m[i]=m[i]||function(){(m[i].a=m[i].a||[]).push(arguments)};
         m[i].l=1*new Date();
         for (var j = 0; j < document.scripts.length; j++) {if (document.scripts[j].src === r) { return; }}
         k=e.createElement(t),a=e.getElementsByTagName(t)[0],k.async=1,k.src=r,a.parentNode.insertBefore(k,a)})
         (window, document, "script", "https://mc.yandex.ru/metrika/tag.js", "ym");
 
-<<<<<<< HEAD
         ym(96481053, "init", {
         clickmap:true,
         trackLinks:true,
@@ -70,13 +53,6 @@
             var h=d.getElementsByTagName('script')[0];h.parentNode.insertBefore(s,h);
             })(window,document,'https://cdn-ru.bitrix24.ru/b33297602/crm/tag/call.tracker.js');
         </script>
-=======
-        ym(100896819, "init", {
-                clickmap:true,
-                trackLinks:true,
-                accurateTrackBounce:true,
-                webvisor:true
-        });
         </script>
         <noscript><div><img src="https://mc.yandex.ru/watch/100896819" style="position:absolute; left:-9999px;" alt="" /></div></noscript>
         <!-- /Yandex.Metrika counter -->
@@ -101,21 +77,17 @@
         src="https://www.facebook.com/tr?id=1791804684725971&ev=PageView&noscript=1"
         />
         </noscript>
-        <!-- End Meta Pixel Code -->
->>>>>>> web_87
+        <!-- /Meta Pixel Code -->
+
     </head>
 
     <body class="{{bodyClass}}">
-
-        
         {% include 'header.twig' %}
-        
         <main class="{{ mainClass }}">
             {% block content %}
             {% endblock %}
             {% include 'modal.twig' %}
         </main>
-        
         {% include 'footer.twig' %}
         </div>
             {{ function('wp_footer') }} 

wp-content/themes/cosmopet/templates/profile/profile.twig

@@ -105,7 +105,7 @@
             {% endif %}
         </div>
     </div>
-<<<<<<< HEAD
+
 
 {% endblock %}
 
@@ -413,6 +413,5 @@
     </div>
 </div>
 
-=======
 {% endblock %}
->>>>>>> web_87
+

wp-content/themes/cosmopet/woocommerce/archive-product/archive-product.twig

@@ -27,16 +27,13 @@
                     {{ function('pll_e', 'Продукция') }}
                 {% endif %}
             </h1>
-<<<<<<< HEAD
+
             <div class="active-filters" style="display: none;">
                 <div class="active-filters__list"></div>
                 <button class="active-filters__clear button button--white" style="display: none;">
                     {{ function('pll_e', 'Очистить все') }}
                 </button>
             </div>
-=======
-
->>>>>>> web_87
             <button class="button button--gradient button--high button--icon button--filter">
                 {{ function('pll_e', 'Фильтры') }}
             </button>