diff --git a/.gitignore b/.gitignore index 924ff9c..6833953 100644 --- a/.gitignore +++ b/.gitignore @@ -35,6 +35,7 @@ wp-config.php # htaccess /.htaccess +/*/.htaccess # vendor files in themes /wp-content/themes/*/vendor # All plugins @@ -43,6 +44,8 @@ wp-config.php /wp-content/plugins /wp-content/backups-dup-lite +/wp-content/ai1wm-backups +/wp-content/uploads-webpc # All themes # diff --git a/wp-content/themes/cosmopet/functions.php b/wp-content/themes/cosmopet/functions.php index 7633f58..7bc85a1 100644 --- a/wp-content/themes/cosmopet/functions.php +++ b/wp-content/themes/cosmopet/functions.php @@ -11,6 +11,7 @@ Timber\Timber::init(); Timber::$dirname = [ [ 'modules', + 'templates' ], ]; diff --git a/wp-content/themes/cosmopet/modules/blog/components/archive/component-controller.php b/wp-content/themes/cosmopet/modules/blog/components/archive/component-controller.php index afda2b7..0a4b8a1 100644 --- a/wp-content/themes/cosmopet/modules/blog/components/archive/component-controller.php +++ b/wp-content/themes/cosmopet/modules/blog/components/archive/component-controller.php @@ -5,6 +5,7 @@ include_component('blog', 'themes'); include_component('blog', 'most-read'); include_component('blog', 'news-list'); include_component('blog', 'editorial'); +include_component('blog', 'author-banner'); wp_localize_script('blog-archive-posts-ajax-js', 'ajax', array( 'ajax_url' => admin_url('admin-ajax.php'), @@ -16,4 +17,4 @@ $context['blog_desc'] = get_field('blog_desc', 'options'); $context['post_count'] = wp_count_posts()->publish; // Количество опубликованных постов $context['total_pages'] = ceil($context['post_count'] / get_option('posts_per_page')); // Общее количество страниц -Timber::render('blog/components/archive/component-template.twig', $context); +Timber::render('blog/blog-archive.twig', $context); diff --git a/wp-content/themes/cosmopet/modules/blog/components/author-banner/assets/css/style.css b/wp-content/themes/cosmopet/modules/blog/components/author-banner/assets/css/style.css new file mode 100644 index 0000000..5ca3c76 --- /dev/null +++ b/wp-content/themes/cosmopet/modules/blog/components/author-banner/assets/css/style.css @@ -0,0 +1,111 @@ +/* Author */ +.author { + padding: 111px 0 105px; + overflow: hidden; +} + +.author-content { + max-width: 1022px; + margin: 0 auto; + background: #CAFF81; + border-radius: 60px; + display: flex; + align-items: center; + justify-content: space-between; + padding: 35px 42px 35px 209px; + position: relative; + box-shadow: 6px 9px 20px rgba(0, 0, 0, 15%); +} + +.author-content__star-1 { + position: absolute; + width: 74px; + top: 18px; + left: -15px; + transform: translateX(-100%); +} + +.author-content__star-2 { + position: absolute; + top: 28px; + right: -24px; + transform: translateX(100%); + width: 37px; +} + +.author-content__img { + position: absolute; + left: 9px; + top: -43px; + width: 167px; +} + +.author-content__img.mb { + display: none; +} + +.author-content__title { + color: var(--main_black); + font-size: 36px; + font-weight: bold; + line-height: 40px; +} + +.author-content__link { + border-radius: 20px; + background: var(--main_black); + border: 1px solid var(--main_white); + padding: 15px 24px; + font-size: 20px; + font-weight: 600; + line-height: 24px; + color: var(--main_white); + flex-shrink: 0; +} + +@media only screen and (max-width: 992px) { + + .author { + padding: 188px 0 36px; + } + + .author-content { + padding: 109px 42px 35px; + flex-direction: column; + align-items: flex-start; + } + + .author-content__start-1, + .author-content__start-2 { + display: none; + } + + .author-content__img { + display: none; + left: 50%; + transform: translateX(-50%); + top: -180px; + width: 235px; + } + + .author-content__img.mb { + display: block; + } + + .author-content__title { + width: 100%; + font-size: 26px; + line-height: 32px; + margin-bottom: 16px; + } + + .author-content__title br { + display: none; + } + + .author-content__link { + width: 100%; + text-align: center; + padding: 11px; + } +} \ No newline at end of file diff --git a/wp-content/themes/cosmopet/modules/blog/components/single/assets/css/gp-style-tablet.css b/wp-content/themes/cosmopet/modules/blog/components/single/assets/css/gp-style-tablet.css index 6893c18..2818145 100644 --- a/wp-content/themes/cosmopet/modules/blog/components/single/assets/css/gp-style-tablet.css +++ b/wp-content/themes/cosmopet/modules/blog/components/single/assets/css/gp-style-tablet.css @@ -46,7 +46,7 @@ flex-direction: column-reverse; } - .discount-description__2 { + p.discount-description__2 { font-size: 18px; line-height: 24px; font-weight: 500; @@ -54,8 +54,9 @@ margin-bottom: 21px; } - .discount-description__1 { + p.discount-description__1 { margin-bottom: 0; font-size: 12px; + line-height: 120%; } } \ No newline at end of file diff --git a/wp-content/themes/cosmopet/modules/blog/components/single/component-controller.php b/wp-content/themes/cosmopet/modules/blog/components/single/component-controller.php index b31f0b5..6000627 100644 --- a/wp-content/themes/cosmopet/modules/blog/components/single/component-controller.php +++ b/wp-content/themes/cosmopet/modules/blog/components/single/component-controller.php @@ -3,4 +3,4 @@ include_component('blog', 'featured-slider'); $context = Timber::get_context(); -Timber::render('blog/components/single/component-template.twig', $context); +Timber::render('blog/blog-single.twig', $context); diff --git a/wp-content/themes/cosmopet/modules/blog/editor-blocks/image/assets/css/style.css b/wp-content/themes/cosmopet/modules/blog/editor-blocks/image/assets/css/style.css index 5392995..03b9dec 100644 --- a/wp-content/themes/cosmopet/modules/blog/editor-blocks/image/assets/css/style.css +++ b/wp-content/themes/cosmopet/modules/blog/editor-blocks/image/assets/css/style.css @@ -13,4 +13,15 @@ max-width: 740px; max-height: 512px; } -/* Product card end */ \ No newline at end of file +/* Product card end */ +@media (max-width: 992px) { + .product-card { + padding: 11px; + gap: 40px; + } + + .product-card img { + max-width: 242px; + max-height: 167px; + } +} diff --git a/wp-content/themes/cosmopet/modules/blog/editor-blocks/list_v1/assets/css/style.css b/wp-content/themes/cosmopet/modules/blog/editor-blocks/list_v1/assets/css/style.css index 822cc2f..31fd099 100644 --- a/wp-content/themes/cosmopet/modules/blog/editor-blocks/list_v1/assets/css/style.css +++ b/wp-content/themes/cosmopet/modules/blog/editor-blocks/list_v1/assets/css/style.css @@ -21,4 +21,24 @@ .list_v1 li img { flex-shrink: 0; max-width: 54px; +} + +@media (max-width: 992px) { + .list_v1{ + gap: 24px; + } + + .list_v1 li { + gap: 16px; + } + + .list_v1 li img { + width: 37px; + } + + .list_v1 li h3 { + font-size: 20px; + line-height: 24px; + gap: 16px; + } } \ No newline at end of file diff --git a/wp-content/themes/cosmopet/modules/blog/editor-blocks/list_v2/assets/css/style.css b/wp-content/themes/cosmopet/modules/blog/editor-blocks/list_v2/assets/css/style.css index c208761..0a2f3ce 100644 --- a/wp-content/themes/cosmopet/modules/blog/editor-blocks/list_v2/assets/css/style.css +++ b/wp-content/themes/cosmopet/modules/blog/editor-blocks/list_v2/assets/css/style.css @@ -32,3 +32,22 @@ color: var(--main_black); } /* block_lists */ + + +@media (max-width: 992px) { + .block-list_block img { + flex-shrink: 0; + width: 66px; + height: 45px; + } + + .block-list_block h3 { + font-size: 20px; + line-height: 24px; + } + + .block-list_block p { + font-size: 18px; + line-height: 24px; + } +} \ No newline at end of file diff --git a/wp-content/themes/cosmopet/modules/blog/editor-blocks/texts/assets/css/style.css b/wp-content/themes/cosmopet/modules/blog/editor-blocks/texts/assets/css/style.css index ba9c6a8..c184da1 100644 --- a/wp-content/themes/cosmopet/modules/blog/editor-blocks/texts/assets/css/style.css +++ b/wp-content/themes/cosmopet/modules/blog/editor-blocks/texts/assets/css/style.css @@ -133,5 +133,8 @@ font-size: 18px; line-height: 24px; } - + .texts p { + font-size: 18px; + line-height: 24px; + } } \ No newline at end of file diff --git a/wp-content/themes/cosmopet/modules/blog/module.template.twig b/wp-content/themes/cosmopet/modules/blog/module.template.twig deleted file mode 100644 index e69de29..0000000 diff --git a/wp-content/themes/cosmopet/modules/example/module.template.twig b/wp-content/themes/cosmopet/modules/example/module.template.twig deleted file mode 100644 index e69de29..0000000 diff --git a/wp-content/themes/cosmopet/modules/forms/module.template.twig b/wp-content/themes/cosmopet/modules/forms/module.template.twig deleted file mode 100644 index e69de29..0000000 diff --git a/wp-content/themes/cosmopet/modules/header/assets/css/gp-style-desktop.css b/wp-content/themes/cosmopet/modules/header/assets/css/gp-style-desktop.css index 5db1412..2a098d2 100644 --- a/wp-content/themes/cosmopet/modules/header/assets/css/gp-style-desktop.css +++ b/wp-content/themes/cosmopet/modules/header/assets/css/gp-style-desktop.css @@ -321,7 +321,7 @@ display: none; .header__menu-block{ position: absolute; - top: 72px; + top: 0; left: 0; width: 100%; @@ -720,7 +720,7 @@ padding-top: 72px; display: block; } .header__menu-block{ - top: 56px; + top: 0; } .header__content::after{ left: 0; diff --git a/wp-content/themes/cosmopet/modules/layout/assets/css/gp-style-core.css b/wp-content/themes/cosmopet/modules/layout/assets/css/gp-style-core.css index 9958e90..e2e7631 100644 --- a/wp-content/themes/cosmopet/modules/layout/assets/css/gp-style-core.css +++ b/wp-content/themes/cosmopet/modules/layout/assets/css/gp-style-core.css @@ -136,4 +136,21 @@ body { textarea{ font-family: inherit; +} + +@media (max-width: 992px) { + .indent { + padding: 36px 24px; + gap: 24px; + } + + .indent-title { + font-size: 26px; + line-height: 32px; + } + + .indent p { + font-size: 18px; + line-height: 24px; + } } \ No newline at end of file diff --git a/wp-content/themes/cosmopet/modules/popup/module.template.twig b/wp-content/themes/cosmopet/modules/popup/module.template.twig deleted file mode 100644 index 80f3776..0000000 --- a/wp-content/themes/cosmopet/modules/popup/module.template.twig +++ /dev/null @@ -1,60 +0,0 @@ -{% set current_path = template_path ~ '/modules/footer' %} - - \ No newline at end of file diff --git a/wp-content/themes/cosmopet/modules/blog/components/author-banner/component-template.twig b/wp-content/themes/cosmopet/templates/blog/author-banner.twig similarity index 100% rename from wp-content/themes/cosmopet/modules/blog/components/author-banner/component-template.twig rename to wp-content/themes/cosmopet/templates/blog/author-banner.twig diff --git a/wp-content/themes/cosmopet/modules/blog/components/archive/component-template.twig b/wp-content/themes/cosmopet/templates/blog/blog-archive.twig similarity index 72% rename from wp-content/themes/cosmopet/modules/blog/components/archive/component-template.twig rename to wp-content/themes/cosmopet/templates/blog/blog-archive.twig index 4b99b09..f36babb 100644 --- a/wp-content/themes/cosmopet/modules/blog/components/archive/component-template.twig +++ b/wp-content/themes/cosmopet/templates/blog/blog-archive.twig @@ -1,4 +1,4 @@ -{% extends 'layout/module.template.twig' %} +{% extends 'layout.twig' %} {% block content %} @@ -8,7 +8,7 @@

{{blog_title}}

{{blog_desc}}

- {% include '/blog/components/featured-slider/component-template.twig' %} + {% include '/blog/featured-slider.twig' %}
@@ -16,14 +16,14 @@
- {% include '/blog/components/themes/component-template.twig' %} - {% include '/blog/components/most-read/component-template.twig' %} + {% include '/blog/themes.twig' %} + {% include '/blog/most-read.twig' %}

{{ function('pll_e', 'ВСЕ СТАТЬИ') }}

    - {% include '/blog/components/news-list/component-template.twig' %} + {% include '/blog/news-list.twig' %}
{% if total_pages > 1 %} @@ -39,11 +39,11 @@ - {% include '/blog/components/author-banner/component-template.twig' %} + {% include '/blog/author-banner.twig' %} - {% include '/blog/components/editorial/component-template.twig' %} + {% include '/blog/editorial.twig' %} {% endblock %} \ No newline at end of file diff --git a/wp-content/themes/cosmopet/modules/blog/components/single/component-template.twig b/wp-content/themes/cosmopet/templates/blog/blog-single.twig similarity index 93% rename from wp-content/themes/cosmopet/modules/blog/components/single/component-template.twig rename to wp-content/themes/cosmopet/templates/blog/blog-single.twig index b021b6e..33fddb0 100644 --- a/wp-content/themes/cosmopet/modules/blog/components/single/component-template.twig +++ b/wp-content/themes/cosmopet/templates/blog/blog-single.twig @@ -1,4 +1,4 @@ -{% extends 'layout/module.template.twig' %} +{% extends 'layout.twig' %} {% block content %} @@ -46,7 +46,7 @@
- {% include '/blog/components/featured-slider/component-template.twig' %} + {% include '/blog/featured-slider.twig' %}
diff --git a/wp-content/themes/cosmopet/modules/blog/components/editorial/component-template.twig b/wp-content/themes/cosmopet/templates/blog/editorial.twig similarity index 100% rename from wp-content/themes/cosmopet/modules/blog/components/editorial/component-template.twig rename to wp-content/themes/cosmopet/templates/blog/editorial.twig diff --git a/wp-content/themes/cosmopet/modules/blog/components/featured-slider/component-template.twig b/wp-content/themes/cosmopet/templates/blog/featured-slider.twig similarity index 100% rename from wp-content/themes/cosmopet/modules/blog/components/featured-slider/component-template.twig rename to wp-content/themes/cosmopet/templates/blog/featured-slider.twig diff --git a/wp-content/themes/cosmopet/modules/blog/components/most-read/component-template.twig b/wp-content/themes/cosmopet/templates/blog/most-read.twig similarity index 100% rename from wp-content/themes/cosmopet/modules/blog/components/most-read/component-template.twig rename to wp-content/themes/cosmopet/templates/blog/most-read.twig diff --git a/wp-content/themes/cosmopet/modules/blog/components/news-list/component-template.twig b/wp-content/themes/cosmopet/templates/blog/news-list.twig similarity index 100% rename from wp-content/themes/cosmopet/modules/blog/components/news-list/component-template.twig rename to wp-content/themes/cosmopet/templates/blog/news-list.twig diff --git a/wp-content/themes/cosmopet/modules/blog/components/themes/component-template.twig b/wp-content/themes/cosmopet/templates/blog/themes.twig similarity index 100% rename from wp-content/themes/cosmopet/modules/blog/components/themes/component-template.twig rename to wp-content/themes/cosmopet/templates/blog/themes.twig diff --git a/wp-content/themes/cosmopet/modules/footer/module.template.twig b/wp-content/themes/cosmopet/templates/footer.twig similarity index 100% rename from wp-content/themes/cosmopet/modules/footer/module.template.twig rename to wp-content/themes/cosmopet/templates/footer.twig diff --git a/wp-content/themes/cosmopet/modules/header/module.template_ENG.twig b/wp-content/themes/cosmopet/templates/header_ENG.twig similarity index 100% rename from wp-content/themes/cosmopet/modules/header/module.template_ENG.twig rename to wp-content/themes/cosmopet/templates/header_ENG.twig diff --git a/wp-content/themes/cosmopet/modules/header/module.template_RU.twig b/wp-content/themes/cosmopet/templates/header_RU.twig similarity index 100% rename from wp-content/themes/cosmopet/modules/header/module.template_RU.twig rename to wp-content/themes/cosmopet/templates/header_RU.twig diff --git a/wp-content/themes/cosmopet/modules/layout/module.template.twig b/wp-content/themes/cosmopet/templates/layout.twig similarity index 83% rename from wp-content/themes/cosmopet/modules/layout/module.template.twig rename to wp-content/themes/cosmopet/templates/layout.twig index 167f1df..ac4f89e 100644 --- a/wp-content/themes/cosmopet/modules/layout/module.template.twig +++ b/wp-content/themes/cosmopet/templates/layout.twig @@ -21,10 +21,10 @@ {% if current_lang == 'en' %} - {% include 'header/module.template_ENG.twig' %} + {% include 'header_ENG.twig' %} {% elseif current_lang == 'fr' %} {% else %} - {% include 'header/module.template_RU.twig' %} + {% include 'header_RU.twig' %} {% endif %} @@ -33,7 +33,7 @@ {% endblock %} - {% include 'footer/module.template.twig' %} + {% include 'footer.twig' %}
{{ function('wp_footer') }}