diff --git a/checkout/src/arquivos/js/components/Cart.js b/checkout/src/arquivos/js/components/Cart.js index 4556d19..0ad7996 100644 --- a/checkout/src/arquivos/js/components/Cart.js +++ b/checkout/src/arquivos/js/components/Cart.js @@ -7,26 +7,26 @@ export default class Cart { async init() { await this.textButton(); + this.selectors(); + this.events(); } - async textButton() { - const textButtonCardVazio = await waitElement(".empty-cart-links a#cart-choose-products", { - timeout: 30000, - interval: 100, - }); - const textCartItemsEntrega = await waitElement(".cart .cart-items thead tr .shipping-date", { - timeout: 30000, - interval: 100, - }); - const textCartItemsPreço = await waitElement(".cart .cart-items thead tr .product-price", { - timeout: 30000, - interval: 100, - }); + selectors() { + this.addTextButton = $('.link-box-edit'); + } - const dadosPessoais = await waitElement('.accordion-toggle span', { - timeout: 30000, - interval: 100, - }) + + events() { + this.addTextButton.click(this.textButton); + } + + + async textButton() { + const textButtonCardVazio = await waitElement(".empty-cart-links a#cart-choose-products"); + const textCartItemsEntrega = await waitElement(".cart .cart-items thead tr .shipping-date"); + const textCartItemsPreço = await waitElement(".cart .cart-items thead tr .product-price"); + const pPagamento = await waitElement('div.store-country-BRA.active .accordion-body .accordion-inner .notification') + const dadosPessoais = await waitElement('.accordion-toggle span') textButtonCardVazio.textContent = `Continuar comprando`; textCartItemsEntrega.textContent = `Frete`; diff --git a/checkout/src/arquivos/js/components/Footer.js b/checkout/src/arquivos/js/components/Footer.js index e3d3fe1..c94587f 100644 --- a/checkout/src/arquivos/js/components/Footer.js +++ b/checkout/src/arquivos/js/components/Footer.js @@ -169,10 +169,7 @@ export default class Footer { } async addCarrossel() { - const products = await waitElement(".footerCheckout__products", { - timeout: 30000, - interval: 1000, - }); + const products = await waitElement(".footerCheckout__products"); $(products).slick({ slidesToShow: 4, slidesToScroll: 1, diff --git a/checkout/src/arquivos/sass/checkout/_checkout-autenticacao.scss b/checkout/src/arquivos/sass/checkout/_checkout-autenticacao.scss index 009fc5b..ffe5850 100644 --- a/checkout/src/arquivos/sass/checkout/_checkout-autenticacao.scss +++ b/checkout/src/arquivos/sass/checkout/_checkout-autenticacao.scss @@ -7,7 +7,7 @@ } #orderform-title { - font-family: 'Open Sans'; + font-family: '$font-family'; font-weight: 700; font-size: 24px; line-height: 33px; @@ -33,7 +33,7 @@ margin-top: 14px; a { - font-family: 'Tenor Sans'; + font-family: '$font-family-secundary'; font-size: 14px; line-height: 16px; text-transform: uppercase; @@ -87,7 +87,7 @@ span, small { - font-family: 'Tenor Sans'; + font-family: '$font-family-secundary'; font-weight: 400; font-size: 20px; line-height: 23px; @@ -132,7 +132,7 @@ input { border: 1px solid $color-black; border-radius: 5px 0px 0px 5px; - font-family: 'Open Sans'; + font-family: '$font-family'; font-weight: 400; font-size: 12px; line-height: 16px; @@ -155,6 +155,8 @@ @include mq(md, max) { width: 87.2%; } + + } .focus-visible { @@ -166,7 +168,7 @@ border-radius: 0px 8px 8px 0px; width: 126px; height: 52px; - font-family: 'Open Sans'; + font-family: '$font-family'; font-style: normal; font-weight: 700; font-size: 14px; @@ -201,7 +203,7 @@ } span.help.error { - font-family: 'Open Sans'; + font-family: '$font-family'; font-style: normal; font-weight: 700; font-size: 12px; @@ -253,7 +255,7 @@ h3, span { margin: 0; - font-family: 'Open Sans'; + font-family: '$font-family'; font-weight: 700; font-size: 12px; line-height: 16px; @@ -284,7 +286,7 @@ .icon-lock { font-size: 94px; - color: $color-gray8; + color: $color-gray6; width: 59px; height: 94px; bottom: -13px; @@ -313,7 +315,6 @@ @include mq(md, max) { display: flex; flex-direction: column; - padding: 27px 16px; margin: 0; } @@ -325,8 +326,10 @@ } .orderform-template-holder { + width: 66.1132%; + @include mq(md, max) { - width: 100% !important; + width: 100%; } .row-fluid { @@ -334,35 +337,21 @@ display: flex; flex-direction: column; width: 100%; - overflow-x: hidden; } @include mq(sm, max) { - display: block; + align-items: center; } } } - .client-profile-data { - + #client-profile-data { + margin-bottom: 18px; @include mq(md, max) { margin-top: 11px; - width: 98.3%; - } - - @include mq(reset2, max) { - width: 97%; - } - - @include mq(sm, max) { - margin-left: 16px; - width: 92.4%; - } - - @include mq(reset4, max) { - width: 90%; + width: 100%; } .box-client-info { @@ -379,7 +368,7 @@ .accordion-group { padding: 24px 16px; - border: 1px solid $color-gray3; + border: 1px solid $color-gray2; border-radius: 8px; } @@ -400,12 +389,10 @@ - .box-client-info-pf { - margin-top: 36px; - } + span { - font-family: 'Tenor Sans'; + font-family: '$font-family-secundary'; font-size: 16px; line-height: 19px; color: $color-black-400; @@ -439,9 +426,8 @@ } .box-client-info-pf { - - @include mq(md, max) { - margin: 0 !important; + @include mq(reset5, max) { + margin-right: 0; } @include mq(sm, max) { @@ -450,10 +436,10 @@ label { - font-family: 'Open Sans'; + font-family: '$font-family'; font-size: 14px; line-height: 19px; - color: $color-gray2; + color: $color-gray; @include mq(xl, min) { font-size: 28px; @@ -462,9 +448,9 @@ } input { - border: 1px solid $color-gray10; + border: 1px solid $color-gray8; border-radius: 5px; - font-family: 'Open Sans'; + font-family: '$font-family'; font-size: 14px; line-height: 19px; padding: 0; @@ -475,78 +461,83 @@ line-height: 38px; } - } - - p { - width: 49.6%; - @include mq(sm, max) { - width: 47%; + padding-left: 3px; } } - .pull-left { - float: left !important; - } - - p.client-email { - width: 100%; + .client-first-name, + .client-document { + margin-right: 14px; } .client-email, .client-first-name, .client-last-name { - margin: 0; margin-bottom: 16px; input { height: 42px; + @include mq(xl, min) { + height: 63px; + } + @include mq(md, max) { - max-width: 100% !important; + max-width: 100%; } } } .client-email { + width: 100%; + input { width: 96%; @include mq(md, max) { - width: 98.9%; + width: 99.1%; } } } - .client-first-name { - - - input { - margin-right: 14px; - width: 91.3%; - - @include mq(md, max) { - width: 96.3%; - } - } - } - - .client-last-name, - .client-phone { - input { - float: right; - } - } - .client-last-name, .client-phone, - .client-document { + .client-document, + .client-first-name { + width: 46.9%; + float: left !important; + + @include mq(md, max) { + width: 49.2%; + } + + @include mq(sm4, max) { + width: 49%; + } + + @include mq(reset2, max) { + width: 48.6%; + } + + @include mq(sm, max) { + width: 47.6%; + } + + @include mq(xs2, max) { + width: 46.8%; + } + input { - width: 91.3%; + width: 94% !important; @include mq(md, max) { - width: 96.3%; + width: 98.2% !important; + } + + @include mq(sm, max) { + width: 94% !important; } } @@ -557,44 +548,23 @@ input { height: 44px; + + @include mq(xl, min) { + height: 63px; + } + &::placeholder { padding: 12px 24px 12px 0; - color: #BDBDBD; + color: $color-gray12; } } - margin: 0; margin-bottom: 13px; @include mq(md, max) { margin-bottom: 0; } } - - .client-document { - input { - margin-right: 14px; - } - - } - - .client-first-name, - .client-document { - - input, - label { - @include mq(md, max) { - width: 96.3%; - margin-right: 14px; - } - } - - - @include mq(sm, max) { - margin-right: 14px !important; - - } - } } .box-client-info-pj { @@ -610,7 +580,7 @@ } input { - border: 1px solid $calor-gray12; + border: 1px solid $color-gray10; border-radius: 3px; width: 18px; @@ -624,12 +594,12 @@ } span { - font-family: 'Open Sans'; + font-family: '$font-family'; font-style: normal; font-weight: 400; font-size: 12px; line-height: 16px; - color: $color-gray11; + color: $color-gray9; margin-left: 8px; @include mq(xl, min) { @@ -647,18 +617,18 @@ } .optinNewsLetter { - background-color: #BDBDBD; + background-color: $color-gray12; } } .btn-submit-wrapper { - margin-top: 45px; - margin-bottom: 10px; + margin-top: 44px; + margin-bottom: 20px; button.submit { background: $color-blue2; border-radius: 8px; - font-family: 'Open Sans'; + font-family: '$font-family'; font-weight: 700; font-size: 14px; line-height: 19px; @@ -669,6 +639,7 @@ width: 100%; height: 42px; cursor: pointer; + margin: 0; @include mq(xl, min) { height: 61px; @@ -685,11 +656,12 @@ .box-info { position: relative; margin-top: 25px; + margin-bottom: 12px; span { - font-family: 'Open Sans'; + font-family: '$font-family'; line-height: 16px; - color: $color-gray2; + color: $color-gray; @include mq(xl, min) { font-size: 24px; @@ -724,35 +696,40 @@ } #shipping-data { + margin: 0; margin-bottom: 17px; } + #payment-data { + margin: 0; + margin-left: 48.7%; + } + + #payment-data.span12 { + float: right; + margin-left: 0; + } + #payment-data, #shipping-data { + + @include mq(md, max) { - width: 100% !important; + width: 100%; float: initial; margin-left: 0; } @include mq(sm, max) { - margin-left: 16px; - width: 91.4% !important; - - .active { - .notification { - display: none; - } - - } + width: 91.5%; } div.step { position: relative; - border: 1px solid $color-gray3; + border: 1px solid $color-gray2; border-radius: 8px; margin: 0; padding: 24px 17px; @@ -760,7 +737,7 @@ } .vtex-omnishipping-1-x-deliveryChannelsWrapper { - border: 1px solid #F5F5F5; + border: 1px solid $color-white2; box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.2); border-radius: 100px; height: 36px; @@ -778,7 +755,7 @@ display: flex; flex-direction: row-reverse; justify-content: space-between; - font-family: 'Tenor Sans'; + font-family: '$font-family-secundary'; font-style: normal; font-weight: 400; font-size: 16px; @@ -834,13 +811,13 @@ .notification { margin-top: 14px; margin-bottom: 11px; - font-family: 'Open Sans'; + font-family: '$font-family'; font-style: normal; font-weight: 400; font-size: 14px; line-height: 19px; letter-spacing: -0.01em; - color: $color-gray2; + color: $color-gray; @include mq(xl, min) { font-size: 28px; @@ -858,7 +835,7 @@ } .shp-method-option-text { - font-family: 'Open Sans'; + font-family: '$font-family'; font-style: normal; font-weight: 400; font-size: 14px; @@ -876,11 +853,40 @@ } .vtex-omnishipping-1-x-deliveryOptionInactive { - color: $color-gray6; + color: $color-gray4; } .accordion-inner { padding: 0; + + .ask-for-geolocation-ask { + display: none; + } + + .ask-for-geolocation-cta { + button { + background: $color-blue2; + border-radius: 8px; + width: 100%; + font-family: '$font-family'; + font-weight: 700; + font-size: 14px; + line-height: 19px; + text-align: center; + letter-spacing: 0.05em; + text-transform: uppercase; + height: 42px; + padding: 0; + color: $color-white; + cursor: pointer; + + @include mq(xl, min) { + height: 61px; + font-size: 28px; + line-height: 38px; + } + } + } } .vtex-omnishipping-1-x-addressFormPart1 { @@ -893,13 +899,13 @@ flex-direction: column; label { - font-family: 'Open Sans'; + font-family: '$font-family'; font-style: normal; font-weight: 700; text-transform: uppercase; font-size: 12px; line-height: 16px; - color: $color-gray2; + color: $color-gray; margin-bottom: 3px; @include mq(xl, min) { @@ -912,15 +918,15 @@ width: 100%; min-width: 94.2%; height: 37px; - border: 1px solid $color-gray6; + border: 1px solid $color-gray4; border-radius: 8px; @include mq(md, max) { - min-width: 98.8%; + min-width: 98.5%; } @include mq(xl, min) { - width: 61px; + height: 61px; font-size: 28px; line-height: 38px; } @@ -928,7 +934,7 @@ small { a { - font-family: 'Open Sans'; + font-family: '$font-family'; font-style: normal; font-weight: 400; font-size: 12px; @@ -956,12 +962,12 @@ .vtex-omnishipping-1-x-deliveryGroup { .vtex-omnishipping-1-x-shippingSectionTitle { - font-family: 'Open Sans'; + font-family: '$font-family'; font-style: normal; font-weight: 700; font-size: 14px; line-height: 19px; - color: $color-gray2; + color: $color-gray; margin-bottom: 11px; @include mq(xl, min) { @@ -971,12 +977,12 @@ } .vtex-omnishipping-1-x-leanShippingGroupList { - border-color: $color-gray10; + border-color: $color-gray8; border-radius: 8px; } .vtex-omnishipping-1-x-leanShippingOptionActive { - background: #F2F2F2; + background: $color-white3; } @@ -988,12 +994,12 @@ .shp-option-text-label, .shp-option-text-time, .shp-option-text-price { - font-family: 'Open Sans'; + font-family: '$font-family'; font-style: normal; font-weight: 400; font-size: 12px; line-height: 16px; - color: $color-gray2; + color: $color-gray; @include mq(xl, min) { font-size: 24px; @@ -1002,7 +1008,7 @@ } .shp-option-text { - border-color: $color-gray10; + border-color: $color-gray8; } .shp-option-text-price { @@ -1058,12 +1064,12 @@ .delivery-address-title, p label { - font-family: 'Open Sans'; + font-family: '$font-family'; font-weight: 700; font-size: 12px; line-height: 16px; letter-spacing: 0.05em; - color: $color-gray2; + color: $color-gray; @include mq(xl, min) { font-size: 24px; @@ -1093,7 +1099,7 @@ span, a { - font-family: 'Open Sans'; + font-family: '$font-family'; font-size: 12px; line-height: 16px; @@ -1105,7 +1111,7 @@ } span { - color: $color-gray2; + color: $color-gray; } a { @@ -1137,18 +1143,36 @@ margin-bottom: 3px; } - input { + .ship-number { + input { + @include mq(sm, max) { + max-width: 97%; + } + } + } + + input, + select { width: 94.2%; min-width: 94.2%; - height: 35px; + height: 33px; + padding: 0; + padding-left: 7px; + font-family: '$font-family'; + font-style: normal; + font-weight: 400; + font-size: 14px; + line-height: 19px; @include mq(md, max) { - min-width: 98.8%; + width: 99%; + min-width: 95.5%; } @include mq(xl, min) { + width: 98.2%; font-size: 28px; line-height: 38px; height: 61px; @@ -1158,6 +1182,13 @@ font-size: 0; } } + + select { + @include mq(md, max) { + width: 100%; + min-width: 95.5%; + } + } } } @@ -1166,7 +1197,7 @@ border: 0; border-radius: 8px; width: 100%; - font-family: 'Open Sans'; + font-family: '$font-family'; font-style: normal; font-weight: 700; font-size: 14px; @@ -1264,10 +1295,6 @@ } } - - .line1-delimiter { - display: none; - } } } @@ -1284,13 +1311,13 @@ position: relative; bottom: -28px; left: -80px; - font-family: 'Open Sans'; + font-family: '$font-family'; font-style: normal; font-weight: 400; font-size: 12px; line-height: 16px; letter-spacing: 0.05em; - color: $color-gray2; + color: $color-gray; @include mq(xl, min) { bottom: -82px; @@ -1303,419 +1330,6 @@ } } - .mini-cart { - border: 1px solid $color-gray5; - border-radius: 8px; - height: 100%; - max-height: 496px; - margin-left: 16px; - - @include mq(md, max) { - width: 100% !important; - margin-bottom: 117px; - } - - @include mq(sm, max) { - width: 91.4% !important; - } - - .cart-fixed-transition { - transition: initial; - height: auto !important; - } - - .cart-fixed { - position: relative; - top: 0; - width: 100%; - height: 100% !important; - - .cart-totalizers { - margin: 0; - } - - h2 { - background: transparent; - font-family: 'Tenor Sans'; - font-weight: 400; - font-size: 16px; - line-height: 19px; - color: $color-black-400; - border: 0; - padding: 24px 0 34px 17px; - text-align: left; - - @include mq(xl, min) { - font-size: 32px; - line-height: 37px; - } - } - - .cart { - padding: 0; - - @include mq(xl, min) { - max-height: 242px; - } - - .cart-items { - overflow-x: hidden; - - .quantity, - .shipping-date { - display: none; - } - - .item { - margin: 0; - margin-bottom: 19px; - padding: 0 17px; - border: 0; - width: 90%; - - @include mq(md, max) { - width: 96.8%; - } - - @include mq(sm, max) { - width: 92.8%; - } - - img { - width: 60px; - height: 60px; - - @include mq(xl, min) { - width: 116px; - height: 116px; - } - } - - .product-name { - font-family: 'Tenor Sans'; - font-style: normal; - font-weight: 400; - font-size: 12px; - line-height: 14px; - color: $color-black; - width: 115px; - height: 60px; - margin-left: 7px; - text-overflow: initial; - white-space: initial; - display: flex; - align-items: center; - - @include mq(xl, min) { - font-size: 24px; - line-height: 28px; - width: 215px; - height: 116px; - } - } - - .price { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 400; - font-size: 12px; - line-height: 16px; - text-align: right; - color: $color-black-400; - margin: 0; - - @include mq(xl, min) { - font-size: 24px; - line-height: 33px; - } - } - } - } - } - - .link { - margin: 0; - margin-right: 17px; - margin-bottom: 10px; - - small a { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 400; - font-size: 12px; - line-height: 16px; - text-align: right; - text-decoration-line: underline; - color: $color-black; - cursor: pointer; - - @include mq(xl, min) { - font-size: 24px; - line-height: 33px; - } - } - } - - .summary-template-holder { - margin: 0; - padding: 0; - border: 0; - background: transparent; - - tbody tr { - td { - font-weight: 400; - font-size: 14px; - line-height: 19px; - color: $color-gray2; - padding: 25px 17px; - - @include mq(xl, min) { - font-size: 28px; - line-height: 38px; - } - } - } - - tr { - border-top: 1px solid $color-gray10; - - td { - font-family: 'Open Sans'; - width: 68%; - - @include mq(md, max) { - width: 81%; - } - } - } - - tfoot tr td { - font-weight: 700; - font-size: 18px; - line-height: 25px; - color: $color-black-400; - padding: 30px 17px 22px; - - @include mq(xl, min) { - font-size: 36px; - line-height: 49px; - } - } - - .info { - text-align: left; - } - - .monetary { - text-align: right; - } - } - - .payment-submit-wrap { - #payment-data-submit { - position: absolute; - top: 20px; - border-radius: 8px; - height: 42px; - background: $color-green1; - border-radius: 8px; - font-family: 'Open Sans'; - font-style: normal; - font-weight: 700; - font-size: 14px; - line-height: 19px; - text-align: center; - letter-spacing: 0.05em; - text-transform: uppercase; - color: $color-white; - margin: 0; - cursor: pointer; - - @include mq(xl, min) { - height: 61px; - font-size: 28px; - line-height: 38px; - } - - i { - display: none; - } - } - } - } - } - - #payment-data { - - - @include mq(md, max) { - margin-bottom: 17px; - } - - .step { - margin-left: 16px; - } - - .link-gift-card, - .pg-transferencia-bancaria, - #payment-group-creditControlPaymentGroup, - #payment-group-promissoryPaymentGroup, - .pg-money, - #payment-group-creditDirectSalePaymentGroup, - #payment-group-instantPaymentPaymentGroup, - #payment-group-PSEPaymentGroup, - #payment-group-customPrivate_502PaymentGroup, - #payment-group-custom201PaymentGroupPaymentGroup, - #payment-group-MercadoPagoPaymentGroup, - #payment-group-SPEIPaymentGroup { - display: none !important; - } - - .notification { - - @include mq(md, max) { - margin-bottom: 0; - } - - font-family: 'Open Sans'; - font-style: normal; - font-weight: 400; - font-size: 14px; - line-height: 24px; - margin: 0; - margin-top: 12px; - margin-bottom: 16px; - letter-spacing: -0.01em; - color: $color-gray2; - - @include mq(xl, min) { - font-size: 28px; - line-height: 38px; - } - - } - - div.store-country-BRA.active { - width: 94.6% !important; - margin-bottom: 102px; - - @include mq(md, max) { - width: 96.4% !important; - float: initial; - margin-left: 0; - margin-bottom: 0; - } - - @include mq(reset3, max) { - width: 94.4% !important; - } - - - - @include mq(sm, max) { - width: 92.4% !important; - } - - .accordion-toggle { - line-height: 24px; - letter-spacing: -0.01em; - - @include mq(xl, min) { - font-size: 32px; - line-height: 37px; - } - } - - @include mq(reset4, max) { - width: 87% !important; - } - } - - .payment-group { - margin: 0; - width: 38.1%; - - @include mq(md, max) { - width: 100%; - } - - &-list-btn { - margin: 0; - margin-right: 40px; - width: 83.9%; - - @include mq(md, max) { - width: 100%; - margin: 0; - } - } - - &-item { - margin: 0; - background: $color-gray3; - mix-blend-mode: normal; - opacity: 0.3; - border: 1px solid $color-black; - border-radius: 6px; - width: 99%; - height: 50px; - padding: 0; - display: flex; - align-items: center; - justify-content: center; - margin-bottom: 12px; - cursor: pointer; - - @include mq(md, max) { - width: 99%; - } - - &:hover, - &:active { - background: rgba(220, 221, 227, 0.3); - border: 1px solid #F15A31; - opacity: 1; - } - - - } - - &-item-text { - background: initial; - padding: 0; - font-family: 'Open Sans'; - font-style: normal; - font-weight: 400; - font-size: 14px; - line-height: 24px; - text-align: center; - opacity: 1; - letter-spacing: -0.01em; - color: #58595B; - - @include mq(xl, min) { - font-size: 28px; - line-height: 24px; - } - - &:hover, - &:active { - color: #F15A31; - text-decoration: none; - } - - - } - - } - - - - - } - - .help { color: $color-red } @@ -1730,23 +1344,3 @@ } } } - -.steps-view { - width: 56%; - border-radius: 5px; - - @include mq(md, max) { - width: 97.1%; - - input { - width: 100%; - } - } - - -} - - -p.PaymentCardHolderDocument { - display: none; -} diff --git a/checkout/src/arquivos/sass/checkout/_checkout-carrinho.scss b/checkout/src/arquivos/sass/checkout/_checkout-carrinho.scss index 15e94d3..410793f 100644 --- a/checkout/src/arquivos/sass/checkout/_checkout-carrinho.scss +++ b/checkout/src/arquivos/sass/checkout/_checkout-carrinho.scss @@ -35,7 +35,7 @@ } .cart { - border: 1px solid $color-gray3; + border: 1px solid $color-gray2; border-radius: 5px; padding: 16px; margin: 0; @@ -63,7 +63,7 @@ thead { th { - font-family: 'Tenor Sans'; + font-family: '$font-family-secundary'; font-weight: 400; font-size: 14px; line-height: 16px; @@ -131,7 +131,7 @@ padding-right: 141px; a { - font-family: 'Tenor Sans'; + font-family: '$font-family-secundary'; font-size: 12px; line-height: 14px; color: $color-black; @@ -173,12 +173,12 @@ padding-right: 91px; span { - font-family: 'Tenor Sans'; + font-family: '$font-family-secundary'; font-style: normal; font-weight: 400; font-size: 12px; line-height: 14px; - color: $color-gray8; + color: $color-gray6; @include mq(xl, min) { font-size: 24px; @@ -197,7 +197,7 @@ } td.product-price { - font-family: 'Tenor Sans'; + font-family: '$font-family-secundary'; text-align: start; width: 99px; padding-right: 49px; @@ -212,7 +212,7 @@ font-size: 12px; line-height: 14px; text-decoration-line: line-through; - color: $color-gray8; + color: $color-gray6; @include mq(xl, min) { font-size: 24px; @@ -256,12 +256,12 @@ input { box-sizing: border-box; - border: 1px solid $color-gray3; + border: 1px solid $color-gray2; width: 100%; height: 34px; border-radius: 8px; margin: 0; - font-family: 'Tenor Sans'; + font-family: '$font-family-secundary'; font-size: 14px; line-height: 16px; color: $color-black; @@ -338,7 +338,7 @@ padding-right: 22px; .total-selling-price { - font-family: 'Open Sans'; + font-family: '$font-family'; font-weight: 700; font-size: 14px; line-height: 19px; @@ -367,7 +367,7 @@ a { font-family: initial; font-size: 10px; - color: $color-gray6; + color: $color-gray4; @include mq(xl, min) { font-size: 20px; @@ -446,7 +446,7 @@ .srp-description { font-size: 14px; line-height: 18px; - color: $color-gray2; + color: $color-gray; margin: 0; margin-bottom: 10px; max-width: 276px; @@ -481,7 +481,7 @@ height: 44px; padding: 0; margin: 0; - background: $color-gray9; + background: $color-gray7; border: 0; mix-blend-mode: normal; border-radius: 8px; @@ -495,17 +495,17 @@ @include mq(lg, min) { &:hover { - background: lighten($color-gray9, 70); + background: lighten($color-gray7, 70); } &:active { - background: $color-gray9; + background: $color-gray7; } } @include mq(lg, max) { &:active { - background: lighten($color-gray9, 70); + background: lighten($color-gray7, 70); } } @@ -551,7 +551,7 @@ } &__pickup { - color: $color-gray6; + color: $color-gray4; font-weight: 400; font-size: 14px; line-height: 19px; @@ -627,10 +627,10 @@ width: 100%; height: 36px; background: $color-white; - border: 1px solid $color-gray6; + border: 1px solid $color-gray4; border-radius: 5px; margin-bottom: 5px; - font-family: 'Tenor Sans'; + font-family: '$font-family-secundary'; font-size: 12px; line-height: 14px; padding-left: 11px; @@ -645,7 +645,7 @@ small { a { - font-family: 'Tenor Sans'; + font-family: '$font-family-secundary'; font-weight: 400; font-size: 10px; line-height: 12px; @@ -788,7 +788,7 @@ } .link-coupon-add { - font-family: 'Tenor Sans'; + font-family: '$font-family-secundary'; font-weight: 400; font-size: 12px; line-height: 14px; @@ -810,11 +810,11 @@ .coupon-label { label { - font-family: 'Tenor Sans'; + font-family: '$font-family-secundary'; font-weight: 400; font-size: 12px; line-height: 14px; - color: $color-gray2; + color: $color-gray; margin-bottom: 4px; text-align: start; @@ -850,11 +850,11 @@ width: 52.7%; height: 36px; background: $color-white; - border: 1px solid $color-gray5; + border: 1px solid $color-gray3; border-radius: 5px; padding: 0; padding-left: 11px; - font-family: 'Tenor Sans'; + font-family: '$font-family-secundary'; font-weight: 400; font-size: 12px; line-height: 14px; @@ -873,12 +873,12 @@ &::placeholder { padding: 11px 0 11px 5px; - color: $color-gray6; + color: $color-gray4; } } button { - font-family: 'Open Sans'; + font-family: '$font-family'; background: $color-blue2; border-radius: 8px; height: 36px; @@ -919,13 +919,13 @@ margin-top: 6px; tr { - border-bottom: 1px solid $color-gray5; + border-bottom: 1px solid $color-gray3; width: 100%; } td { padding: 10px 0; - font-family: 'Tenor Sans'; + font-family: '$font-family-secundary'; font-weight: 400; font-size: 14px; line-height: 16px; @@ -1006,7 +1006,7 @@ height: 14px; a { - font-family: 'Tenor Sans'; + font-family: '$font-family-secundary'; font-style: normal; font-weight: 400; font-size: 12px; diff --git a/checkout/src/arquivos/sass/checkout/_checkout-pagamento.scss b/checkout/src/arquivos/sass/checkout/_checkout-pagamento.scss index 9a52731..ebb9e23 100644 --- a/checkout/src/arquivos/sass/checkout/_checkout-pagamento.scss +++ b/checkout/src/arquivos/sass/checkout/_checkout-pagamento.scss @@ -1,11 +1,457 @@ body .container-main.container-order-form .orderform-template.active { .mini-cart { width: 32.3242%; - margin-left: unset; - margin-right: 0; + margin: 0; float: right; + border: 1px solid $color-gray3; + border-radius: 8px; + height: 100%; + max-height: 496px; + + @include mq(md, max) { + width: 100%; + margin-bottom: 117px; + } + + @include mq(sm, max) { + width: 91.4%; + } + + .cart-fixed-transition { + transition: initial; + height: auto !important; + } + + .cart-fixed { + position: relative; + top: 0; + width: 100%; + height: 100% !important; + + .cart-totalizers { + margin: 0; + } + + h2 { + background: transparent; + font-family: '$font-family-secundary'; + font-weight: 400; + font-size: 16px; + line-height: 19px; + color: $color-black-400; + border: 0; + padding: 24px 0 34px 17px; + text-align: left; + + @include mq(xl, min) { + font-size: 32px; + line-height: 37px; + } + } + + .cart { + padding: 0; + + @include mq(xl, min) { + max-height: 242px; + } + + .cart-items { + overflow-x: hidden; + + .quantity, + .shipping-date { + display: none; + } + + .item { + margin: 0; + margin-bottom: 19px; + padding: 0 17px; + border: 0; + width: 90%; + display: flex; + align-items: center; + justify-content: space-between; + + @include mq(md, max) { + width: 96.8%; + } + + @include mq(sm, max) { + width: 90%; + + } + + img { + width: 60px; + height: 60px; + + @include mq(xl, min) { + width: 116px; + height: 116px; + } + } + + .product-name { + font-family: '$font-family-secundary'; + font-style: normal; + font-weight: 400; + font-size: 12px; + line-height: 14px; + color: $color-black; + width: 44%; + height: 60px; + text-overflow: initial; + white-space: initial; + display: flex; + align-items: center; + + @include mq(xl, min) { + font-size: 24px; + line-height: 28px; + width: 215px; + height: 116px; + } + } + + .description { + margin: 0; + width: 30%; + } + + .price { + font-family: '$font-family'; + font-style: normal; + font-weight: 400; + font-size: 12px; + line-height: 16px; + text-align: right; + color: $color-black-400; + margin: 0; + + @include mq(xl, min) { + font-size: 24px; + line-height: 33px; + } + } + } + } + } + + .link { + margin: 0; + margin-right: 17px; + margin-bottom: 10px; + + small a { + font-family: '$font-family'; + font-style: normal; + font-weight: 400; + font-size: 12px; + line-height: 16px; + text-align: right; + text-decoration-line: underline; + color: $color-black; + cursor: pointer; + + @include mq(xl, min) { + font-size: 24px; + line-height: 33px; + } + } + } + + .summary-template-holder { + margin: 0; + padding: 0; + border: 0; + background: transparent; + + tbody tr { + td { + font-weight: 400; + font-size: 14px; + line-height: 19px; + color: $color-gray; + padding: 25px 17px; + + @include mq(xl, min) { + font-size: 28px; + line-height: 38px; + } + } + } + + tr { + border-top: 1px solid $color-gray8; + + td { + font-family: '$font-family'; + width: 68%; + + @include mq(md, max) { + width: 81%; + } + } + } + + tfoot tr td { + font-weight: 700; + font-size: 18px; + line-height: 25px; + color: $color-black-400; + padding: 30px 17px 22px; + + @include mq(xl, min) { + font-size: 36px; + line-height: 49px; + } + } + + .info { + text-align: left; + } + + .monetary { + text-align: right; + } + } + + .payment-submit-wrap { + #payment-data-submit { + position: absolute; + top: 20px; + border-radius: 8px; + height: 42px; + background: $color-green1; + border-radius: 8px; + font-family: '$font-family'; + font-style: normal; + font-weight: 700; + font-size: 14px; + line-height: 19px; + text-align: center; + letter-spacing: 0.05em; + text-transform: uppercase; + color: $color-white; + margin: 0; + cursor: pointer; + + @include mq(xl, min) { + height: 61px; + font-size: 28px; + line-height: 38px; + } + + i { + display: none; + } + } + } + } } - .orderform-template-holder { - width: 66.1132%; + + #payment-data { + + + @include mq(md, max) { + margin-bottom: 17px; + } + + .link-gift-card, + .pg-transferencia-bancaria, + #payment-group-creditControlPaymentGroup, + #payment-group-promissoryPaymentGroup, + .pg-money, + #payment-group-creditDirectSalePaymentGroup, + #payment-group-instantPaymentPaymentGroup, + #payment-group-PSEPaymentGroup, + #payment-group-customPrivate_502PaymentGroup, + #payment-group-custom201PaymentGroupPaymentGroup, + #payment-group-MercadoPagoPaymentGroup, + #payment-group-SPEIPaymentGroup { + display: none !important; + } + + .notification { + display: block !important; + + @include mq(md, max) { + margin-bottom: 0; + } + + font-family: '$font-family'; + font-style: normal; + font-weight: 400; + font-size: 14px; + line-height: 24px; + margin: 0; + margin-top: 12px; + margin-bottom: 16px; + letter-spacing: -0.01em; + color: $color-gray; + + @include mq(xl, min) { + font-size: 28px; + line-height: 38px; + } + + } + + div.store-country-BRA.active { + width: 95% !important; + margin: 0; + margin-bottom: 102px; + + @include mq(xl, min) { + width: 97.2% !important; + } + + @include mq(md, max) { + width: 96.4% !important; + float: initial; + margin-left: 0; + margin-bottom: 0; + } + + @include mq(reset3, max) { + width: 94.4% !important; + } + + @include mq(sm, max) { + width: 92.4% !important; + } + + .accordion-toggle { + line-height: 24px; + letter-spacing: -0.01em; + + @include mq(xl, min) { + font-size: 32px; + line-height: 37px; + } + } + + @include mq(reset4, max) { + width: 87% !important; + } + + .notification { + margin-bottom: 16px; + } + } + + .payment-group { + margin: 0; + width: 38.1%; + + @include mq(md, max) { + width: 100%; + } + + &-list-btn { + margin: 0; + margin-right: 40px; + width: 83.9%; + + @include mq(md, max) { + width: 100%; + margin: 0; + } + } + + .active { + background: rgba($color-gray2, 0.3); + border: 1px solid $color-orange; + + .payment-group-item-text { + color: $color-orange; + text-decoration: none; + } + } + + &-item { + margin: 0; + background-color: rgba($color-gray2, 0.3); + mix-blend-mode: normal; + border: 1px solid rgba($color-black, 0.3); + border-radius: 6px; + width: 99%; + height: 50px; + padding: 0; + display: flex; + align-items: center; + justify-content: center; + margin-bottom: 12px; + cursor: pointer; + + @include mq(md, max) { + width: 99%; + } + + &:hover, + &:active { + background: rgba($color-gray2, 0.3); + border: 1px solid $color-orange; + } + + + + + + .payment-group-item-text { + background: initial; + padding: 0; + font-family: '$font-family'; + font-style: normal; + font-weight: 400; + font-size: 14px; + line-height: 24px; + text-align: center; + letter-spacing: -0.01em; + color: $color-gray11; + + @include mq(xl, min) { + font-size: 28px; + line-height: 24px; + } + + &:hover, + &:active { + color: $color-orange; + text-decoration: none; + } + + + } + } + + + + + } } + + .steps-view { + width: 56%; + border-radius: 5px; + padding: 0; + + @include mq(md, max) { + width: 97.1%; + + input { + width: 100%; + } + } + + + } + + + p.PaymentCardHolderDocument { + display: none; + } + } diff --git a/checkout/src/arquivos/sass/checkout/_checkout-vazio.scss b/checkout/src/arquivos/sass/checkout/_checkout-vazio.scss index 3d5ece6..2136b87 100644 --- a/checkout/src/arquivos/sass/checkout/_checkout-vazio.scss +++ b/checkout/src/arquivos/sass/checkout/_checkout-vazio.scss @@ -72,7 +72,7 @@ width: 327px; height: 48px; border: 1px solid $color-black; - font-family: 'Tenor Sans'; + font-family: '$font-family-secundary'; font-size: 14px; line-height: 16px; text-transform: uppercase; diff --git a/checkout/src/arquivos/sass/checkout/_checkout.scss b/checkout/src/arquivos/sass/checkout/_checkout.scss index d0b827b..b67f238 100644 --- a/checkout/src/arquivos/sass/checkout/_checkout.scss +++ b/checkout/src/arquivos/sass/checkout/_checkout.scss @@ -72,7 +72,7 @@ body { } #orderform-title { - color: $color-gray2; + color: $color-gray; font-family: $font-family; font-weight: 500; font-size: 36px; diff --git a/checkout/src/arquivos/sass/partials/_footer.scss b/checkout/src/arquivos/sass/partials/_footer.scss index 85456a8..a3ee82e 100644 --- a/checkout/src/arquivos/sass/partials/_footer.scss +++ b/checkout/src/arquivos/sass/partials/_footer.scss @@ -1,6 +1,6 @@ /* _footer.scss */ .footerCheckout { - color: $color-gray2; + color: $color-gray; @@ -118,7 +118,7 @@ } &__divider { - background-color: $color-gray6; + background-color: $color-gray4; display: inline-block; height: 24px; width: 1px; @@ -172,7 +172,7 @@ a { align-items: center; - color: $color-gray2; + color: $color-gray; display: flex; font-family: $font-family; font-style: normal; diff --git a/checkout/src/arquivos/sass/partials/_prateleira.scss b/checkout/src/arquivos/sass/partials/_prateleira.scss index 3129814..8db31a5 100644 --- a/checkout/src/arquivos/sass/partials/_prateleira.scss +++ b/checkout/src/arquivos/sass/partials/_prateleira.scss @@ -73,7 +73,7 @@ height: 36px; } - @include mq_range(sm4, sm6) { + @include mq_range(sm, sm6) { height: 36px; } @@ -84,7 +84,7 @@ img { width: 100%; - background-color: $color-gray7; + background-color: $color-gray5; } } @@ -101,7 +101,7 @@ height: 61px; } - @include mq_range(sm4, sm6) { + @include mq_range(sm, sm6) { width: 100%; height: 61px; } diff --git a/checkout/src/arquivos/sass/utils/_variaveis.scss b/checkout/src/arquivos/sass/utils/_variaveis.scss index 8981cca..cc11c6a 100644 --- a/checkout/src/arquivos/sass/utils/_variaveis.scss +++ b/checkout/src/arquivos/sass/utils/_variaveis.scss @@ -9,19 +9,21 @@ $color-black: #000000; $color-black-400: #292929; $color-white: #fff; +$color-white2: #F5F5F5; +$color-white3: #F2F2F2; -$color-gray: #6c6c6c; -$color-gray2: #7d7d7d; -$color-gray3: #f0f0f0; -$color-gray4: #8d8d8d; -$color-gray5: #e5e5e5; -$color-gray6: #C4C4C4; -$color-gray7: #EEEEEE; -$color-gray8: #989898; -$color-gray9: #EDEDED; -$color-gray10: #E0E0E0; -$color-gray11: #808080; -$calor-gray12: #828282; +$color-gray: #7d7d7d; +$color-gray2: #f0f0f0; +$color-gray3: #e5e5e5; +$color-gray4: #C4C4C4; +$color-gray5: #EEEEEE; +$color-gray6: #989898; +$color-gray7: #EDEDED; +$color-gray8: #E0E0E0; +$color-gray9: #808080; +$color-gray10: #828282; +$color-gray11: #58595B; +$color-gray12: #BDBDBD; @@ -30,19 +32,17 @@ $color-blue2: #00C8FF; $color-green: #4caf50; $color-green1: #298541; $color-red: #FF0000; +$color-orange: #F15A31; /* Grid breakpoints */ $grid-breakpoints: ( - xss: 295px, - xs: 320px, - xs1: 345px, sm: 601px, reset4: 421px, sm2: 456px, sm3: 487px, reset: 491px, - sm4: 600px, - sm5: 684px, + reset5: 768px, + sm4: 940px, sm6: 730px, reset2: 868px, reset3: 900px,