forked from M3-Academy/challenge-landing-page
fix: resolve conflitos
This commit is contained in:
commit
19551466ca
9
assets/imagens/Logo-M3Academy 1 (2).svg
Normal file
9
assets/imagens/Logo-M3Academy 1 (2).svg
Normal file
File diff suppressed because one or more lines are too long
After Width: | Height: | Size: 19 KiB |
BIN
assets/imagens/banner.png
Normal file
BIN
assets/imagens/banner.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.4 MiB |
27
index.html
27
index.html
@ -4,19 +4,26 @@
|
|||||||
<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">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
<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>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
<header class="header-page">
|
<header class="header-page" >
|
||||||
<a href="/">
|
<img class="header-logo"
|
||||||
<img class="header-logo" src="assets/imagens/Logo-M3Academy.svg" alt="Logo M3 academy">
|
src="assets/imagens/Logo-M3Academy 1 (2).svg" alt="">
|
||||||
</a>
|
</header>
|
||||||
</header>
|
<main>
|
||||||
|
<section>
|
||||||
|
<div>
|
||||||
|
<figure>
|
||||||
|
<img class="banner"
|
||||||
|
src="assets/imagens/banner.png" alt="banner principal">
|
||||||
|
</figure>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
</main>
|
||||||
|
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
@ -4,7 +4,6 @@ margin: 0;
|
|||||||
padding: 0;
|
padding: 0;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
}
|
}
|
||||||
|
|
||||||
.header-page
|
.header-page
|
||||||
{
|
{
|
||||||
padding: 29px 0;
|
padding: 29px 0;
|
||||||
@ -15,4 +14,8 @@ background-color: #000000;
|
|||||||
.header-logo
|
.header-logo
|
||||||
{
|
{
|
||||||
display: block;
|
display: block;
|
||||||
|
}
|
||||||
|
.banner
|
||||||
|
{
|
||||||
|
width: 100%;
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user