diff --git a/assets/css/gp-style-core.css b/assets/css/gp-style-core.css index 46c1300..d297201 100644 --- a/assets/css/gp-style-core.css +++ b/assets/css/gp-style-core.css @@ -302,6 +302,9 @@ button{ background: #f2f2f2; border-radius: 24px; } +.header.white .main-menu__item:hover .main-menu__link{ + color: var(--text-black); +} .main-menu__item:active{ opacity: 1; } @@ -317,6 +320,8 @@ button{ color: var(--text-black); text-decoration: none; + + transition: color .2s ease-out; } .main-menu__button{ padding: 8px 32px 8px 12px; @@ -555,6 +560,9 @@ button{ border-radius: 16px; background-color: var(--background-white); + + display: block; + text-decoration: none; } .compound__item:first-child{ margin-left: 0; @@ -565,6 +573,9 @@ button{ display: flex; justify-content: center; } +.product__footer--error{ + margin: 45px 0; +} /* compound */ /* button */ @@ -652,6 +663,9 @@ button{ background: var(--background-black); border: 1px solid var(--text-white); } +.button--link{ + text-decoration: none; +} .button--red-48-px{ border-radius: 48px; } @@ -984,6 +998,8 @@ button{ .modal__text{ margin-top: 16px; + padding-right: 10px; + font-family: var(--font-family); font-weight: 400; font-size: 20px; @@ -1048,6 +1064,7 @@ button{ } .modal-basket__item{ padding-top: 23px; + padding-right: 15px; padding-bottom: 24px; display: flex; @@ -1061,7 +1078,7 @@ button{ position: absolute; top: 24px; - right: 0; + right: 6px; width: 24px; aspect-ratio: 1; diff --git a/assets/css/gp-style-desktop.css b/assets/css/gp-style-desktop.css index fdf7e71..8f9ae95 100644 --- a/assets/css/gp-style-desktop.css +++ b/assets/css/gp-style-desktop.css @@ -14,11 +14,12 @@ z-index: 200; } -.header::after{ +.header__content::after{ content: ''; position: absolute; left: 24px; + right: 24px; bottom: 0; width: calc(100% - 48px); @@ -182,6 +183,10 @@ display: none; padding: 24px 16px; + + height: calc(100vh - 56px); + + overflow-x: auto; } .header-phone-menu__item{ padding: 16px 0; @@ -265,7 +270,7 @@ .header.white .lang__open{ color: var(--text-white); } -.header.white::after{ +.header.white .header__content::after{ background: var(--background-white); } .header.white .lang-open__black{ @@ -284,6 +289,9 @@ .header.white .header__open-menu::after{ background: var(--background-white); } +.header__phone-menu::-webkit-scrollbar { + width: 0px; +} main{ padding-top: 72px; @@ -352,12 +360,29 @@ main{ .product__error{ margin: auto; + padding: 0 16px; + font-family: var(--font-family); font-weight: 700; font-size: 24px; line-height: 100%; text-transform: uppercase; color: var(--text-0); + text-align: center; + } + .product__error-button{ + border-radius: 20px; + padding: 4px 24px; + + font-family: var(--font-family); + font-weight: 600; + font-size: 20px; + line-height: 120%; + color: var(--text-black); + + border: 1px solid var(--text-0); + background: var(--background-white); + text-decoration: none; } .product__title{ font-family: var(--font-family); @@ -446,6 +471,9 @@ main{ color: #f4f1f0; border-radius: 16px; + display: block; + + text-decoration: none; } .product-item-label__tag--new{ background: var(--gradient-blue); @@ -497,6 +525,9 @@ main{ font-size: 20px; line-height: 120%; color: var(--text-black); + + text-decoration: none; + display: block; } .product-item__title:first-child{ margin-top: 0; @@ -517,6 +548,7 @@ main{ } .product-item__price p::after{ content: '₽'; + padding-left: 5px; } .product-item__price span{ margin-left: 9px; diff --git a/assets/css/gp-style-mobile.css b/assets/css/gp-style-mobile.css index 4544d72..20e2466 100644 --- a/assets/css/gp-style-mobile.css +++ b/assets/css/gp-style-mobile.css @@ -23,7 +23,7 @@ background: none; } .modal__basket .modal__header { - height: calc(100% - 92px); + height: calc(100% - 156px); margin-bottom: -36px; } .modal-basket-item__block-image{ @@ -46,6 +46,9 @@ font-size: 16px; } +.modal-basket__item--return{ + flex-direction: column; +} /* modal */ /* footer */ diff --git a/assets/css/gp-style-tablet.css b/assets/css/gp-style-tablet.css index 27d1e33..68fca08 100644 --- a/assets/css/gp-style-tablet.css +++ b/assets/css/gp-style-tablet.css @@ -39,6 +39,11 @@ main{ .header__menu-block{ top: 56px; } +.header__content::after{ + left: 0; + right: 0; + width: 100%; +} /* header */ /* footer */ @@ -58,6 +63,7 @@ main{ /* product */ .product{ padding: 12px; + padding-top: 20px; } .product__title{ font-weight: 400; @@ -78,6 +84,9 @@ main{ font-size: 12px; line-height: 133%; } +.toggle-table-item__line{ + margin-top: 12px; +} .detail{ margin: 24px 16px; } @@ -88,6 +97,12 @@ main{ font-size: 22px; } /* product */ + +/* modal */ +.modal__text{ + padding-right: 0; +} +/* modal */ } @media only screen and (max-width: 980px) { diff --git a/catalog-error.html b/catalog-error.html index 10cb13c..ce7974a 100644 --- a/catalog-error.html +++ b/catalog-error.html @@ -260,7 +260,7 @@
@@ -564,9 +564,9 @@ diff --git a/catalog.html b/catalog.html index cc88d2b..f4d1618 100644 --- a/catalog.html +++ b/catalog.html @@ -257,19 +257,19 @@Сухой корм, для средних и крупных пород, 2 кг.
+ Сухой корм, для средних и крупных пород, 2 кг.1 304