fix: resolve conflitos

This commit is contained in:
Jéssica Silva Oliveira dos Santos 2022-10-13 01:35:44 -03:00
commit 19551466ca
4 changed files with 30 additions and 11 deletions

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 19 KiB

BIN
assets/imagens/banner.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 MiB

View File

@ -4,19 +4,26 @@
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="style.css">
<title>Desafio Landing Page</title>
<link rel="stylesheet" href="assets/styles/styles.css">
<title>Primeiro desafio M3 academy</title>
</head>
<body>
<header class="header-page">
<a href="/">
<img class="header-logo" src="assets/imagens/Logo-M3Academy.svg" alt="Logo M3 academy">
</a>
<header class="header-page" >
<img class="header-logo"
src="assets/imagens/Logo-M3Academy 1 (2).svg" alt="">
</header>
<main>
<section>
<div>
<figure>
<img class="banner"
src="assets/imagens/banner.png" alt="banner principal">
</figure>
</div>
</section>
</main>
</body>
</html>

View File

@ -4,7 +4,6 @@ margin: 0;
padding: 0;
box-sizing: border-box;
}
.header-page
{
padding: 29px 0;
@ -16,3 +15,7 @@ background-color: #000000;
{
display: block;
}
.banner
{
width: 100%;
}