Merge pull request 'development' (#27) from development into main

Reviewed-on: #27
This commit is contained in:
Rafael Sampaio de Oliveira 2022-12-22 11:17:13 +00:00
commit c00a75e168
9 changed files with 660 additions and 68 deletions

View File

@ -8,17 +8,17 @@ export default class Footer {
async init() {
this.list = await this.fetchApiData();
await this.selectors();
this.events();
this.cartTitle = await waitElement("#cart-title");
if (window.location.hash === "#/cart") {
await this.cartUpdate();
}
this.emptyButton = await waitElement(".link-choose-products");
this.paymentsMethods = await waitElement(".footerCheckout__payments");
this.certification = await waitElement(".footerCheckout__vtexpci");
this.emptyCartButton();
this.paymentsMethods = await waitElement(".footerCheckout__payments");
this.addPaymentsMethodsIcons();
this.certification = await waitElement(".footerCheckout__vtexpci");
this.addCertificationIcon();
this.events();
this.items = await waitElement(".footerCheckout__prateleira-container");
await this.renderItems();
await this.addCarrossel();
@ -39,7 +39,6 @@ export default class Footer {
events() {
window.addEventListener("hashchange", this.outPrateleira.bind(this));
window.addEventListener("resize", this.onRisize.bind(this));
}
async cartUpdate() {
@ -176,12 +175,6 @@ export default class Footer {
`;
}
async onRisize(e) {
const windowSize = e.target.innerWidth;
console.log(windowSize);
}
async addCarrossel() {
const elemento = await waitElement(".footerCheckout__prateleira-container");
$(elemento).slick({
@ -192,6 +185,14 @@ export default class Footer {
"<button><img class='a-left control-c prev slick-prev' src='https://agenciamagma.vteximg.com.br/arquivos/arrow-left-M3Academy.svg' /></button>",
nextArrow:
"<button><img class='a-right control-c next slick-next' src='https://agenciamagma.vteximg.com.br/arquivos/arrow-right-M3Academy.svg' /></button>",
responsive: [
{
breakpoint: 1025,
settings: {
slidesToShow: 3,
},
},
],
});
}
}

View File

@ -19,6 +19,13 @@
line-height: 16px;
text-transform: uppercase;
@media (max-width: 1024px) {
font-size: 10px;
line-height: 12px;
font-weight: 400;
margin-right: 16px;
}
&:hover {
color: lighen($color-black, 10);
}
@ -34,6 +41,10 @@
h3 {
margin-bottom: 16px;
@media (max-width: 1024px) {
margin: 38px 0;
}
span {
color: $color-black;
font-family: "Tenor Sans";
@ -41,6 +52,11 @@
font-size: 20px;
line-height: 23px;
text-transform: uppercase;
@media (max-width: 1024px) {
font-size: 14px;
line-height: 16px;
}
}
small {
@ -50,6 +66,11 @@
font-size: 20px;
line-height: 23px;
text-transform: uppercase;
@media (max-width: 1024px) {
font-size: 14px;
line-height: 16px;
}
}
}
}
@ -58,6 +79,10 @@
margin: 0 0 16px;
width: 54.883%;
@media (max-width: 1024px) {
width: 96.875% !important;
}
input {
position: relative;
height: 50px;
@ -99,6 +124,14 @@
top: -1.5%;
width: 22.555%;
@media (max-width: 1024px) {
width: 12.762%;
}
@media (max-width: 900px) {
font-size: 8px;
}
@media (max-width: 490px) {
height: 48px;
margin: 0;
@ -120,13 +153,17 @@
border: 1px solid $color-black;
border-radius: 5px;
margin-top: 10px;
width: 35.743%;
width: 366px;
@media (min-width: 1025px) and (max-width: 1026px) {
margin-top: 0;
padding: 16px;
}
@media (max-width: 1024px) {
width: 343px;
}
h3 {
color: $color-black;
margin: 0 0 8px 0;
@ -151,10 +188,14 @@
}
}
i::before {
.icon-lock::before {
color: $color-black;
font-size: 6rem;
opacity: 0.5;
@media (max-width: 1024px) {
display: none;
}
}
}
}
@ -166,7 +207,17 @@
border-radius: 8px;
border: 1px solid $color-gray3;
font-family: $font-family;
padding: 16px;
// padding: 16px;
width: 90.052%;
@media (max-width: 1024px) {
width: 293.77%;
margin-left: 16px;
}
@media (max-width: 767px) {
width: 141.5%;
}
// .accordion-heading {
// span {
@ -214,12 +265,12 @@
p {
label {
color: $color-gray9;
font-weight: 500;
font-family: "Open Sans";
font-style: normal;
font-weight: 400;
font-size: 14px;
line-height: 19px;
font-size: 12px;
line-height: 16px;
letter-spacing: 0.05em;
#opt-in-newsletter {
width: 18px;
@ -262,9 +313,8 @@
button.submit {
border: none;
border-radius: 5px;
border-radius: 8px;
background: $color-blue;
margin-top: 8px;
outline: none;
transition: all 0.2s linear;
width: 100%;
@ -306,6 +356,15 @@
font-weight: 500;
}
.vtex-omnishipping-1-x-shippingSectionTitle {
font-family: "Open Sans";
font-style: normal;
font-weight: 700;
font-size: 14px;
line-height: 19px;
color: $color-gray9;
}
.shp-lean {
border: 1px solid $color-gray11;
border-radius: 0;
@ -314,8 +373,13 @@
label {
background-color: $color-white;
box-shadow: none;
color: #303030;
color: $color-gray9 !important;
padding: 8px 12px;
font-family: "Open Sans";
font-style: normal;
font-weight: 400;
font-size: 12px;
line-height: 16px;
svg path {
fill: #d8c8ac;
@ -325,28 +389,42 @@
}
.delivery-address-title {
color: #303030;
font-size: 14px;
font-weight: 500;
font-family: "Open Sans";
font-style: normal;
font-weight: 700;
font-size: 12px;
line-height: 16px;
letter-spacing: 0.05em;
color: $color-gray9;
}
.shp-summary-group-info {
border-color: $color-gray4;
border: none !important;
}
.address-summary {
background: none;
border-color: $color-gray11;
border-radius: 8px;
color: #303030;
color: $color-gray9;
padding: 12px;
position: relative;
font-family: "Open Sans";
font-style: normal;
font-weight: 400;
font-size: 12px;
line-height: 16px;
&:first-child::before {
content: "";
background-image: url("https://agenciamagma.vteximg.com.br/arquivos/homeM3Academy.png");
background-size: 21px 20px;
width: 21px;
height: 20px;
background-image: url("https://agenciamagma.vteximg.com.br/arquivos/homeM3Academy.png") !important;
background-size: 25px 25px;
width: 25px;
height: 25px;
display: block;
position: absolute;
top: 28%;
right: 89%;
}
@include mq(md, max) {
@ -359,8 +437,48 @@
text-decoration: underline;
}
.ship-street {
display: none !important;
.street {
left: 15%;
position: absolute;
}
.neighborhood {
position: absolute;
left: 15%;
}
.neighborhood-delimiter-after {
position: absolute;
left: 36.5%;
}
.city {
position: absolute;
left: 39%;
}
.state-delimiter {
position: absolute;
left: 63%;
}
.state {
position: absolute;
left: 65%;
}
#force-shipping-fields {
top: 50%;
position: absolute;
left: 80%;
font-family: "Open Sans";
font-style: normal;
font-weight: 400;
font-size: 12px;
line-height: 16px;
text-decoration: none;
color: $color-blue;
text-transform: lowercase;
}
}
@ -380,6 +498,7 @@
.vtex-omnishipping-1-x-summaryChange {
border-color: #303030;
color: #303030;
display: none;
}
.vtex-omnishipping-1-x-deliveryChannelsToggle {
@ -412,6 +531,79 @@
td {
padding: 25px 0 !important;
}
.info {
border-bottom: 1px solid #f0f0f0;
}
}
.vtex-omnishipping-1-x-leanShippingTextLabel {
color: $color-gray9 !important;
}
.vtex-omnishipping-1-x-leanShippingText {
border-right: 1px solid $color-gray11;
}
.vtex-omnishipping-1-x-leanShippingOptionActive {
background: $color-gray12 !important;
}
.steps-view {
width: 59.746%;
height: 292px;
}
.link-gift-card {
display: none !important;
}
.payment-group-list-btn {
width: 100%;
.pg-deposito {
display: none;
}
.pg-transferencia-bancaria {
display: none;
}
#payment-group-creditDirectSalePaymentGroup {
display: none;
}
#payment-group-promissoryPaymentGroup {
display: none;
}
.pg-money {
display: none;
}
#payment-group-instantPaymentPaymentGroup {
display: none;
}
#payment-group-PSEPaymentGroup {
display: none;
}
.pg-promisory---monica {
display: none;
}
.pg-desconto-em-folha {
display: none;
}
#payment-group-MercadoPagoPaymentGroup {
display: none;
}
#payment-group-SPEIPaymentGroup {
display: none;
}
}
}
@ -420,8 +612,57 @@
display: flex;
flex-direction: column;
input {
width: 280px;
max-width: 280px;
width: 94.95%;
max-width: 100%;
height: 35px;
}
}
.vtex-omnishipping-1-x-address {
label {
font-family: "Open Sans";
font-style: normal;
font-weight: 700;
font-size: 12px;
line-height: 16px;
letter-spacing: 0.05em;
color: $color-gray9;
}
.ship-street,
.ship-neighborhood,
.ship-city,
.ship-state {
display: none;
}
.ship-number {
width: 100%;
input {
width: 94.95%;
height: 25px;
border-radius: 8px;
// margin-bottom: 20px;
}
}
.ship-receiverName {
width: 100%;
input {
width: 94.95%;
border-radius: 8px;
height: 25px;
margin: 0;
}
}
.ship-complement {
width: 100%;
input {
width: 94.95%;
border-radius: 8px;
height: 25px;
}
}
}
}

View File

@ -17,12 +17,16 @@
display: none;
}
.cart {
// border: 1px solid $color-gray3;
border: 1px solid $color-gray3;
box-sizing: border-box;
border-radius: 5px;
padding: 16px 16px;
margin-bottom: 0 !important;
@media (max-width: 1024px) {
padding: 7px 16px;
}
@include mq(md, max) {
margin: 0px 0 25px 0;
border-left: none;
@ -58,8 +62,6 @@
}
.cart {
// border: 1px solid $color-gray4;
ul li {
border-top: none;
margin-top: 0;
@ -70,6 +72,8 @@
display: flex;
align-items: center;
color: $color-black;
display: flex;
justify-content: space-between;
&:not(:first-child) {
margin-top: 8px;
@ -108,28 +112,59 @@
line-height: 16px;
text-align: right;
text-decoration-line: underline;
margin-right: 17px;
}
.summary-totalizers {
td {
border-top: 1px solid $color-gray3;
padding: 24px 17px !important;
box-sizing: border-box;
}
td.info {
width: 100%;
font-family: "Open Sans";
font-weight: 400 !important;
line-height: 19px !important;
color: $color-gray9 !important;
}
td.monetary {
font-size: 14px !important;
text-align: center !important;
color: $color-gray9 !important;
}
}
#payment-data-submit {
background: $color-black;
background: $color-green2;
border: none;
border-radius: 0;
border-radius: 8px;
color: $color-white;
outline: none;
transition: all 0.2s linear;
&:hover {
background: lighten($color-black, 5);
position: absolute;
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;
margin-top: 20px;
i {
display: none;
}
&:active {
background: darken($color-black, 5);
}
// &:hover {
// background: lighten($color-black, 5);
// }
// &:active {
// background: darken($color-black, 5);
// }
}
}
@ -150,6 +185,11 @@
}
.cart-items {
@media (max-width: 1024px) {
thead {
display: none;
}
}
.shipping-date {
font-size: 0;
@ -164,6 +204,10 @@
.product-item {
padding: 16px 0;
@media (max-width: 1024px) {
position: relative;
}
.shipping-estimate-date {
color: $color-gray6;
@ -215,11 +259,13 @@
}
.product-name {
padding-right: 0;
padding-right: 10px;
white-space: normal;
@include mq(lg, max) {
width: 250px;
@media (max-width: 1024px) {
position: absolute;
margin-left: 65px;
width: 15%;
}
a {
@ -231,6 +277,10 @@
transition: ease-in 0.22s all;
margin-left: 11px;
@media (max-width: 1024px) {
margin-left: 16px;
}
&:hover {
color: darken($color-blue, 10);
text-decoration: none;
@ -263,6 +313,10 @@
width: 7%;
}
@media (max-width: 1024px) {
display: none;
}
&::before {
content: "";
}
@ -285,6 +339,13 @@
.product-price {
font-size: 0;
@media (max-width: 1024px) {
min-width: 130px;
position: absolute;
left: 87.5%;
top: 25%;
}
&::before {
content: "Unidade";
font-size: 14px;
@ -293,9 +354,9 @@
margin-left: 35px;
}
min-width: 100px;
@include mq(md, max) {
min-width: 78px;
}
// @include mq(md, max) {
// min-width: 78px;
// }
@media (max-width: 490px) {
position: absolute;
bottom: 0;
@ -310,6 +371,11 @@
position: absolute;
margin: 8px 0 0 35px;
left: 2.5%;
@media (max-width: 1024px) {
margin: 8px 0 0 47px;
}
@include mq(sm, max) {
font-size: 12px;
line-height: 14px;
@ -339,6 +405,15 @@
width: 64.91% !important;
position: relative;
@media (max-width: 1024px) {
margin: 28px 0 0 16px;
width: 11% !important;
}
@media (max-width: 750px) {
width: 15% !important;
}
@media (max-width: 490px) {
margin-left: 84px !important;
}
@ -354,9 +429,9 @@
color: $color-gray2;
box-shadow: none;
@include mq(lg, max) {
width: 24px !important;
}
// @include mq(lg, max) {
// width: 24px !important;
// }
}
.icon-plus-sign {
@ -387,7 +462,7 @@
.item-quantity-change {
@media (max-width: 979px) and (min-width: 768px) {
position: inherit;
position: relative;
bottom: inherit;
left: inherit;
height: inherit;
@ -404,6 +479,10 @@
.quantity-price {
text-align: left;
@media (max-width: 1024px) {
display: none;
}
.icon-question-sign {
display: none;
}
@ -466,6 +545,11 @@
color: $color-gray8;
font-size: 15px;
@media (max-width: 1024px) {
position: absolute;
top: 0;
}
@include mq(md, max) {
font-size: 18px;
}
@ -492,7 +576,7 @@
width: max-content;
.srp-container {
padding: 0 0 0 10px;
padding: 0 0 0 16px;
@include mq(md, max) {
padding: 0 16px;
@ -544,6 +628,10 @@
.srp-data {
width: 280px;
@media (max-width: 1024px) {
margin-bottom: 48px;
}
.ship-country {
display: none;
}
@ -570,6 +658,10 @@
line-height: 16px;
letter-spacing: 0.05em;
@media (max-width: 1024px) {
width: 122.5%;
}
&:hover {
background-color: lighten($color-black, 5);
}
@ -583,6 +675,10 @@
.srp-toggle {
margin: 0 0 20px;
@media (max-width: 1024px) {
width: 122.5%;
}
&__wrapper {
background-color: $color-white;
border-radius: 100px;
@ -634,6 +730,10 @@
height: 36px;
padding: 12px 8px;
width: 132.31%;
@media (max-width: 1024px) {
width: 165.39%;
}
}
& ~ button {
@ -653,6 +753,11 @@
width: 76.93%;
text-transform: uppercase;
@media (max-width: 1024px) {
width: 92.31%;
right: -213px;
}
// &:hover {
// background-color: lighten($color-black, 5);
// }
@ -825,6 +930,10 @@
padding: 0 12px;
width: 50.52%;
@media (max-width: 1024px) {
width: 83.1%;
}
@include mq(sm, max) {
max-width: 100%;
width: 100%;
@ -843,6 +952,11 @@
width: 37.824%;
margin-left: 12px;
@media (max-width: 1024px) {
width: 13.46%;
margin-left: 5px;
}
@include mq(md, max) {
width: 138px;
}
@ -860,7 +974,7 @@
.accordion-group {
tr {
border-color: #e5e5e5;
border-bottom: 1px solid $color-gray5 !important;
td {
&.empty {
@ -899,6 +1013,11 @@
}
}
}
@media (max-width: 1024px) {
display: flex;
flex-direction: column;
}
}
.cart-links-bottom {
@ -906,6 +1025,11 @@
flex-direction: column;
width: 354px;
@media (max-width: 1024px) {
width: 97%;
padding: 0 16px;
}
@include mq(md, max) {
padding: 0 16px;
width: calc(100% - 32px);

View File

@ -1,12 +1,18 @@
body .container-main.container-order-form .orderform-template.active {
.mini-cart {
width: 32.3242%;
width: 32.52%;
margin-left: unset;
margin-right: 0;
float: right;
border: 1px solid $color-gray5;
border-radius: 8px;
@media (max-width: 1024px) {
width: 98.413%;
height: 397px;
margin-left: 16px;
}
.description {
margin: 0 !important;
width: 90px;
@ -21,7 +27,7 @@ body .container-main.container-order-form .orderform-template.active {
.url {
height: 60px;
width: 78.93px;
width: 60px;
margin-right: 7px;
img {
@ -29,12 +35,145 @@ body .container-main.container-order-form .orderform-template.active {
width: 100%;
}
}
.totalizers {
margin: 0 !important;
}
.table {
tbody {
tr {
border-bottom: 1px solid $color-gray5 !important;
}
}
tfoot {
.info {
font-weight: 700 !important;
color: $color-gray2 !important;
}
.monetary {
color: $color-gray2 !important;
}
}
}
}
.orderform-template-holder {
width: 66.1132%;
.row-fluid {
@media (max-width: 1024px) {
display: flex;
flex-direction: column;
}
.client-email {
@media (max-width: 767px) {
width: 102%;
}
#client-email {
width: 95.67%;
@media (max-width: 1024px) {
width: 98.54%;
}
@media (max-width: 767px) {
max-width: 100% !important;
height: 42px !important;
}
}
}
.client-first-name {
width: 50%;
margin: 0;
@media (max-width: 1024px) {
}
#client-first-name {
width: 85.87%;
@media (max-width: 1024px) {
width: 95.512%;
}
}
}
.client-last-name {
width: 50%;
label {
margin-left: 10px;
}
@media (max-width: 1024px) {
}
#client-last-name {
width: 85.87%;
margin-left: 8px;
@media (max-width: 1024px) {
width: 95.512%;
margin-left: 7px;
}
}
}
.client-document {
width: 50%;
margin: 0;
@media (max-width: 1024px) {
}
#client-document {
width: 86.585%;
margin-bottom: 0;
@media (max-width: 1024px) {
width: 95.512%;
}
}
}
.client-phone {
width: 50%;
margin: 0;
@media (max-width: 1024px) {
}
label {
margin-left: 10px;
}
#client-phone {
width: 85.87%;
margin-left: 8px;
margin-bottom: 0;
@media (max-width: 1024px) {
width: 95.512%;
}
}
}
#shipping-data {
margin: 0;
}
#payment-data {
margin: 0;
.step {
margin-bottom: 17px;
}
}
}
.client-profile-data {
.accordion-group {
padding: 26.41px 16px 28.41px 16px;
.accordion-heading {
.accordion-toggle {
&::after {
@ -71,6 +210,7 @@ body .container-main.container-order-form .orderform-template.active {
width: 20px;
height: 20px;
content: "";
margin-right: 8px;
}
img {
@ -84,10 +224,11 @@ body .container-main.container-order-form .orderform-template.active {
.shipping-data {
.accordion-group {
padding: 24.5px 16px;
.accordion-heading {
span {
color: #303030;
margin-bottom: 8px;
margin-bottom: 15px;
padding: 0;
i::before {
@ -113,6 +254,7 @@ body .container-main.container-order-form .orderform-template.active {
width: 20px;
height: 20px;
content: "";
margin-right: 8px;
}
}
@ -130,10 +272,16 @@ body .container-main.container-order-form .orderform-template.active {
.payment-data {
.accordion-group {
padding: 24.5px 16px;
width: 89.75%;
@media (max-width: 1024px) {
width: 144%;
}
.accordion-heading {
span {
color: #303030;
margin-bottom: 8px;
margin-bottom: 15px;
padding: 0;
i::before {
@ -144,13 +292,23 @@ body .container-main.container-order-form .orderform-template.active {
a {
align-items: center;
background-color: #303030;
background: transparent;
border-radius: 8px;
border: none;
color: $color-white;
display: flex;
justify-content: center;
padding: 6px 5px 6px 8px;
padding: 0;
margin-top: 10px;
&::after {
background-image: url("https://agenciamagma.vteximg.com.br/arquivos/lapisM3Academy.png");
background-size: 20px;
width: 20px;
height: 20px;
content: "";
margin-right: 8px;
}
}
}
}
@ -162,11 +320,21 @@ body .container-main.container-order-form .orderform-template.active {
}
.summary-cart-template-holder {
.cart::before {
content: "Resumo do Pedido";
font-size: 16px;
line-height: 19px;
color: $color-gray2;
.cart {
border: none;
&::before {
content: "Resumo do Pedido";
font-size: 16px;
line-height: 19px;
color: $color-gray2;
}
}
}
@media (max-width: 1024px) {
display: flex;
flex-direction: column;
padding-right: 16px;
}
}

View File

@ -16,6 +16,14 @@ footer .footerCheckout__prateleira,
header {
width: 79.53125%;
margin: 0 auto;
@media (max-width: 1024px) {
width: 100%;
}
}
table {
border-collapse: unset !important;
}
body {
@ -51,6 +59,10 @@ body {
.container-order-form,
.container-cart {
width: 80%;
@media (max-width: 1024px) {
width: 100%;
}
}
}
@ -79,6 +91,10 @@ body {
letter-spacing: 0.05em;
text-transform: uppercase;
@media (max-width: 1024px) {
margin: 20px 0 20px 16px;
}
@include mq(md, max) {
margin-left: 30px;
}

View File

@ -78,6 +78,16 @@
margin: 0 2px 0 8px;
}
@media (max-width: 1024px) {
&:first-child {
margin: 0 8px 0 16px;
}
&:last-child {
margin: 0 16px 0 8px;
}
}
[dir="rtl"] & {
float: right;
}
@ -119,6 +129,11 @@
width: 14px;
height: 30px;
color: $color-gray6;
@media (max-width: 1024px) {
left: 2.5%;
top: 48%;
}
}
.slick-next {
// z-index: 4;
@ -130,6 +145,11 @@
width: 14px;
height: 30px;
color: $color-gray6;
@media (max-width: 1024px) {
left: 96.5%;
top: 48%;
}
}
.slick-arrow.slick-hidden {
display: none;

View File

@ -82,6 +82,10 @@
@media (min-width: 1025px) and (max-width: 1107px) {
font-size: 11.5px;
}
@media (min-width: 600px) and (max-width: 690px) {
font-size: 10.5px;
}
}
&__sku {
@ -113,6 +117,10 @@
@media (min-width: 1025px) and (max-width: 1107px) {
font-size: 9.7px;
}
@media (min-width: 600px) and (max-width: 714px) {
font-size: 8.5px;
}
}
}
@ -150,8 +158,8 @@
height: 65px;
@media (max-width: 1024px) {
flex-direction: column;
align-items: flex-start;
display: grid;
padding-top: 16px;
}
&::before,
@ -169,10 +177,11 @@
font-size: 10px;
line-height: 14px;
text-transform: capitalize;
max-width: 40%;
max-width: auto;
@media (max-width: 1024px) {
margin: 15px 0;
order: 2;
}
@include mq(md, max) {
@ -189,6 +198,11 @@
width: 33.224%;
max-width: 404px;
@media (max-width: 1024px) {
width: auto;
order: 1;
}
span {
display: flex;
justify-content: space-between;
@ -228,6 +242,7 @@
@media (max-width: 1024px) {
margin-top: 10px !important;
order: 3;
}
li:first-child {

View File

@ -5,6 +5,11 @@
width: 100%;
height: 95px;
border-bottom: 1px solid $color-black;
@media (max-width: 1024px) {
height: 70px;
}
.container {
display: flex;
justify-content: center;

View File

@ -20,10 +20,12 @@ $color-gray8: #c4c4c4;
$color-gray9: #7d7d7d;
$color-gray10: #ededed;
$color-gray11: #e0e0e0;
$color-gray12: #f2f2f2;
$color-blue: #00c8ff;
$color-green: #4caf50;
$color-green2: #298541;
$color-red: #ff0000;