Merge pull request 'bugfix/landingPage' (#2) from bugfix/landingPage into main

Reviewed-on: #2
This commit is contained in:
Cainã Milech 2022-10-31 20:49:45 +00:00
commit eba56ddd7d
2 changed files with 127 additions and 109 deletions

View File

@ -12,12 +12,15 @@ body{
.page-header{ .page-header{
display: flex; display: flex;
justify-content: center; justify-content: center;
padding: 28px 0; padding: 29px 0;
background: #000; background: #000;
} }
.logo-header{ .logo-header{
display: block; display: contents;
}
.m3{
width: 12%; width: 12%;
} }
@ -95,7 +98,7 @@ body{
.card-icon{ .card-icon{
width: 29%; width: 29%;
margin-bottom: 30px; margin-bottom: 27px;
} }
.notebooks{ .notebooks{
@ -104,52 +107,47 @@ body{
margin-top: 80px; margin-top: 80px;
display: flex; display: flex;
justify-content: center; justify-content: center;
gap: 29px; gap: 39px;
}
.figures{
display: contents;
} }
.notebook1, .notebook2, .notebook3{ .notebook1, .notebook2, .notebook3{
width: 29.50%; width: 29.47%;
bottom: -62px; bottom: -62px;
position: relative; position: relative;
} }
.notebook1{
order: 1;
}
.notebook2{
order: 2;
}
.notebook3{
order: 3;
}
.cards-bottom{ .cards-bottom{
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
margin-top: 190px; margin-top: 191px;
gap: 16px; gap: 16px;
} }
.card-bottom{ .card-bottom{
width: 22.35%; width: 22.50%;
text-align: center; text-align: center;
box-shadow: 0px 4px 16px rgba(0, 0, 0, 0.15); box-shadow: 0px 4px 16px rgba(0, 0, 0, 0.15);
padding: 40px 26px 65px 32px; padding: 35px 32px 65px 33px;
} }
.card-bottom-text{ .card-bottom-text{
font-size: 16px; font-size: 16px;
line-height: 24px; line-height: 24px;
width: 95%;
display: inline-block;
} }
.card-bottom-icon{ .card-bottom-icon1, .card-bottom-icon3, .card-bottom-icon4{
width: 29%; width: 29%;
margin-bottom: 17px; margin-bottom: 15px;
}
.card-bottom-icon2{
width: 29%;
margin-bottom: 14px;
} }
.smartphone{ .smartphone{
@ -207,7 +205,6 @@ body{
} }
.footer-content{ .footer-content{
width: 20.67%;
margin-bottom: 38px; margin-bottom: 38px;
margin-top: 38px; margin-top: 38px;
} }
@ -215,7 +212,7 @@ body{
.social-medias{ .social-medias{
display: flex; display: flex;
flex-direction: row; flex-direction: row;
gap: 18px; gap: 21px;
justify-content: center; justify-content: center;
} }
@ -224,7 +221,7 @@ body{
} }
.icon-social-media{ .icon-social-media{
width: 7%; width: 6%;
} }
.footer-text{ .footer-text{
@ -285,12 +282,8 @@ body{
/*MOBILE*/ /*MOBILE*/
@media screen and (max-width: 1024px) { @media screen and (max-width: 1024px) {
.logo-header{ .m3{
width: 55%; width: 54.62%;
}
.banner-main-desktop{
display: none;
} }
.top-infocard-text{ .top-infocard-text{
@ -333,27 +326,29 @@ body{
} }
.notebooks{ .notebooks{
display: block; display: grid;
text-align: center; grid-template-areas: "notebook2 notebook1"
row-gap: 14px; "notebook3 notebook3";
grid-template-columns: 42.75% 42.75%;
row-gap: 24px;
column-gap: 14px;
} }
.notebook1{ .notebook1{
margin-top: 25px; grid-area: notebook1;
width: 43.52%; width: 100%;
bottom: -7px; bottom: -32px;
margin-left: 7px;
} }
.notebook2{ .notebook2{
margin-top: 25px; grid-area: notebook2;
width: 43.52%; width: 100%;
bottom: -7px; bottom: -32px;
margin-right: 7px;
} }
.notebook3{ .notebook3{
width: 90.80%; grid-area: notebook3;
width: 100%;
bottom: -32px; bottom: -32px;
} }
@ -364,6 +359,11 @@ body{
.card-bottom{ .card-bottom{
width: 88.88%; width: 88.88%;
padding-right: 33px;
}
.card-bottom-icon1{
margin-bottom: 10px;
} }
.card-bottom-text{ .card-bottom-text{
@ -390,7 +390,6 @@ body{
.article-title{ .article-title{
font-size: 24px; font-size: 24px;
line-height: 29px; line-height: 29px;
margin-bottom: 9px;
} }
.article-description{ .article-description{
@ -399,20 +398,25 @@ body{
} }
.footer-content{ .footer-content{
width: 63%;
margin-bottom: 32px; margin-bottom: 32px;
margin-top: 32px; margin-top: 32px;
} }
.icon-social-media{
width: 9.19%;
}
} }
/*DESKTOP*/ /*DESKTOP*/
@media screen and (min-width: 1025px) { @media screen and (min-width: 1025px) {
.banner-main-mobile{
display: none;
}
.article-figure-mobile{ .article-figure-mobile{
display: none; display: none;
} }
.break{
display: none;
}
} }

View File

@ -18,16 +18,18 @@
</head> </head>
<body> <body>
<header class="page-header"> <header class="page-header">
<img class="logo-header" src="/assets/images/logo-m3.svg" alt="Logo M3 Academy" /> <a class="logo-header" href="/">
<img class="m3" src="/assets/images/logo-m3.svg" alt="Logo M3 Academy" />
</a>
</header> </header>
<main> <main>
<div> <picture>
<img class="main-banner banner-main-desktop" src="/assets/images/banner-top-desktop.png" alt="Banner principal desktop" /> <source media="(max-width: 1024px)" srcset="/assets/images/banner-top-mobile.png" />
<source media="(min-width: 1025px)" srcset="/assets/images/banner-top-desktop.png" />
<img class="main-banner banner-main-mobile" src="/assets/images/banner-top-mobile.png" alt="Banner principal mobile" /> <img class="main-banner" src="/assets/images/banner-top-mobile.png" alt="Banner principal" />
</div> </picture>
<section class="top-infocard"> <section class="top-infocard">
<div class="top-infocard-text"> <div class="top-infocard-text">
@ -45,65 +47,75 @@
</div> </div>
</section> </section>
<div class="network"> <figure class="network">
<img class="network-image" src="assets/images/network.svg" alt="Ilustração de computadores" /> <img class="network-image" src="assets/images/network.svg" alt="Ilustração de computadores" />
</div>
<div class="cards">
<div class="card">
<img class="card-icon" src="/assets/images/shop.svg" alt="Icone de loja" />
<p class="card-text">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras euismod enim non dui fringilla interdum.</p>
</div>
<div class="card">
<img class="card-icon" src="/assets/images/bag.svg" alt="Icone de sacola de compras" />
<p class="card-text">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras euismod enim non dui fringilla interdum.</p>
</div>
<div class="card">
<img class="card-icon" src="/assets/images/coin.svg" alt="Icone de pagamento" />
<p class="card-text">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras euismod enim non dui fringilla interdum.</p>
</div>
</div>
<figure class="notebooks">
<img class="notebook2" src="/assets/images/notebook2.png" alt="Notebook 2" />
<img class="notebook1" src="/assets/images/notebook1.png" alt="Notebook 1" />
<img class="notebook3" src="/assets/images/notebook3.png" alt="Notebook 3" />
</figure> </figure>
<div class="cards">
<figure class="card">
<img class="card-icon" src="/assets/images/shop.svg" alt="Icone de loja" />
<figcaption class="card-text">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras euismod enim non dui fringilla interdum.</figcaption>
</figure>
<figure class="card">
<img class="card-icon" src="/assets/images/bag.svg" alt="Icone de sacola de compras" />
<figcaption class="card-text">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras euismod enim non dui fringilla interdum.</figcaption>
</figure>
<figure class="card">
<img class="card-icon" src="/assets/images/coin.svg" alt="Icone de pagamento" />
<figcaption class="card-text">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras euismod enim non dui fringilla interdum.</figcaption>
</figure>
</div>
<div class="notebooks">
<figure class="figures">
<img class="notebook1" src="/assets/images/notebook1.png" alt="Notebook 1" />
</figure>
<figure class="figures">
<img class="notebook2" src="/assets/images/notebook2.png" alt="Notebook 2" />
</figure>
<figure class="figures">
<img class="notebook3" src="/assets/images/notebook3.png" alt="Notebook 3" />
</figure>
</div>
<div class="cards-bottom"> <div class="cards-bottom">
<div class="card-bottom"> <figure class="card-bottom">
<img class="card-bottom-icon" src="/assets/images/money.svg" alt="Icone de dinheiro" /> <img class="card-bottom-icon1" src="/assets/images/money.svg" alt="Icone de dinheiro" />
<p class="card-bottom-text">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras euismod enim non dui fringilla interdum. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras euismod enim non dui fringilla interdum.</p> <figcaption class="card-bottom-text">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras euismod enim non dui fringilla interdum. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras euismod enim non dui fringilla interdum.</figcaption>
</div> </figure>
<div class="card-bottom"> <figure class="card-bottom">
<img class="card-bottom-icon" src="/assets/images/coin2.svg" alt="Icone de pagamento" /> <img class="card-bottom-icon2" src="/assets/images/coin2.svg" alt="Icone de pagamento" />
<p class="card-bottom-text">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras euismod enim non dui fringilla interdum. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras euismod enim non dui fringilla interdum.</p> <figcaption class="card-bottom-text">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras euismod enim non dui fringilla interdum. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras euismod enim non dui fringilla interdum.</figcaption>
</div> </figure>
<div class="card-bottom"> <figure class="card-bottom">
<img class="card-bottom-icon" src="/assets/images/laptop.svg" alt="Icone de laptop" /> <img class="card-bottom-icon3" src="/assets/images/laptop.svg" alt="Icone de laptop" />
<p class="card-bottom-text">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras euismod enim non dui fringilla interdum. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras euismod enim non dui fringilla interdum.</p> <figcaption class="card-bottom-text">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras euismod enim non dui fringilla interdum. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras euismod enim non dui fringilla interdum.</figcaption>
</div> </figure>
<div class="card-bottom"> <figure class="card-bottom">
<img class="card-bottom-icon smartphone" src="/assets/images/smartphone.svg" alt="Icone de smartphone" /> <img class="card-bottom-icon4 smartphone" src="/assets/images/smartphone.svg" alt="Icone de smartphone" />
<p class="card-bottom-text">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras euismod enim non dui fringilla interdum. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras euismod enim non dui fringilla interdum.</p> <figcaption class="card-bottom-text">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras euismod enim non dui fringilla interdum. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras euismod enim non dui fringilla interdum.</figcaption>
</div> </figure>
</div> </div>
<article class="article"> <div class="article">
<figure class="article-figure-mobile"> <figure class="article-figure-mobile">
<img class="article-banner-mobile" src="/assets/images/banner-article-mobile.png" alt="Banner de computadores" /> <img class="article-banner-mobile" src="/assets/images/banner-article-mobile.png" alt="Banner de computadores" />
</figure> </figure>
<div class="article-text"> <section class="article-text">
<h3 class="article-title"> <h3 class="article-title">
Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet
</h3> </h3>
@ -113,31 +125,33 @@
Quisque a tellus at lectus blandit tempor. Ut tristique auctor mi eget hendrerit. Curabitur venenatis felis vitae sagittis venenatis. Quisque a tellus at lectus blandit tempor. Ut tristique auctor mi eget hendrerit. Curabitur venenatis felis vitae sagittis venenatis.
Donec finibus turpis vitae lectus interdum rutrum vitae sed augue. Donec finibus turpis vitae lectus interdum rutrum vitae sed augue.
</p> </p>
</div> </section>
<figure class="article-figure"> <figure class="article-figure">
<img class="article-banner-desktop" src="/assets/images/banner-article-desktop.png" alt="Banner de computadores" /> <img class="article-banner-desktop" src="/assets/images/banner-article-desktop.png" alt="Banner de computadores" />
</figure> </figure>
</article> </div>
</main> </main>
<footer class="footer"> <footer class="footer">
<div class="footer-content"> <div class="footer-content">
<div class="social-medias"> <div class="social-medias">
<a class="social-media" href="#"> <a class="social-media" href="/">
<img class="icon-social-media" src="/assets/images/instagram.svg" alt="Icone do Instagram" /> <img class="icon-social-media" src="/assets/images/instagram.svg" alt="Icone do Instagram" />
</a> </a>
<a class="social-media" href="#"> <a class="social-media" href="/">
<img class="icon-social-media" src="/assets/images/facebook.svg" alt="Icone do Facebook" /> <img class="icon-social-media" src="/assets/images/facebook.svg" alt="Icone do Facebook" />
</a> </a>
<a class="social-media" href="#"> <a class="social-media" href="/">
<img class="icon-social-media" src="/assets/images/youtube.svg" alt="Icone do Youtube" /> <img class="icon-social-media" src="/assets/images/youtube.svg" alt="Icone do Youtube" />
</a> </a>
</div> </div>
<div class="footer-text"> <div class="footer-text">
<p class="footer-copyright">Copyright © 2020 - Loja Comércio Eletrônico CNPJ: 000.000.000/0001-00</p> <p class="footer-copyright">
Copyright © 2020 - Loja Comércio Eletrônico<br class="break"> CNPJ: 000.000.000/0001-00
</p>
</div> </div>
</div> </div>
</footer> </footer>