From 0475d8b038b4276de855a0a06ed07f44cf0298f9 Mon Sep 17 00:00:00 2001 From: Andrei-10 Date: Sat, 17 May 2025 07:01:54 +0000 Subject: [PATCH] Fix | js and layout bugs fix Co-authored-by: Your Name Reviewed-on: https://git.good-production.xyz/Good-Production/cosmopet-architecture/pulls/16 --- ...le-developer-merchantid-domain-association | 1 + .../author/assets/css/gp-style-desktop.css | 4 - .../modules/header/module-controller.php | 12 +- .../layout/assets/css/gp-style-core.css | 75 +- .../layout/assets/css/gp-style-full.css | 1411 +---------------- .../img/svg/main/arrow-breadcrumbs-black.svg | 0 .../assets/img/svg/main/arrow-breadcrumbs.svg | 0 .../modules/layout/module.template.twig | 40 - .../assets/css/gp-style-core.css | 10 +- .../assets/css/gp-style-order.css | 241 --- .../modules/shop/module-ajax-controller.php | 1 - .../modules/shop/module-controller.php | 8 + .../cosmopet/static/front-page/css/style.css | 32 +- .../templates/front-page/front-page.twig | 29 +- .../front-page/template-front-page.php | 6 + .../themes/cosmopet/templates/header.twig | 2 + .../woocommerce/assets/css/gp-style-core.css | 40 - 17 files changed, 138 insertions(+), 1774 deletions(-) create mode 100644 .well-known/apple-developer-merchantid-domain-association rename wp-content/themes/cosmopet/{woocommerce => modules/layout}/assets/img/svg/main/arrow-breadcrumbs-black.svg (100%) rename wp-content/themes/cosmopet/{woocommerce => modules/layout}/assets/img/svg/main/arrow-breadcrumbs.svg (100%) delete mode 100644 wp-content/themes/cosmopet/modules/layout/module.template.twig delete mode 100644 wp-content/themes/cosmopet/modules/shop/components/single-product/assets/css/gp-style-order.css diff --git a/.well-known/apple-developer-merchantid-domain-association b/.well-known/apple-developer-merchantid-domain-association new file mode 100644 index 0000000..2ff95c9 --- /dev/null +++ b/.well-known/apple-developer-merchantid-domain-association @@ -0,0 +1 @@ +7B227073704964223A2239373943394538343346343131343044463144313834343232393232313734313034353044314339464446394437384337313531303944334643463542433731222C2276657273696F6E223A312C22637265617465644F6E223A313536363233343735303036312C227369676E6174757265223A22333038303036303932613836343838366637306430313037303261303830333038303032303130313331306633303064303630393630383634383031363530333034303230313035303033303830303630393261383634383836663730643031303730313030303061303830333038323033653333303832303338386130303330323031303230323038346333303431343935313964353433363330306130363038326138363438636533643034303330323330376133313265333032633036303335353034303330633235343137303730366336353230343137303730366336393633363137343639366636653230343936653734363536373732363137343639366636653230343334313230326432303437333333313236333032343036303335353034306230633164343137303730366336353230343336353732373436393636363936333631373436393666366532303431373537343638366637323639373437393331313333303131303630333535303430613063306134313730373036633635323034393665363332653331306233303039303630333535303430363133303235353533333031653137306433313339333033353331333833303331333333323335333735613137306433323334333033353331333633303331333333323335333735613330356633313235333032333036303335353034303330633163363536333633326437333664373032643632373236663662363537323264373336393637366535663535343333343264353035323466343433313134333031323036303335353034306230633062363934663533323035333739373337343635366437333331313333303131303630333535303430613063306134313730373036633635323034393665363332653331306233303039303630333535303430363133303235353533333035393330313330363037326138363438636533643032303130363038326138363438636533643033303130373033343230303034633231353737656465626436633762323231386636386464373039306131323138646337623062643666326332383364383436303935643934616634613534313162383334323065643831316633343037653833333331663163353463336637656233323230643662616435643465666634393238393839336537633066313361333832303231313330383230323064333030633036303335353164313330313031666630343032333030303330316630363033353531643233303431383330313638303134323366323439633434663933653465663237653663346636323836633366613262626664326534623330343530363038326230363031303530353037303130313034333933303337333033353036303832623036303130353035303733303031383632393638373437343730336132663266366636333733373032653631373037303663363532653633366636643266366636333733373033303334326436313730373036633635363136393633363133333330333233303832303131643036303335353164323030343832303131343330383230313130333038323031306330363039326138363438383666373633363430353031333038316665333038316333303630383262303630313035303530373032303233303831623630633831623335323635366336393631366536333635323036663665323037343638363937333230363336353732373436393636363936333631373436353230363237393230363136653739323037303631373237343739323036313733373337353664363537333230363136333633363537303734363136653633363532303666363632303734363836353230373436383635366532303631373037303663363936333631363236633635323037333734363136653634363137323634323037343635373236643733323036313665363432303633366636653634363937343639366636653733323036663636323037353733363532633230363336353732373436393636363936333631373436353230373036663663363936333739323036313665363432303633363537323734363936363639363336313734363936663665323037303732363136333734363936333635323037333734363137343635366436353665373437333265333033363036303832623036303130353035303730323031313632613638373437343730336132663266373737373737326536313730373036633635326536333666366432663633363537323734363936363639363336313734363536313735373436383666373236393734373932663330333430363033353531643166303432643330326233303239613032376130323538363233363837343734373033613266326636333732366332653631373037303663363532653633366636643266363137303730366336353631363936333631333332653633373236633330316430363033353531643065303431363034313439343537646236666435373438313836383938393736326637653537383530376537396235383234333030653036303335353164306630313031666630343034303330323037383033303066303630393261383634383836663736333634303631643034303230353030333030613036303832613836343863653364303430333032303334393030333034363032323130306265303935373166653731653165373335623535653561666163623463373266656234343566333031383532323263373235313030326236316562643666353530323231303064313862333530613564643664643665623137343630333562313165623263653837636661336536616636636264383338303839306463383263646461613633333038323032656533303832303237356130303330323031303230323038343936643266626633613938646139373330306130363038326138363438636533643034303330323330363733313162333031393036303335353034303330633132343137303730366336353230353236663666373432303433343132303264323034373333333132363330323430363033353530343062306331643431373037303663363532303433363537323734363936363639363336313734363936663665323034313735373436383666373236393734373933313133333031313036303335353034306130633061343137303730366336353230343936653633326533313062333030393036303335353034303631333032353535333330316531373064333133343330333533303336333233333334333633333330356131373064333233393330333533303336333233333334333633333330356133303761333132653330326330363033353530343033306332353431373037303663363532303431373037303663363936333631373436393666366532303439366537343635363737323631373436393666366532303433343132303264323034373333333132363330323430363033353530343062306331643431373037303663363532303433363537323734363936363639363336313734363936663665323034313735373436383666373236393734373933313133333031313036303335353034306130633061343137303730366336353230343936653633326533313062333030393036303335353034303631333032353535333330353933303133303630373261383634386365336430323031303630383261383634386365336430333031303730333432303030346630313731313834313964373634383564353161356532353831303737366538383061326566646537626165346465303864666334623933653133333536643536363562333561653232643039373736306432323465376262613038666437363137636538386362373662623636373062656338653832393834666635343435613338316637333038316634333034363036303832623036303130353035303730313031303433613330333833303336303630383262303630313035303530373330303138363261363837343734373033613266326636663633373337303265363137303730366336353265363336663664326636663633373337303330333432643631373037303663363537323666366637343633363136373333333031643036303335353164306530343136303431343233663234396334346639336534656632376536633466363238366333666132626266643265346233303066303630333535316431333031303166663034303533303033303130316666333031663036303335353164323330343138333031363830313462626230646561313538333338383961613438613939646562656264656261666461636232346162333033373036303335353164316630343330333032653330326361303261613032383836323636383734373437303361326632663633373236633265363137303730366336353265363336663664326636313730373036633635373236663666373436333631363733333265363337323663333030653036303335353164306630313031666630343034303330323031303633303130303630613261383634383836663736333634303630323065303430323035303033303061303630383261383634386365336430343033303230333637303033303634303233303361636637323833353131363939623138366662333563333536636136326266663431376564643930663735346461323865626566313963383135653432623738396638393866373962353939663938643534313064386639646539633266653032333033323264643534343231623061333035373736633564663333383362393036376664313737633263323136643936346663363732363938323132366635346638376137643162393963623962303938393231363130363939306630393932316430303030333138323031386233303832303138373032303130313330383138363330376133313265333032633036303335353034303330633235343137303730366336353230343137303730366336393633363137343639366636653230343936653734363536373732363137343639366636653230343334313230326432303437333333313236333032343036303335353034306230633164343137303730366336353230343336353732373436393636363936333631373436393666366532303431373537343638366637323639373437393331313333303131303630333535303430613063306134313730373036633635323034393665363332653331306233303039303630333535303430363133303235353533303230383463333034313439353139643534333633303064303630393630383634383031363530333034303230313035303061303831393533303138303630393261383634383836663730643031303930333331306230363039326138363438383666373064303130373031333031633036303932613836343838366637306430313039303533313066313730643331333933303338333133393331333733313332333333303561333032613036303932613836343838366637306430313039333433313164333031623330306430363039363038363438303136353033303430323031303530306131306130363038326138363438636533643034303330323330326630363039326138363438383666373064303130393034333132323034323062303731303365313430613462386231376262613230316130336163643036396234653431366232613263383066383661383338313435633239373566633131333030613036303832613836343863653364303430333032303434363330343430323230343639306264636637626461663833636466343934396534633035313039656463663334373665303564373261313264376335666538633033303033343464663032323032363764353863393365626233353031333836363062353730373938613064643731313734316262353864626436613138363633353038353431656565393035303030303030303030303030227D \ No newline at end of file diff --git a/wp-content/themes/cosmopet/modules/author/assets/css/gp-style-desktop.css b/wp-content/themes/cosmopet/modules/author/assets/css/gp-style-desktop.css index 3fa15e1..91a0ddd 100644 --- a/wp-content/themes/cosmopet/modules/author/assets/css/gp-style-desktop.css +++ b/wp-content/themes/cosmopet/modules/author/assets/css/gp-style-desktop.css @@ -313,10 +313,6 @@ -/* Home */ -.home { - padding: 140px 0 68px; -} .home-title { font-size: 82px; diff --git a/wp-content/themes/cosmopet/modules/header/module-controller.php b/wp-content/themes/cosmopet/modules/header/module-controller.php index b34b565..8d074cc 100644 --- a/wp-content/themes/cosmopet/modules/header/module-controller.php +++ b/wp-content/themes/cosmopet/modules/header/module-controller.php @@ -43,7 +43,7 @@ add_filter('timber/context', function($context) { $context['about_url_en'] = '/en/about-us/'; } else if (SITE_DOMAIN == 'AE'){ - $context['about_url_en'] = '/en/about-us/'; + $context['about_url_en'] = '/about-us/'; } else { $context['about_url'] = 'https://cosmopet.shop/chto-takoe-entoprotein/'; @@ -54,7 +54,11 @@ add_filter('timber/context', function($context) { if ($production_page) { $context['production_url'] = '/proizvodstvo/'; $context['production_url_en'] = '/en/production/'; - } else { + } + else if (SITE_DOMAIN == 'AE'){ + $context['production_url_en'] = '/production/'; + } + else { $context['production_url'] = 'https://cosmopet.shop/proizvodstvo/'; $context['production_url_en'] = 'https://cosmopet.shop/en/production/'; } @@ -66,7 +70,9 @@ add_filter('timber/context', function($context) { $context['front_url'] = "https://cosmopet.shop/"; $context['front_url_en'] = "https://cosmopet.shop/en/main/"; } - + if (SITE_DOMAIN == 'AE'){ + $context['front_url_en'] = "/"; + } return $context; }); 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 1ed44cf..050d350 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 @@ -104,7 +104,6 @@ --background: #F4F1F0; --placeholder: #999999; /* Fonts */ - --font-craftwork: 'Craftwork Grotest', sans-serif; --font-abel: 'Abel', serif; --text-dark: #2b2b3b; --text-red: #fa0505; @@ -137,7 +136,7 @@ body { background: var(--radial); - font-family: var(--font-craftwork); + font-family: var( --font-family); font-weight: 500; } @@ -1790,4 +1789,76 @@ textarea{ .order-contacts__delivery{ padding-bottom: 3rem; +} + + +/* breadcrumbs */ +.breadcrumbs{ + margin: 24px; + padding-top: 30px; + display: flex; + align-items: center; +} +.breadcrumbs__item{ + display: block; + + padding: 0px 16px; + + font-family: var(--font-family); + font-weight: 700; + font-size: 16px; + line-height: 125%; + color: var(--text-6); + + text-decoration: none; + + position: relative; +} +.breadcrumbs__item:first-child{ + padding-left: 0; +} +.breadcrumbs__item:nth-child(n+2)::before{ + content: ''; + + position: absolute; + top: -2px; + left: -12px; + + width: 24px; + aspect-ratio: 1; + + background-image: url(../img/svg/main/arrow-breadcrumbs.svg); + background-repeat: no-repeat; + background-size: contain; +} +/* breadcrumbs */ + +.home { + padding: 60px 0 68px; +} + +.wc-block-components-checkout-place-order-button{ + background: var(--gradient-turquoise); + border: none; + transition: opacity .2s ease-out; + font-size: 20px; + line-height: 120%; + color: var(--text-black); + border-radius: 20px; +} + +.wc-block-checkout__form.wc-block-components-form .wc-block-components-text-input input[type=email], +.wc-block-checkout__form.wc-block-components-form .wc-block-components-text-input input[type=number], +.wc-block-checkout__form.wc-block-components-form .wc-block-components-text-input input[type=password], +.wc-block-checkout__form.wc-block-components-form .wc-block-components-text-input input[type=tel], +.wc-block-checkout__form.wc-block-components-form .wc-block-components-text-input input[type=text], +.wc-block-checkout__form.wc-block-components-form .wc-block-components-text-input input[type=url], +.wc-block-checkout__form.wc-block-components-form .wc-block-components-text-input input[type=email], +.wc-block-checkout__form.wc-block-components-form .wc-block-components-text-input input[type=number], +.wc-block-checkout__form.wc-block-components-form .wc-block-components-text-input input[type=password], +.wc-block-checkout__form.wc-block-components-form .wc-block-components-text-input input[type=tel], +.wc-block-checkout__form.wc-block-components-form .wc-block-components-text-input input[type=text], +.wc-block-checkout__form.wc-block-components-form .wc-block-components-text-input input[type=url], +.wc-block-checkout__form.wc-block-components-form .wc-blocks-components-select .wc-blocks-components-select__select{ + border-radius: 10px; } \ No newline at end of file diff --git a/wp-content/themes/cosmopet/modules/layout/assets/css/gp-style-full.css b/wp-content/themes/cosmopet/modules/layout/assets/css/gp-style-full.css index e04ef1d..d95c63b 100644 --- a/wp-content/themes/cosmopet/modules/layout/assets/css/gp-style-full.css +++ b/wp-content/themes/cosmopet/modules/layout/assets/css/gp-style-full.css @@ -1,32 +1,3 @@ -@font-face { - font-family: "Craftwork Grotest"; - src: url('../fonts/Craftwork_Grotesk_Trial/CraftworkGrotesk-Regular.ttf'); - font-weight: 400; -} - -@font-face { - font-family: "Craftwork Grotest"; - src: url('../fonts/Craftwork_Grotesk_Trial/CraftworkGrotesk-Medium.ttf'); - font-weight: 500; -} - -@font-face { - font-family: "Craftwork Grotest"; - src: url('../fonts/Craftwork_Grotesk_Trial/CraftworkGrotesk-SemiBold.ttf'); - font-weight: 600; -} - -@font-face { - font-family: "Craftwork Grotest"; - src: url('../fonts/Craftwork_Grotesk_Trial/CraftworkGrotesk-Bold.ttf'); - font-weight: 700; -} - -@font-face { - font-family: "Abel"; - src: url('../fonts/Abel/Abel-Regular.ttf'); - font-weight: 400; -} * { padding: 0; @@ -129,15 +100,9 @@ input[type=number]::-webkit-outer-spin-button { --background: #F4F1F0; --placeholder: #999999; /* Fonts */ - --font-craftwork: 'Craftwork Grotest', sans-serif; --font-abel: 'Abel', serif; } -body { - background: var(--radial); - font-family: var(--font-craftwork); - font-weight: 500; -} body.bg-white { background: var(--main_white); @@ -152,6 +117,10 @@ body.bg-white { } } +body.bg-white { + background: var(--main_white); +} + .form-inp { height: 48px; width: 100%; @@ -199,1375 +168,3 @@ body.bg-white { /* Основные стили для компьютера */ -/* Header */ -.header { - background: var(--main_white); - border-bottom: 1px solid var(--interface_title); - position: fixed; - top: 0; - left: 0; - width: 100%; - z-index: 4; -} - -.header-container { - display: flex; - align-items: center; - justify-content: space-between; - padding: 16px 0; -} - -.header-bars { - display: none; -} - -.header-logo { - display: flex; - align-items: center; - gap: 8px; -} - -.header-logo span { - color: var(---main_black); - font-size: 20px; - text-transform: uppercase; -} - -.header-navs { - display: flex; - align-items: center; - gap: 24px; -} - -.header-navs__link { - padding: 8px 12px; - font-size: 16px; - font-weight: bold; - text-transform: uppercase; - line-height: 20px; -} - -.header-accordion {} - -.header-accordion__btn { - display: flex; - align-items: center; - gap: 4px; - padding: 8px 12px; - border-radius: 24px; - background: var(--accent-2); - cursor: pointer; - user-select: none; - font-size: 16px; - font-weight: bold; - line-height: 20px; - color: var(---main_black); -} - -.header-right { - display: flex; - align-items: center; - gap: 8px; -} - -.header-lang__btn { - display: flex; - align-items: center; - cursor: pointer; - user-select: none; - gap: 4px; - padding: 12px 15px; - color: var(---main_black); - font-size: 16px; - font-weight: bold; - line-height: 20px; -} - -/* Header end */ - - -/* Home */ -.home { - padding: 60px 0 68px; -} - -.home-title { - font-size: 82px; - font-weight: bold; - line-height: 96px; - color: var(--main_white); - margin-bottom: 16px; -} - -.home-description { - font-size: 32px; - font-weight: bold; - line-height: 40px; - color: var(--main_white); - text-transform: uppercase; - margin-bottom: 68px; -} - -/* Home end */ - - -/* Anons */ -.anons { - background: var(--main_white); - border-radius: 60px; - padding: 51px 0; -} - -.anons-theme__title { - color: var(--main_black); - font-size: 24px; - font-weight: bold; - line-height: 28px; - text-transform: uppercase; - margin-bottom: 20px; -} - -.anons-theme { - margin-bottom: 60px; -} - -.anons-theme ul { - max-width: 1022px; - display: flex; - flex-wrap: wrap; - gap: 12px; -} - -.anons-theme ul a { - font-size: 20px; - font-weight: 600; - line-height: 24px; - color: var(--main_black); - padding: 4px 24px; - border: 1px solid #000; - border-radius: 20px; -} - -.anons-theme ul a:hover, -.anons-theme ul a.active { - background: var(--main_black); - color: var(--main_white); -} - -.anons-best { - margin-bottom: 60px; -} - -.anons-best__title { - font-size: 36px; - line-height: 40px; - font-weight: bold; - color: var(--main_black); - margin-bottom: 20px; -} - -.anons-best__card-wrap { - display: grid; - grid-template-columns: repeat(3, minmax(0, 1fr)); - gap: 24px; -} - -.anons-best__card { - padding-top: 293px; - border-radius: 48px; - overflow: hidden; - position: relative; - z-index: 1; - overflow: hidden; -} - -.anons-best__card.light { - padding-top: 0; - border-radius: 0; -} - -.anons-best__card .main-img { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 360px; - z-index: -1; - overflow: hidden; - border-radius: 30px; -} -.anons-best__card:hover .main-img img{ - height: 120%; - width: 120%; -} -.anons-best__card .main-img img { - width: 100%; - height: 100%; - object-fit: cover; - max-width: none; - transition: all .5s; -} - -.anons-best__card.light .main-img { - position: static; - height: 265px; -} -.anons-best__card.light .main-img img { - border-radius: 30px; -} - -.anons-best__card-alerts { - position: absolute; - top: 21px; - left: 17px; - width: calc(100% - 34px); - display: flex; - flex-wrap: wrap; - gap: 7px; - z-index: 1; -} - -.anons-best__card-alerts li { - padding: 6px 8px; - font-size: 16px; - line-height: 20px; - font-weight: 500; - color: var(--background); - background: var(--main_black); - border-radius: 30px; -} - -.anons-best__card-body { - background: var(--accent-1); - padding: 30px 17px 22px; - border-radius: 48px 48px 0 0; - color: var(--main_white); - position: relative; - height: 100%; -} - -.anons-best__card.light .anons-best__card-body { - background: transparent; - color: var(--main_black); - padding: 12px 0 34px; -} - -.anons-best__card-body__title { - font-size: 28px; - font-weight: bold; - line-height: 32px; - text-transform: uppercase; - margin-bottom: 14px; -} - -.anons-best__card.light .anons-best__card-body__title { - font-size: 26px; -} - -.anons-best__card-body__datas { - display: flex; - align-items: center; - flex-wrap: wrap; - gap: 6px 10px; - max-width: 264px; -} - -.anons-best__card.light .anons-best__card-body__datas { - color: var(--placeholder); -} - -.anons-best__card-body__datas p { - font-size: 14px; - line-height: 16px; - font-weight: 500; -} - -.anons-best__card-body__datas ul { - display: flex; - align-items: center; - gap: 10px; -} - -.anons-best__card-body__datas ul li { - display: flex; - align-items: center; - gap: 4px; - font-size: 14px; - line-height: 16px; - font-weight: 500; -} - -.anons-best__card-body__datas ul .logo img { - width: 24px; - height: 24px; - border-radius: 50%; - object-fit: cover; -} - -.anons-article { - margin-bottom: 40px; -} - -.anons-article__title { - font-size: 36px; - line-height: 40px; - font-weight: bold; - color: var(--main_black); - margin-bottom: 20px; -} - -.anons-article__card-wrap { - display: grid; - grid-template-columns: repeat(3, minmax(0, 1fr)); - gap: 40px 25px; -} - -.anons-article__more-link { - display: flex; - align-items: center; - justify-content: center; -} - -.anons-article__more-link{ - background: var(--accent-3); - color: var(--main_white); - border-radius: 20px; - border: 1px solid var(--main_white); - padding: 16px 24px; - font-size: 20px; - font-weight: 600; - line-height: 24px; - text-transform: uppercase; - margin-right: auto; - margin-left: auto; - width: max-content; -} -/* Anons end */ - -/* Editorial */ -.editorial { - padding-bottom: 68px; -} - -.editorial-head { - position: relative; - z-index: 1; - max-width: 841px; - margin-bottom: 37px; -} - -.editorial-head__title { - font-size: 82px; - line-height: 96px; - font-weight: bold; - color: var(--main_white); - text-transform: uppercase; -} - -.editorial-head__img { - position: absolute; - z-index: -1; - top: -14px; - right: -20px; - width: 221px; -} - -.editorial-head__star { - position: absolute; - top: 8.26px; - right: -13.5px; - transform: translateX(100%); - width: 87.5px; -} - -.editorial-card__wrap { - display: grid; - grid-template-columns: repeat(2, minmax(0, 1fr)); - gap: 31px 25px; - position: relative; - z-index: 1; -} - -.editorial-card { - border: 2px solid var(--creme-white); - border-radius: 30px; - display: flex; - align-items: stretch; - overflow: hidden; - background: var(--linear); - backdrop-filter: blur(28px); -} - -.editorial-card .main-img { - min-height: 282px; - width: 207px; - border-radius: 29px; - overflow: hidden; - flex-shrink: 0; -} - -.editorial-card:hover .main-img img{ - width: 120%; - height: 120%; -} - -.editorial-card .main-img img { - width: 100%; - height: 100%; - object-fit: cover; - transition: all .5s; -} - -.editorial-card__content { - padding: 42px 19px 19px 35px; -} - -.editorial-card__content-alerts { - display: flex; - flex-wrap: wrap; - align-items: center; - gap: 7px; - margin-bottom: 17px; -} - -.editorial-card__content-alerts a { - background: var(--main_black); - border-radius: 16px; - padding: 6px 8px; - font-size: 16px; - font-weight: 500; - line-height: 20px; - color: var(--background); -} - -.editorial-card__content-title { - font-size: 28px; - font-weight: bold; - line-height: 32px; - color: var(--grey-black); - text-transform: uppercase; - margin-bottom: 17px; -} - -.editorial-card__content-data { - display: flex; - flex-wrap: wrap; - gap: 5px 16px; - color: var(--interface_hover); - font-size: 16px; - font-weight: 500; - line-height: 20px; -} - -.editorial-card__content-data ul { - display: flex; - align-items: center; - gap: 16px; -} - -.editorial-card__content-data li { - display: flex; - align-items: center; - gap: 5px; -} - -.editorial-card__content-data .logo img { - width: 24px; - height: 24px; - border-radius: 50%; - object-fit: cover; -} -/* Editorial end */ - -/* Footer */ -.footer { - background: var(--main_black); - padding: 40px 0 38px; - color: var(--main_white); -} - -.footer-top { - display: flex; - align-items: stretch; - justify-content: space-between; - gap: 48px; -} - -.footer-top .logo { - display: flex; - align-items: center; - gap: 10px; - font-size: 20px; - font-weight: 500; - text-transform: uppercase; - background: var(--accent-1); - color: transparent; - -webkit-background-clip: text; - background-clip: text; - margin-bottom: 24px; -} - -.footer-content__address { - font-size: 24px; - font-weight: 500; - line-height: 32px; - margin-bottom: 32px; -} - -.footer-content { - width: 100%; -} - -.footer-content ul { - display: flex; - flex-direction: column; - gap: 24px; -} - -.footer-content ul li { - display: flex; - flex-direction: column; - gap: 4px; -} - -.footer-content ul p { - font-size: 16px; - font-weight: bold; - line-height: 20px; -} - -.footer-content ul a { - font-size: 24px; - font-weight: 500; - line-height: 32px; -} - -.footer-content__wrap { - display: flex; - align-items: flex-end; - justify-content: space-between; - width: 100%; -} - -.footer-top__link { - display: flex; - flex-direction: column; - gap: 24px; -} - -.footer-top__link .link-black { - padding: 7px 15px; - color: var(--main_white); - font-size: 24px; - line-height: 32px; - font-weight: 500; - white-space: nowrap; - border: 1px solid var(--main_white); - border-radius: 24px; -} - -.footer-top__link .link-white { - width: 100%; - text-align: center; - background: var(--main_white); - color: var(--main_black); - font-size: 20px; - font-weight: 600; - line-height: 24px; - padding: 12px; - border-radius: 20px; -} - -.footer-contact { - width: 364px; - flex-shrink: 0; - background: var(--accent-1); - border-radius: 24px; - padding: 24px; - display: flex; - flex-direction: column; - gap: 16px; -} - -.footer-contact__title { - color: var(--main_black); - font-size: 24px; - font-weight: 500; - line-height: 32px; -} - -.footer-contact__submit { - width: 100%; - text-align: center; - height: 48px; - border-radius: 16px; - background: var(--main_black); - font-size: 20px; - font-weight: 600; - line-height: 24px; - color: var(--main_white); -} - -.footer-bottom { - display: flex; - align-items: center; - justify-content: space-between; - padding-top: 17px; - margin-top: 19px; - border-top: 1px solid var(--main_white); -} - -.footer-network { - display: flex; - align-items: center; - gap: 32px; -} - -.footer-bottom a { - font-size: 16px; - line-height: 20px; - font-weight: 500; - color: var(--main_white); - opacity: 0.6; - text-decoration: underline; -} -/* Footer end */ - -/* Breadcrumb */ -.breadcrumb { - padding: 68px 0 24px; -} - -.breadcrumb .container { - color: var(--main_white); - font-size: 14px; - font-weight: 500; - line-height: 16px; -} - -.breadcrumb a { - display: inline; -} -/* Breadcrumb end */ - -/* Article home */ -.article-home { - padding-bottom: 36px; -} - -.article-home h1 { - font-size: 64px; - font-weight: bold; - line-height: 120%; - color: var(--main_white); - margin-bottom: 17px; - text-transform: uppercase; -} - -.article-home__data { - display: flex; - flex-wrap: wrap; - align-items: center; - gap: 8px 24px; - margin-bottom: 17px; -} - -.article-home__data-alerts { - display: flex; - flex-wrap: wrap; - align-items: center; - gap: 8px; -} - -.article-home__data-alerts a { - font-size: 16px; - line-height: 20px; - font-weight: 500; - color: var(--background); - padding: 6px 8px; - border-radius: 20px; - background: var(--main_black); -} - -.article-home__data p { - font-size: 14px; - line-height: 16px; - font-weight: 500; - color: var(--main_white); - display: flex; - align-items: center; - gap: 4px; -} - -.article-home__data .user { - display: flex; - align-items: center; - gap: 7px; - font-size: 14px; - line-height: 16px; - font-weight: 500; - color: var(--main_white); -} - -.article-home__data .user img { - width: 32px; - height: 32px; - border-radius: 50px; - object-fit: cover; -} - -.article-home__card { - width: 100%; - aspect-ratio: 1223/500; -} - -.article-home__card img { - width: 100%; - height: 100%; - object-fit: cover; - border-radius: 64px; -} -@media (max-width: 1200px) { - .editorial-card__wrap { - grid-template-columns: repeat(1, minmax(0, 1fr)); - } -} -@media (max-width: 1200px) { - .header-navs { - gap: 12px; - } - - .header-navs__link { - font-size: 14px; - } - - .header-right { - gap: 4px; - } - - .anons-article__card-wrap { - grid-template-columns: repeat(2, minmax(0, 1fr)); - } - - .editorial-card__wrap { - grid-template-columns: repeat(1, minmax(0, 1fr)); - } - - .footer-top { - flex-direction: column; - align-items: center; - text-align: center; - } - - .footer-content { - display: flex; - flex-direction: column; - align-items: center; - } - - .footer-content__wrap { - flex-direction: column; - align-items: center; - gap: 48px; - } - - .footer-bottom { - flex-direction: column; - gap: 24px; - } -} -@media (min-width: 992px) { - .article-home.position-1 .container { - position: relative; - z-index: 1; - } - - .article-home.position-1 .article-home__card { - width: calc(50% - 12px); - position: absolute; - top: 0; - right: 0; - height: 100%; - z-index: -1; - } - - .article-home.position-1 h1 { - width: calc(50% - 12px); - } - - .article-home.position-1 .article-home__data { - max-width: 406px; - } - - .article-home.position-2 .container { - position: relative; - z-index: 1; - height: 695px; - padding: 45px 42px; - } - - .article-home.position-2 .article-home__card { - position: absolute; - top: 0; - left: 0; - z-index: -1; - width: 100%; - height: 100%; - overflow: hidden; - } - - .article-home.position-2 .article-home__card::before { - content: ""; - width: 100%; - height: 100%; - background: linear-gradient(282.92deg, rgba(255, 255, 255, 0) 50.1%, #FFFFFF 77.26%); - position: absolute; - top: 0; - left: 0; - border-radius: 50px; - } - - .article-home.position-2 h1 { - color: var(--main_black); - max-width: 838px; - } - - .article-home.position-2 .article-home__data { - width: 304px; - } - - .article-home.position-2 .article-home__data p { - color: var(--main_black); - } - - .article-home.position-2 .article-home__data p img { - filter: brightness(0) invert(0) - } - - .article-home.position-2 .article-home__data .user { - color: var(--main_black); - } -} - -.article-content { - background: var(--main_white); - border-radius: 64px; - max-width: 1232px; - margin: 0 auto; - padding: 64px 0 116px; -} - -.article-container { - max-width: 1022px; - margin: 0 auto; - - @media (max-width: 1054px) { - max-width: calc(100% - 32px); - } -} -/* Article home end */ - - - -/* comment */ -.comment { - border-top: 1px solid var(--placeholder); - padding-top: 48px; - margin-top: 100px; -} - -.comment .comment-btn { - display: flex; - align-items: center; - justify-content: center; - gap: 12px; -} - -.comment .comment-btn button { - padding: 12px 24px; - border-radius: 20px; - display: flex; - align-items: center; - gap: 8px; - background: var(--btn-bg); - font-size: 20px; - font-weight: 600; - line-height: 24px; - font-family: var(--font-craftwork); -} - -.comment .comment-btn span { - font-family: var(--font-craftwork); - font-size: 20px; - font-weight: 500; - line-height: 24px; -} - -.comment .comment-title { - font-family: var(--font-craftwork); - font-size: 24px; - font-weight: 700; - line-height: 28px; - color: var(--grey-black); - margin: 48px 0 0 0; -} - -.comment .comment-in { - max-width: 816px; - margin: 0 auto; -} - -.comment .comment-block { - margin-top: 40px; - padding: 28px 48px; - border-radius: 24px; - background: var(--grey-f5); -} - -.comment .comment-block p { - font-size: 20px; - font-weight: 500; - line-height: 24px; - color: var(--grey-black); -} - -.comment .comment-block p a { - color: var(--green-dark); - text-decoration: underline; -} - -.comment .comment-user { - display: flex; - align-items: center; - gap: 12px; -} - -.comment .comment-user img { - width: 48px; - height: 48px; - border-radius: 50%; - flex-shrink: 0; -} - -.comment .comment-user h6 { - font-size: 20px; - font-weight: 700; - line-height: 24px; - color: var(---main_black); - margin-bottom: 5px; -} - -.comment .comment-user span { - font-size: 14px; - font-weight: 500; - line-height: 16px; - color: var(--interface_hover); -} - -.comment .comment-block p { - margin: 15px 0; - font-size: 20px; - font-weight: 500; - line-height: 24px; - color: var(---main_black); -} - -.comment .comment-btns { - display: flex; - align-items: center; - gap: 33px; -} - -.comment .comment-btns button { - font-size: 14px; - font-weight: 500; - line-height: 16px; - color: var(--interface_hover); - display: flex; - align-items: center; - gap: 5px; -} - -.comment .answer-btn { - margin-bottom: 10px; - font-family: var(--font-craftwork); - font-size: 16px; - font-weight: 700; - line-height: 20px; - color: var(--green-dark); - display: flex; - align-items: center; - gap: 8px; - padding: 6px 24px; - text-transform: lowercase; -} - -.comment .answer-btn svg { - transition: .2s ease; -} - -.comment .answer-btn svg.active { - transform: rotate(180deg); -} - -.comment .answer-block { - display: none; - margin: 0 0 0 54px; -} - -.comment .answer-block.active { - display: block; -} - -.comment .comment-block_text { - margin: 0 !important; -} - -.other-home { - padding-top: 36px !important; -} -/* comment */ - -/* Стили для планшетов */ -@media only screen and (max-width: 992px) { - .header-navs { - display: none; - } - - .header-container { - height: 56px; - padding: 0; - } - - .header-bars { - display: flex; - align-items: center; - justify-content: center; - } - - .header-logo { - font-size: 16px; - line-height: 20px; - gap: 8px; - } - - .header-logo img { - width: 31px; - flex-shrink: 0; - } - - .header-lang { - display: none; - } - - .home { - padding: 22px 0 36px; - } - - .home-title { - font-size: 32px; - line-height: 38px; - margin-bottom: 36px; - } - - .home-description { - font-size: 20px; - line-height: 24px; - margin-bottom: 36px; - } - - - .anons { - border-radius: 24px; - } - - .anons-article__title { - font-size: 26px; - line-height: 32px; - } - - .anons-theme { - margin-bottom: 60px; - } - - .anons-theme__title { - margin-bottom: 20px; - font-size: 20px; - line-height: 24px; - } - - .anons-theme ul { - gap: 12px; - } - - .anons-theme ul a { - font-size: 16px; - line-height: 20px; - padding: 6px 24px; - } - - .anons-best__card-wrap { - grid-template-columns: repeat(1, minmax(0, 1fr)); - gap: 24px; - } - - .anons-article__card-wrap { - grid-template-columns: repeat(1, minmax(0, 1fr)); - gap: 20px; - } - - - - .editorial { - padding-bottom: 36px; - } - - .editorial-head { - margin-bottom: 36px; - max-width: 313px; - } - - .editorial-head__title { - font-size: 32px; - line-height: 38px; - } - - .editorial-head__img { - width: 100px; - top: -14px; - right: -22.5px; - } - - .editorial-head__star { - display: none; - } - - .editorial-card__wrap { - gap: 31px; - } - - .breadcrumb { - padding: 22px 0 15px; - } - - .article-home { - padding-bottom: 36px; - } - - .article-home .container { - display: flex; - flex-direction: column; - } - - .article-home h1 { - order: 1; - font-size: 32px; - line-height: 38px; - margin-bottom: 15px; - } - - .article-home__card { - order: 2; - - } - - .article-home__card img { - border-radius: 32px; - } - - .article-home__data { - gap: 8px 16px; - order: 3; - margin: 15px 0 0; - } - - .article-home__data-alerts { - gap: 16px; - } - - .article-home__data-alerts a { - padding: 6px 8px; - } - - .article-content { - padding: 48px 0; - border-radius: 64px; - } - - .comment .comment-block { - padding: 20px 24px; - margin-top: 28px; - } - - .comment .comment-title { - padding-bottom: 20px; - } - - .comment .answer-block { - margin: 10px 0 0 42px; - } - - .comment .comment-user h6 { - font-size: 16px; - line-height: 24px; - } - - .comment .comment-block p { - font-size: 16px; - line-height: 24px; - } - - .comment .comment-btns { - gap: 14px; - } - - .comment .comment-btns button { - font-size: 12px; - line-height: 16px; - } - - .comment .comment-user span { - font-size: 12px; - line-height: 16px; - } - - -} -/* Стили для ультрашироких экранов */ -@media only screen and (min-width: 1400px) { - -} - -/* Стили для мобильных устройств */ -@media only screen and (max-width: 576px) { - .anons-best__title { - font-size: 26px; - line-height: 32px; - margin-bottom: 12px; - } - - .anons-best__card { - padding-top: 205px; - } - - .anons-best__card .main-img { - height: 300px; - } - - .anons-best__card-body { - padding: 20px 17px; - } - - .anons-best__card-body__title { - font-size: 20px; - line-height: 24px; - margin-bottom: 16px; - } - - .anons-best__card.light .main-img { - height: 197px; - } - - .anons-best__card.light .anons-best__card-body__title { - font-size: 20px; - line-height: 24px; - } - - .editorial-card { - flex-direction: column; - border-radius: 30px; - position: relative; - } - - .editorial-card .main-img { - width: 100%; - height: 203px; - } - - .editorial-card__content { - padding: 17px 13px 24px; - } - - .editorial-card__content-alerts { - position: absolute; - top: 13px; - left: 8px; - width: calc(100% - 16px); - } - - .editorial-card__content-title { - font-size: 20px; - line-height: 24px; - margin-bottom: 17px; - } - - .editorial-card__content-data { - gap: 5px 16px; - } - - .footer { - padding: 24px 0 58px; - } - - .footer-top { - align-items: flex-start; - text-align: left; - gap: 24px; - } - - .footer-content__wrap { - align-items: flex-start; - gap: 24px; - } - - .footer-content { - align-items: flex-start; - } - - .footer-content .logo { - font-size: 20px; - margin-bottom: 24px; - } - - .footer-content__address { - font-size: 18px; - line-height: 24px; - margin-bottom: 32px; - } - - .footer-content ul { - gap: 24px; - } - - .footer-content ul p { - font-size: 16px; - line-height: 20px; - } - - .footer-content ul a { - font-size: 24px; - line-height: 32px; - } - - .footer-top__link .link-white { - display: none; - } - - .footer-contact { - width: 100%; - padding: 16px; - border-radius: 24px; - } - - .footer-contact__title { - color: var(--main_white); - } - - .footer-bottom { - margin-top: 0; - padding-top: 24px; - border: 0; - align-items: flex-start; - gap: 17px; - } -} \ No newline at end of file diff --git a/wp-content/themes/cosmopet/woocommerce/assets/img/svg/main/arrow-breadcrumbs-black.svg b/wp-content/themes/cosmopet/modules/layout/assets/img/svg/main/arrow-breadcrumbs-black.svg similarity index 100% rename from wp-content/themes/cosmopet/woocommerce/assets/img/svg/main/arrow-breadcrumbs-black.svg rename to wp-content/themes/cosmopet/modules/layout/assets/img/svg/main/arrow-breadcrumbs-black.svg diff --git a/wp-content/themes/cosmopet/woocommerce/assets/img/svg/main/arrow-breadcrumbs.svg b/wp-content/themes/cosmopet/modules/layout/assets/img/svg/main/arrow-breadcrumbs.svg similarity index 100% rename from wp-content/themes/cosmopet/woocommerce/assets/img/svg/main/arrow-breadcrumbs.svg rename to wp-content/themes/cosmopet/modules/layout/assets/img/svg/main/arrow-breadcrumbs.svg diff --git a/wp-content/themes/cosmopet/modules/layout/module.template.twig b/wp-content/themes/cosmopet/modules/layout/module.template.twig deleted file mode 100644 index 33532d3..0000000 --- a/wp-content/themes/cosmopet/modules/layout/module.template.twig +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - {{ function('wp_head') }} - - - - - - {% if current_lang == 'en' %} - {% include 'header/module.template_ENG.twig' %} - {% elseif current_lang == 'fr' %} - {% else %} - {% include 'header/module.template_RU.twig' %} - {% endif %} - - -
- {% block content %} - {% endblock %} -
- - {% include 'footer/module.template.twig' %} - - {{ function('wp_footer') }} - - \ No newline at end of file diff --git a/wp-content/themes/cosmopet/modules/shop/components/single-product/assets/css/gp-style-core.css b/wp-content/themes/cosmopet/modules/shop/components/single-product/assets/css/gp-style-core.css index ad3fb04..8d7942d 100644 --- a/wp-content/themes/cosmopet/modules/shop/components/single-product/assets/css/gp-style-core.css +++ b/wp-content/themes/cosmopet/modules/shop/components/single-product/assets/css/gp-style-core.css @@ -1,3 +1,4 @@ +<<<<<<< HEAD *{ margin: 0; padding: 0; @@ -53,6 +54,8 @@ a{ --gradient-red: linear-gradient(22deg, #f44242 0%, #569ef0 100%); } +======= +>>>>>>> 219d098 (Fix | bugfix after restructurization) /* общие */ button{ @@ -470,10 +473,3 @@ button{ line-height: 120%; color: var(--text-black); } -/* toggle */ - -/* checkbox */ -/* checkbox */ - -/* radio */ -/* radio */ \ No newline at end of file diff --git a/wp-content/themes/cosmopet/modules/shop/components/single-product/assets/css/gp-style-order.css b/wp-content/themes/cosmopet/modules/shop/components/single-product/assets/css/gp-style-order.css deleted file mode 100644 index fcfde9e..0000000 --- a/wp-content/themes/cosmopet/modules/shop/components/single-product/assets/css/gp-style-order.css +++ /dev/null @@ -1,241 +0,0 @@ -.order{ - display: flex; -} -.order__title{ - font-family: var(--font-family); - font-weight: 700; - font-size: 24px; - line-height: 117%; - text-transform: uppercase; - color: var(--text-black); -} -.order__contacts{ - width: calc(50% - 0.5px); - - padding: 24px; - - border-right: 1px solid #121212; -} -.order-contacts__header{ - display: flex; - justify-content: space-between; - align-items: center; -} -.order-contacts__form{ - margin-top: 24px; -} -.order-contacts__delivery{ - margin-top: 47.5px; - - padding-top: 48px; - - border-top: 1px solid var(--background-grey); -} - -.order-contacts-deliver__item{ - margin-top: 24px; -} -.order-contacts-deliver__date{ - padding: 8px; - - border-radius: 24px; - - background: var(--background-grey); -} -.order-contacts-deliver__date .form-input-radio__item{ - margin-top: 24px; -} -.order-contacts-deliver__date .form-input-radio__item:first-child{ - margin-top: 0; -} -.order__your{ - width: calc(50% - 0.5px); - - padding: 24px 24px 24px 48px; - - background: var(--background-grey); -} -.order-your__products{ - margin-top: 48px; -} -.order-your-products__item{ - margin-top: 16px; - - display: flex; - justify-content: space-between; -} -.order-your-products__left{ - display: flex; -} -.order-your-products__img{ - width: 40px; - aspect-ratio: 1; - - border-radius: 16px; -} -.order-your-products__content{ - margin-left: 16px; -} -.order-your-products__name{ - font-family: var(--font-family); - font-weight: 500; - font-size: 12px; - line-height: 133%; - color: var(--text-black); - - text-decoration: none; -} -.order-your-products__description{ - margin-top: 8px; - - font-family: var(--font-family); - font-weight: 500; - font-size: 12px; - line-height: 133%; - color: var(--text-6); -} -.order-your-products__description span{ - font-weight: 700; -} -.order-your-products__description span::before{ - margin-left: 3px; - - content: 'x '; -} -.order-your-products__right{ - display: flex; -} -.order-your-products__count{ - font-family: var(--font-family); - font-weight: 700; - font-size: 12px; - line-height: 133%; - text-align: right; - color: var(--text-6); -} -.order-your-products__count::before{ - content: 'x'; -} -.order-your-products__price{ - margin-left: 16px; - - font-family: var(--font-family); - font-weight: 700; - font-size: 12px; - line-height: 133%; - text-align: right; - color: var(--text-black); -} -.order-your-products__price::after{ - content: 'Р'; -} -.order-your__calculation{ - margin-top: 48px; -} -.order-your__promo{ - display: flex; -} -.order-your-promo__button{ - margin-left: 8px; -} -.order-your-calculation__item{ - margin-top: 24px; - - display: flex; - justify-content: space-between; - align-items: center; -} -.order-your-calculation__title{ - font-family: var(--font-family); - font-weight: 500; - font-size: 20px; - line-height: 120%; - color: var(--text-black); -} -.order-your-calculation__value{ - font-family: var(--font-family); - font-weight: 700; - font-size: 20px; - line-height: 200%; - text-transform: uppercase; - text-align: right; - color: var(--text-black); -} -.order-your-calculation__value--price::after{ - content: ' ₽'; -} -.order-your-calculation__value--discount{ - background: var(--gradient-red); - background-clip: text; - -webkit-background-clip: text; - -webkit-text-fill-color: transparent; -} -.order-your-calculation__value--discount::before{ - content: '- '; -} -.order-your-calculation__description{ - font-family: var(--font-family); - font-weight: 500; - font-size: 12px; - line-height: 133%; - text-align: right; - color: var(--text-9); -} -.order-your-calculation__line{ - margin-top: 23px; - border: 1px solid var(--background-9); -} -.order-your-calculation__result{ - font-family: var(--font-family); - font-weight: 700; - font-size: 24px; - line-height: 117%; - text-transform: uppercase; - color: var(--text-black); -} -.order-your-calculation__submit{ - margin-top: 48px; -} - -@media only screen and (max-width: 1200px) { -.order{ - display: block; -} -.order__contacts, .order__your{ - border: none; - width: 100%; -} -} - -@media only screen and (max-width: 720px) { -.order__title{ - max-width: 181px; - - font-size: 20px; - line-height: 120%; -} -.order__your{ - margin-top: 16px; -} -.order__contacts{ - padding: 24px 16px; -} -.order__your{ - padding: 40px 16px 9px 16px; -} -.order-your__promo{ - display: block; -} -.order-your-promo__button{ - margin-left: 0; - margin-top: 24px; - - width: 100%; -} -.order-your-products__content{ - max-width: 164px; -} -.order-your-products__count, .order-your-products__price{ - flex-shrink: 0; -} -} \ No newline at end of file diff --git a/wp-content/themes/cosmopet/modules/shop/module-ajax-controller.php b/wp-content/themes/cosmopet/modules/shop/module-ajax-controller.php index 7b8eb35..7f36e87 100644 --- a/wp-content/themes/cosmopet/modules/shop/module-ajax-controller.php +++ b/wp-content/themes/cosmopet/modules/shop/module-ajax-controller.php @@ -119,7 +119,6 @@ function enqueue_woocommerce_ajax_scripts() { 'ajax_url' => admin_url('admin-ajax.php'), 'currency_symbol' => get_woocommerce_currency_symbol(), 'currency_format' => str_replace(array('%1$s', '%2$s'), array('%s', '%v'), get_woocommerce_price_format()), - 'i18n_restore_item' => pll_e('Восстановить', 'woocommerce') )); } diff --git a/wp-content/themes/cosmopet/modules/shop/module-controller.php b/wp-content/themes/cosmopet/modules/shop/module-controller.php index 5fb6a26..e8f01d5 100644 --- a/wp-content/themes/cosmopet/modules/shop/module-controller.php +++ b/wp-content/themes/cosmopet/modules/shop/module-controller.php @@ -377,3 +377,11 @@ function auto_fill_shipping_fields_from_billing( $order_id ) { return $context; }); +function conditional_dequeue_woocommerce_styles() { + if (function_exists('is_woocommerce') && !is_woocommerce() && !is_cart() && !is_checkout() && !is_account_page()) { + wp_dequeue_style('woocommerce-general'); + wp_dequeue_style('woocommerce-layout'); + wp_dequeue_style('woocommerce-smallscreen'); + } +} +add_action('wp_enqueue_scripts', 'conditional_dequeue_woocommerce_styles', 999); \ No newline at end of file diff --git a/wp-content/themes/cosmopet/static/front-page/css/style.css b/wp-content/themes/cosmopet/static/front-page/css/style.css index 188030e..767e4cc 100644 --- a/wp-content/themes/cosmopet/static/front-page/css/style.css +++ b/wp-content/themes/cosmopet/static/front-page/css/style.css @@ -429,7 +429,7 @@ border-bottom: 2px solid var(--interface-main_black, rgba(18, 18, 18, 1)) } .reviews .reviews_title{ color: var(--grey-black, #121212); - font-family: "Craftwork Grotest"; + font-family: "Craftwork Grotesk"; font-size: 79px; font-style: normal; font-weight: 700; @@ -1510,7 +1510,7 @@ justify-content: center; .discount__sale .discount_title { color: var(--interface-main_black, #121212); - font-family: "Craftwork Grotest"; + font-family: "Craftwork Grotesk"; font-size: 82px; font-style: normal; font-weight: 700; @@ -1545,7 +1545,7 @@ justify-content: center; .discount__sale .discount_form-text { color: var(--interface-main_black, #121212); - font-family: "Craftwork Grotest"; + font-family: "Craftwork Grotesk"; font-size: 14px; font-style: normal; font-weight: 500; @@ -1558,7 +1558,7 @@ justify-content: center; .discount__sale .discount_text { margin-top: 27px; color: var(--interface-main_black, #121212); - font-family: "Craftwork Grotest"; + font-family: "Craftwork Grotesk"; font-size: 20px; font-style: normal; font-weight: 500; @@ -1648,7 +1648,7 @@ justify-content: center; .blog__card-btn { margin-top: 24px; color: #000; - font-family: "Craftwork Grotest"; + font-family: "Craftwork Grotesk"; font-size: 12px; font-style: normal; font-weight: 500; @@ -1710,7 +1710,7 @@ justify-content: center; .truth__end-promo { color: var(--grey-black, #121212); - font-family: "Craftwork Grotest"; + font-family: "Craftwork Grotesk"; font-size: 24px; font-style: normal; font-weight: 900; @@ -1726,7 +1726,7 @@ justify-content: center; .truth__end-btn { padding: 10px 10px 11px 10px; - font-family: "Craftwork Grotest"; + font-family: "Craftwork Grotesk"; font-size: 24px; font-style: normal; font-weight: 500; @@ -1822,7 +1822,7 @@ justify-content: center; .home__title { color: var(--interface-background, #F2F2F2); - font-family: "Craftwork Grotest"; + font-family: "Craftwork Grotesk"; font-size: 48px; font-style: normal; font-weight: 700; @@ -1839,7 +1839,7 @@ justify-content: center; } .home__subtitle { color: var(--interface-background, #F2F2F2); - font-family: "Craftwork Grotest"; + font-family: "Craftwork Grotesk"; margin-top: 32px; font-size: 20px; font-style: normal; @@ -1852,7 +1852,7 @@ justify-content: center; background: var(--interface-main_white, #FFF); padding: 12px 24px; color: var(--interface-main_black, #121212); - font-family: "Craftwork Grotest"; + font-family: "Craftwork Grotesk"; font-size: 20px; font-style: normal; font-weight: 600; @@ -1952,7 +1952,7 @@ justify-content: center; .cosmopet-x__title { color: var(--creme-white, #F4F1F0); - font-family: "Craftwork Grotest"; + font-family: "Craftwork Grotesk"; font-size: 82px; font-style: normal; font-weight: 700; @@ -2006,7 +2006,7 @@ justify-content: center; .cosmopet-x__heading { color: var(--grey-black, #121212); - font-family: "Craftwork Grotest"; + font-family: "Craftwork Grotesk"; font-size: 22px; font-style: normal; font-weight: 700; @@ -2019,7 +2019,7 @@ justify-content: center; max-width: max-content; margin-top: 7px; color: #000; - font-family: "Craftwork Grotest"; + font-family: "Craftwork Grotesk"; font-size: 12px; font-style: normal; font-weight: 500; @@ -2081,7 +2081,7 @@ justify-content: center; .reviews_item-top + span { color: var(--creme-white, #F4F1F0); - font-family: "Craftwork Grotest"; + font-family: "Craftwork Grotesk"; font-size: 12px; font-style: normal; font-weight: 500; @@ -2157,7 +2157,7 @@ justify-content: center; .blogosphere__name { color: #FFF; - font-family: "Craftwork Grotest"; + font-family: "Craftwork Grotesk"; font-size: 16.8px; font-style: normal; font-weight: 700; @@ -2216,7 +2216,7 @@ justify-content: center; .marketplace__title { color: var(--grey-black, #121212); - font-family: "Craftwork Grotest"; + font-family: "Craftwork Grotesk"; font-size: 36px; font-style: normal; font-weight: 700; diff --git a/wp-content/themes/cosmopet/templates/front-page/front-page.twig b/wp-content/themes/cosmopet/templates/front-page/front-page.twig index 9aa23d4..53041b7 100644 --- a/wp-content/themes/cosmopet/templates/front-page/front-page.twig +++ b/wp-content/themes/cosmopet/templates/front-page/front-page.twig @@ -5,9 +5,7 @@ {% block content %} - - -
+
@@ -30,7 +28,7 @@
- + {% if show_about %}
@@ -74,7 +72,7 @@
- + {% if about_rev %}
{{about_rev_title}}
@@ -92,9 +90,10 @@
+ {% endif %}
- - + {% endif %} +{% if show_rev %}

{{reviews_title}}

@@ -139,7 +138,8 @@
- +{% endif %} +{% if show_q %}
@@ -536,7 +536,8 @@
- +{% endif %} +{% if post.meta('cosmopet_x_slider') %}
@@ -565,7 +566,8 @@
- +{% endif %} +{% if show_blog %}
@@ -578,7 +580,6 @@
-
@@ -607,9 +608,11 @@
- +{% endif %} + +{% if show_promo %} {% include 'forms/discount.twig' %} - +{% endif %} {% endblock %} \ No newline at end of file diff --git a/wp-content/themes/cosmopet/templates/front-page/template-front-page.php b/wp-content/themes/cosmopet/templates/front-page/template-front-page.php index 9a6b9f1..bc1f095 100644 --- a/wp-content/themes/cosmopet/templates/front-page/template-front-page.php +++ b/wp-content/themes/cosmopet/templates/front-page/template-front-page.php @@ -72,6 +72,12 @@ $context['q_5'] = get_field('q_5'); $context['promo'] = get_field('promo'); $context['promo_text'] = get_field('promo_text'); +$context['show_about'] = get_field('about_show'); +$context['show_promo'] = get_field('promo_show'); +$context['show_rev'] = get_field('vet_show'); +$context['show_q'] = get_field('quiz_show'); +$context['show_blog'] = get_field('blog_show'); + $context['sub_title'] = get_field('sub_title'); $context['sub_text'] = get_field('sub_text'); Timber::render('templates/front-page/front-page.twig', $context); diff --git a/wp-content/themes/cosmopet/templates/header.twig b/wp-content/themes/cosmopet/templates/header.twig index d507469..27934a8 100644 --- a/wp-content/themes/cosmopet/templates/header.twig +++ b/wp-content/themes/cosmopet/templates/header.twig @@ -207,6 +207,7 @@
+ {% if CONSTANTS.DOMAIN != 'AE' %}
+ {% endif %}