diff --git a/assets/css/gp-style-desktop.css b/assets/css/gp-style-desktop.css index f22c1d3..c1a1dff 100644 --- a/assets/css/gp-style-desktop.css +++ b/assets/css/gp-style-desktop.css @@ -1268,11 +1268,41 @@ main{ display: flex; justify-content: space-between; } +.cabinet__control{ + margin: 24px; + margin-bottom: 0; + + display: none; +} +.cabinet-control__button{ + margin-left: 8px; + + padding: 12px 16px; + + font-family: var(--font-family); + font-weight: 500; + font-size: 20px; + line-height: 120%; + color: var(--text-black); + + background: var(--background-white); + border: 2px solid var(--text-black); + border-radius: 48px; + + transition: opacity .2s ease-out; +} +.cabinet-control__button.active{ + background: var(--background-black); + color: var(--text-white); +} +.cabinet-control__button:hover{ + opacity: .8; +} .cabinet__orders{ - width: calc((100% - 48px) / 3); + width: calc(((100% - 48px) / 3) * 2); } .cabinet__profile{ - width: calc(((100% - 48px) / 3) * 2); + width: calc((100% - 48px) / 3); } .cabinet-card{ @@ -1464,6 +1494,27 @@ main{ .cabinet-card__button:hover{ opacity: .8; } +.cabinet-card__confirm{ + margin-top: 16px; + + border-radius: 20px; + padding: 4px 24px; + + font-family: var(--font-family); + font-weight: 600; + font-size: 20px; + line-height: 120%; + + + background: var(--background-black); + color: var(--text-white); + border: none; + + transition: opacity .2s ease-out; +} +.cabinet-card__confirm:hover{ + opacity: .8; +} .cabinet-card__text, .cabinet-card__label, .cabinet-card__status, .cabinet-card__block-accounts, .cabinet-card__block-buttons{ margin-top: 8px; } @@ -1637,6 +1688,8 @@ main{ .cabinet-card-order__payment{ display: flex; align-items: flex-end; + + transition: margin .2s ease-out; } .cabinet-card-order-payment__title{ font-family: var(--font-family); diff --git a/assets/css/gp-style-mobile.css b/assets/css/gp-style-mobile.css index 4b339fd..fd0b53f 100644 --- a/assets/css/gp-style-mobile.css +++ b/assets/css/gp-style-mobile.css @@ -113,6 +113,61 @@ width: 31%; } /* detail */ + +/* cabinet */ +.cabinet-card__title{ + font-size: 20px; +} +.cabinet-card__no-orders{ + margin-top: 16px; +} +.cabinet-card-order__header{ + flex-direction: column; +} +.cabinet-card-order__payment{ + margin-top: 16px; +} +.cabinet-card-order-detail__main{ + flex-direction: column; +} +.cabinet-card-order-detail-main__links{ + margin-top: 24px; + + align-items: start; +} +.cabinet-card-order-detail-main-product__img{ + width: 70px; + height: 70px; +} +.cabinet-card-order-detail-main__product{ + margin-top: 16px; + + align-items: start; +} +.cabinet-card-order-detail-main-product__content{ + margin-left: 16px; + + flex-wrap: wrap; + + position: relative; +} +.cabinet-card-order-detail-main-product__description{ + width: 100%; +} +.cabinet-card-order-detail-main-product__count{ + position: absolute; + left: 116px; + bottom: 0; +} +.cabinet-card-order-detail-main-product__price{ + position: absolute; + left: 153px; + bottom: 0; +} + +/* .cabinet-card__order.active */ +/* .cabinet-card__order.active */ +/* cabinet */ } @media only screen and (max-width: 576px) { @@ -141,4 +196,22 @@ .detail-block-form__submit{ min-width: 100%; } +/* detail */ + +/* cabinet */ + +.cabinet-card-order-detail-main-product__img{ + width: 40px; + height: 40px; +} + +.cabinet-card-order-detail-main-product__count{ + left: auto; + right: 71px; +} +.cabinet-card-order-detail-main-product__price{ + left: auto; + right: 0; +} +/* cabinet */ } \ No newline at end of file diff --git a/assets/css/gp-style-tablet.css b/assets/css/gp-style-tablet.css index 4dfb783..2a2d3e9 100644 --- a/assets/css/gp-style-tablet.css +++ b/assets/css/gp-style-tablet.css @@ -106,6 +106,20 @@ main{ padding-right: 0; } /* modal */ + +/* cabinet */ +.cabinet{ + flex-direction: column; +} +.cabinet__control{ + display: flex; + align-items: center; +} +.cabinet__orders, .cabinet__profile{ + width: 100%; +} + +/* cabinet */ } @media only screen and (max-width: 980px) { @@ -213,4 +227,26 @@ main{ height: auto; } /* detail */ +} + +@media only screen and (max-width: 750px) { +/* cabinet */ +.cabinet-card-order__open-detail{ + margin-top: 144px; +} +.cabinet-card-order__detail-short{ + right: auto; + left: 0; + bottom: 48px; +} +.cabinet-card-order-detail-short__item{ + margin-left: -27px; +} +.cabinet-card-order-detail-short__item:first-child{ + margin-left: 0; +} +.cabinet-card__order.active .cabinet-card-order__open-detail{ + margin-top: 24px; +} +/* cabinet */ } \ No newline at end of file diff --git a/registration.html b/registration.html index 5f2e8f2..778cd40 100644 --- a/registration.html +++ b/registration.html @@ -225,8 +225,12 @@
+
+ + +
-
+
@@ -241,8 +245,11 @@

Почта:

example@example.com

-

Почта подтверждена

- + +

Почта не подтверждена

+
@@ -343,7 +350,7 @@
-
+

@@ -474,7 +481,7 @@

Доставлен

-
+

Адрес доставки: