Compare commits

..

26 Commits

Author SHA1 Message Date
59a92a3c91 Merge pull request 'development' (#10) from development into main
Reviewed-on: #10
2022-10-13 15:48:48 +00:00
28a5309e57 fix(home): Corregido os links das redes sociais 2022-10-13 12:47:53 -03:00
24529dbd9f Merge pull request 'feature/4k' (#9) from feature/4k into development
Reviewed-on: #9
2022-10-13 04:10:14 +00:00
6b1cd39c6a feat(home): Responsividade Tela 4k 2022-10-13 01:09:23 -03:00
ed68f27385 fix(home): Corrigido cards de baixo 4k 2022-10-13 00:02:03 -03:00
856e3c806b fix(home): Conserto da espacamento cards do top 4k 2022-10-12 23:38:44 -03:00
0322a65722 fix(home): Corrigido a parte das cartas do topo 4k 2022-10-12 21:49:15 -03:00
cbd8cbb3ad fix(home):Conserto top-infocard desktop e mobile 2022-10-12 20:31:48 -03:00
77e3f3ef21 Merge pull request 'feat(home): Adicionado footer desktop e mobile' (#8) from feature/footer into development
Reviewed-on: #8
2022-10-12 20:03:33 +00:00
42e0aea1b7 feat(home): Adicionado footer desktop e mobile 2022-10-12 17:01:04 -03:00
abab9d67d0 Merge pull request 'feat(home): Adiciona Infocard de Baixo desktop e mobile' (#7) from feature/main/bottom-infocard into development
Reviewed-on: #7
2022-10-12 19:17:57 +00:00
37f819373a feat(home): Adiciona Infocard de Baixo desktop e mobile 2022-10-12 16:16:13 -03:00
384181c558 Merge pull request 'feat(home): Adiciona cards de baixo desktop e mobile' (#6) from feature/main/bottom-cards into development
Reviewed-on: #6
2022-10-12 14:58:13 +00:00
16c6492b03 feat(home): Adiciona cards de baixo desktop e mobile 2022-10-12 11:57:27 -03:00
af52170f1d Merge pull request 'feature/main/middle-banner' (#5) from feature/main/middle-banner into development
Reviewed-on: #5
2022-10-12 13:40:38 +00:00
8aa2e4b8a6 feat(home): Adiciona banner do meio mobile 2022-10-12 10:39:39 -03:00
78d66e3b13 fix(home): Conserto da posicao relativa do banner do meio desktop 2022-10-12 10:06:52 -03:00
a710d9ba98 feat(home): Adiciona banner do meio desktop 2022-10-11 20:51:04 -03:00
fefa192461 feat(home): Adiciona parte do banner do meio desktop 2022-10-11 18:07:17 -03:00
8f7e04c185 Merge pull request 'feat(home): Adiciona Cards do topo desktop e mobile' (#4) from feature/main/top-cards into development
Reviewed-on: #4
2022-10-10 23:57:34 +00:00
92f061a3a7 feat(home): Adiciona Cards do topo desktop e mobile 2022-10-10 20:56:28 -03:00
e257e747e7 Merge pull request 'feat(home): Adiciona Infocard do Topo desktop e mobile' (#3) from feature/main/top-infocard into development
Reviewed-on: #3
2022-10-10 22:16:19 +00:00
be0a03f815 feat(home): Adiciona Infocard do Topo desktop e mobile 2022-10-10 19:14:41 -03:00
742418fdfa Merge pull request 'feat(home): Adiciona banner principal desktop e mobile' (#2) from feature/main/main-banner into development
Reviewed-on: #2
2022-10-10 14:17:59 +00:00
2d282bedc5 feat(home): Adiciona banner principal desktop e mobile 2022-10-10 11:16:28 -03:00
99639f515b Merge pull request 'feat(home): adicionado esqueleto do projeto' (#1) from feature/header into development
Reviewed-on: #1
2022-10-09 23:47:11 +00:00
21 changed files with 603 additions and 0 deletions

View File

@ -0,0 +1,407 @@
/* Tirar as margins e paddings iniciais*/
* {
margin: 0;
padding: 0;
box-sizing: border-box;
}
/*Fonte e cores no body*/
body {
font-family: "Inter", sans-serif;
color: #000000;
}
/*Estilização do Cabeçalho*/
.page-header {
display: flex;
padding: 28px 0;
justify-content: center;
background-color: #000000;
}
.header-logo {
display: block;
}
/*Ajuste da imagem do banner principal*/
.main-banner {
width: 100%;
display: block;
}
/*Estilização do Infocard do topo */
.top-infocard {
display: flex;
flex-direction: column;
align-items: center;
padding: 74px 0 180px;
max-width: 40%;
margin: 0 auto 0;
}
.top-infocard-subtitle {
font-style: normal;
font-weight: 400;
font-size: 32px;
line-height: 39px;
text-align: center;
text-transform: uppercase;
}
.top-infocard-title {
font-style: normal;
font-weight: 500;
font-size: 48px;
line-height: 58px;
text-align: center;
text-transform: uppercase;
margin-bottom: 28px;
}
.top-infocard-description {
font-style: normal;
font-weight: 400;
font-size: 16px;
line-height: 24px;
text-align: center;
}
.top-infocard-text {
margin-bottom: 74px;
}
/*Estilização dos cards topo*/
.top-cards {
display: grid;
grid-template-columns: repeat(3, 1fr);
gap: 20px;
margin: 0 auto 80px;
width: 57%;
}
.top-card {
display: flex;
flex-direction: column;
align-items: center;
background: #ffffff;
box-shadow: 0px 4px 20px rgba(0, 0, 0, 0.23);
}
.top-card-image {
display: block;
margin-top: 35px;
}
.top-card-description {
font-style: normal;
font-weight: 400;
font-size: 16px;
line-height: 24px;
margin: 26px;
text-align: center;
}
/*Estilização dos banners do meio*/
.middle-banners {
display: flex;
justify-content: center;
background: #e0e0e0;
width: 100%;
margin-bottom: 192px;
}
.image-01 {
grid-area: image01;
}
.image-02 {
grid-area: image02;
}
.image-03 {
grid-area: image03;
}
.middle-banners-wrapper {
display: grid;
grid-template-areas: "image01 image02 image03";
width: 88%;
gap: 40px;
position: relative;
bottom: -62px;
}
.mb-imagens {
width: 100%;
}
/* Estilização dos cards inferiores*/
.bottom-cards {
display: grid;
grid-template-columns: repeat(4, 1fr);
gap: 16px;
margin: 0 auto 0;
width: 92%;
}
.bottom-card {
display: flex;
flex-direction: column;
align-items: center;
background: #ffffff;
box-shadow: 0px 4px 16px rgba(0, 0, 0, 0.15);
}
.bottom-card-image {
display: block;
margin-top: 35px;
}
.bottom-card-description {
font-style: normal;
font-weight: 400;
font-size: 16px;
line-height: 24px;
margin: 15px 32px 65px;
text-align: center;
}
/*Estilização do Infocard inferior */
.bottom-infocard {
display: flex;
flex-direction: column;
align-items: center;
padding: 108px 280px 0px;
margin-bottom: 116px;
}
.bottom-infocard-text {
margin-bottom: 50px;
max-width: 41%;
}
.bottom-infocard-subtitle {
font-weight: 600;
font-size: 32px;
line-height: 39px;
text-align: center;
}
.bottom-infocard-description {
font-weight: 400;
font-size: 16px;
line-height: 24px;
text-align: center;
}
.bottom-banner-desktop {
width: 100%;
}
/*Estilização do Rodapé*/
.page-footer {
display: flex;
flex-direction: column;
align-items: center;
background: #000000;
padding: 38px 0 38px;
}
.footer-icons {
display: flex;
list-style: none;
margin-bottom: 16px;
}
.footer-icon {
margin: 0 8px;
}
.footer-text {
font-size: 10px;
line-height: 12px;
font-weight: 400;
text-transform: uppercase;
color: #bdbdbd;
}
/* Estilização de telas menores que 1024px*/
@media screen and (max-width: 1024px) {
.main-banner-desktop {
display: none;
}
.bottom-banner-desktop {
display: none;
}
.top-infocard {
padding: 73px 32px 90px;
margin: 0 auto 0;
max-width: 100%;
}
.top-infocard-text {
margin-bottom: 65px;
}
.top-infocard-subtitle {
font-size: 20px;
line-height: 24px;
}
.top-infocard-title {
font-size: 28px;
line-height: 34px;
margin-bottom: 14px;
}
.top-infocard-description {
line-height: 24px;
margin-bottom: 0;
}
.top-infocard-image {
width: 100%;
}
.top-cards {
display: flex;
flex-direction: column;
justify-content: center;
gap: 24px;
margin: 0 auto 80px;
width: 84%;
}
.middle-banners {
margin-bottom: 112px;
}
.middle-banners-wrapper {
grid-template-areas: "image02 image01 " "image03 image03";
bottom: -32px;
row-gap: 24px;
column-gap: 14px;
margin: 0 24px 0;
}
.bottom-cards {
display: flex;
flex-direction: column;
justify-content: center;
gap: 16px;
margin: 0 auto 98px;
width: 88%;
}
.bottom-card-description {
font-size: 14px;
}
.bottom-infocard {
flex-direction: column-reverse;
margin: 0;
padding: 0;
width: 100%;
}
.bottom-infocard-text {
margin-top: 50px;
max-width: 100%;
margin: 50px 32px 88px;
}
.bottom-infocard-subtitle {
font-size: 24px;
line-height: 29px;
margin-bottom: 9px;
}
.bottom-banner-mobile {
width: 100%;
}
.page-footer {
padding: 32px 76px;
}
.footer-text {
width: 260px;
text-align: center;
}
}
@media screen and (min-width: 1024px) {
.main-banner-mobile {
display: none;
}
.bottom-banner-mobile {
display: none;
}
}
/*Estilização para telas maiores que 2500px*/
@media screen and (min-width: 2500px) {
.page-header {
padding: 56px 0;
}
.header-logo {
width: 200%;
}
.top-infocard-text {
margin-bottom: 0;
}
.top-infocard-subtitle {
font-size: 64px;
line-height: 78px;
}
.top-infocard-title {
font-size: 96px;
line-height: 116px;
}
.top-infocard-description {
font-size: 32px;
line-height: 48px;
margin-bottom: 100px;
}
.top-infocard-image {
height: 600px;
margin: 20px 0 84px;
}
.top-card-description {
font-size: 40px;
line-height: 40px;
margin: 50px 30px;
}
.top-card-image {
height: 200px;
margin-top: 100px;
}
.bottom-card-description {
font-size: 33px;
line-height: 52px;
margin: 25px 100px 73px;
}
.bottom-card-image {
height: 200px;
margin-top: 70px;
}
.bottom-banner-desktop {
width: 2500px;
}
.bottom-infocard {
margin-bottom: 210px;
padding: 200px 280px 0px;
}
.bottom-infocard-text {
width: 1174px;
}
.bottom-infocard-subtitle {
font-size: 75px;
margin-bottom: 40px;
line-height: 80px;
}
.bottom-infocard-description {
font-size: 40px;
margin-top: 20px;
line-height: 50px;
}
.page-footer {
padding: 74px 0 74px;
}
.rede-social-imagem {
height: 66px;
margin-bottom: 12px;
}
.footer-text {
font-size: 20px;
}
}

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 360 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 246 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 287 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 492 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 333 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 236 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 213 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 317 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 962 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 351 B

View File

@ -4,13 +4,200 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Desafio 1 - M3 Academy</title> <title>Desafio 1 - M3 Academy</title>
<link
href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600&family=Roboto:wght@100;300;500;700&display=swap"
rel="stylesheet">
<link rel="stylesheet" href="./assets/css/style.css"> <link rel="stylesheet" href="./assets/css/style.css">
</head> </head>
<body> <body>
<!--Cabeçalho com a Logo-->
<header class="page-header">
<a href="/">
<img class="header-logo" src="./assets/imagens/Logo-M3Academy 1.svg" alt="Logo M3 Academy" />
</a>
</header>
<main>
<!--Banner Principal da Página-->
<section>
<figure>
<img class="main-banner main-banner-desktop" src="./assets/imagens/main-banner-desktop.png"
alt="Banner principal desktop">
<img class="main-banner main-banner-mobile" src="./assets/imagens/main-banner-mobile.png"
alt="Banner principal mobile">
</figure>
</section>
<!--Banner do Infocard do Topo-->
<section class="top-infocard">
<div class="top-infocard-text">
<h2 class="top-infocard-subtitle">Lorem ipsum</h2>
<h1 class="top-infocard-title">dolor sit amet</h1>
<p class="top-infocard-description">
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras euismod enim non dui fringilla
interdum. Curabitur ut tortor sed lacus egestas vulputate vel sit amet velit. Nulla suscipit
magna
dui.
</p>
</div>
<figure class="top-infocard-picture">
<img class="top-infocard-image" src="./assets/imagens/top-infocard-image.png"
alt="Banner do Infocard do Topo">
</figure>
</section>
<!--Card do topo-->
<section class="top-cards">
<figure class="top-card">
<img class="top-card-image" src="./assets/imagens/top-card-image-01.png"
alt="Imagem do Primeiro Card do Topo" />
<figcaption>
<p class="top-card-description">
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras euismod enim non dui fringilla
interdum.
</p>
</figcaption>
</figure>
<figure class="top-card">
<img class="top-card-image" src="./assets/imagens/top-card-image-02.png"
alt="Imagem do Segundo Card do Topo" />
<figcaption>
<p class="top-card-description">
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras euismod enim non dui fringilla
interdum.
</p>
</figcaption>
</figure>
<figure class="top-card">
<img class="top-card-image" src="./assets/imagens/top-card-image-03.png"
alt="Imagem do Terceiro Card do Topo" />
<figcaption>
<p class="top-card-description">
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras euismod enim non dui fringilla
interdum.
</p>
</figcaption>
</figure>
</section>
<!--Banner com 3 imagens-->
<section class="middle-banners">
<div class="middle-banners-wrapper">
<figure class="middle-banner image-01">
<img class="mb-imagens" src="/assets/imagens/middle-banner-image-01.png"
alt="Imagem do Banner do Meio">
</figure>
<figure class="middle-banner image-02">
<img class="mb-imagens" src="/assets/imagens/middle-banner-image-02.png"
alt="Imagem do Banner do Meio">
</figure>
<figure class="middle-banner image-03">
<img class="mb-imagens" src="/assets/imagens/middle-banner-image-03.png"
alt="Imagem do Banner do Meio">
</figure>
</div>
</section>
<!--Cards da parte inferior-->
<section class="bottom-cards">
<figure class="bottom-card">
<img class="bottom-card-image" src="./assets/imagens/bottom-card-image-01.png"
alt="Imagem do Primeiro Card de Baixo">
<figcaption>
<p class="bottom-card-description">
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>
</figure>
<figure class="bottom-card">
<img class="bottom-card-image" src="./assets/imagens/bottom-card-image-02.png"
alt="Imagem do Segundo Card de Baixo">
<figcaption>
<p class="bottom-card-description">
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>
</figure>
<figure class="bottom-card">
<img class="bottom-card-image" src="./assets/imagens/bottom-card-image-03.png"
alt="Imagem do Terceiro Card de Baixo">
<figcaption>
<p class="bottom-card-description">
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>
</figure>
<figure class="bottom-card">
<img class="bottom-card-image" src="./assets/imagens/bottom-card-image-04.png"
alt="Imagem do Quarto Card de Baixo">
<figcaption>
<p class="bottom-card-description">
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>
</figure>
</section>
<!--Infocard da parte inferior-->
<section class="bottom-infocard">
<div class="bottom-infocard-text">
<h2 class="bottom-infocard-subtitle">Lorem ipsum dolor sit amet</h2>
<p class="bottom-infocard-description">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras
vulputate sapien non libero faucibus interdum. In eget tincidunt ipsum.
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.</p>
</div>
<figure>
<img class="bottom-banner bottom-banner-desktop"
src="./assets/imagens/bottom-infocard-image-desktop.png" alt="Banner do Infocard de Baixo Desktop">
</figure>
<figure>
<img class="bottom-banner bottom-banner-mobile" src="./assets/imagens/bottom-infocard-image-mobile.png"
alt="Banner do Infocard de Baixo Mobile">
</figure>
</section>
</main>
<!--Rodapé com as informações das redes sociais-->
<footer class="page-footer">
<ul class="footer-icons">
<li class="footer-icon">
<a href="https://www.instagram.com/m3.ecommerce/" target="_blank">
<img class="rede-social-imagem" src="./assets/imagens/instagram-icon.png"
alt="Icone do Instagram" />
</a>
</li>
<li class="footer-icon">
<a href="https://www.facebook.com/digitalm3/" target="_blank">
<img class="rede-social-imagem" src="./assets/imagens/facebook-icon.png" alt="Icone do Facebook" />
</a>
</li>
<li class="footer-icon">
<a href="https://www.youtube.com/channel/UCSMoUkouJCf_LUYfFiIK2yw/featured" target="_blank">
<img class="rede-social-imagem" src="./assets/imagens/youtube-icon.png" alt="Icone do Youtube" />
</a>
</li>
</ul>
<p class="footer-text">
Copyright © 2020 - Loja Comércio Eletrônico CNPJ: 000.000.000/0001-00
</p>
</footer>
</body> </body>
</html> </html>