Skip to content

finalizando projeto DIO #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

finalizando projeto DIO #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 20 additions & 40 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions src/app/components/big-card/big-card.component.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@


.container__big-card{

margin-left: 20px;
Expand All @@ -11,6 +13,9 @@
align-items: flex-start;
justify-content: flex-start;
}
.container__big-card:hover{
cursor: pointer;
}

.big-card__title > h1 {
margin-top: 15px;
Expand Down
7 changes: 3 additions & 4 deletions src/app/components/menu-bar/menu-bar.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
<div class="container__menu-bar">
<ul>
<li><a href="https://linkedin.com/in/felipe-aguiar-exe">Linkedin</a></li>
<li><a href="https://www.linkedin.com/in/mateus-alexandre-o-alves-360627102/">Linkedin</a></li>
<li><span>•</span></li>
<li><a href="https://github.com/felipeAguiarCode">Github</a></li>
<li><span>•</span></li>
<li><a href="https://www.youtube.com/channel/UCCcDZkI7AITYFCgDEFV9OoQ">Youtube</a></li>
<li><a href="https://github.com/mateusalexandre6">Github</a></li>

</ul>
</div>
6 changes: 4 additions & 2 deletions src/app/components/menu-title/menu-title.component.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
.container__menu-title{
color: white;
color: rgb(113, 113, 113);
}

.container__menu-title > h1{
margin-top: 15px;
margin-bottom: 15px;
font-size: 135px;
font-family: 'segoe UI';
font-family: 'Roboto', sans-serif;
display: flex;
justify-content: center;
color: rgb(113, 113, 113);

}

.container__menu-title > hr{
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/menu-title/menu-title.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="container__menu-title">
<hr/>
<h1>MARVEL BLOG</h1>
<h1>Frontend News</h1>
<hr/>
</div>
10 changes: 10 additions & 0 deletions src/app/components/small-card/small-card.component.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@
width: 700px;
margin-bottom: 15px;
}
.container__small-card:hover{
cursor: pointer;

}

h1{
font-size: 20px;
font-weight: bold;

}

.container__small-card-content{
display: flex;
Expand Down
18 changes: 9 additions & 9 deletions src/app/pages/home/home.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,33 @@

<app-big-card
Id="1"
photoCover="https://prod-ripcut-delivery.disney-plus.net/v1/variant/disney/7F51FA9F6CBD9F0C9B1394B1CC0A6A842D07091318674E234CD33CBF7C28CDC3/scale?width=1200&aspectRatio=1.78&format=jpeg"
cardTitle="NOVO HOMEM DE FERRO EM 3D"
cardDescription="Marvel Anuncia novo homem de ferro"
photoCover="./../assets/cleancode.jpg"
cardTitle="Clean Code: Boas práticas de programação"
cardDescription="Aprenda a escrever um código limpo e de qualidade"
>
</app-big-card>

</div>
<div class="articles__others">
<app-small-card
Id="2"
cardTitle="Nova Série anunciada no Disney +"
photoCover="https://disneyplusbrasil.com.br/wp-content/uploads/2021/07/Series-Marvel-Disney-Plus-1024x576.jpg"
cardTitle="Atualizações da nova versão do Angular"
photoCover="./../assets/angular.png"
>
</app-small-card>

<app-small-card
Id="3"
cardTitle="Novo filme do pantera negra lançado em breve"
photoCover="https://prod-ripcut-delivery.disney-plus.net/v1/variant/disney/35720ACD323F927C3A83D809D0F460BD3651740DA519BCC184B6F042057EA14D/scale?width=1200&aspectRatio=1.78&format=jpeg"
cardTitle="Boas práticas React"
photoCover="./../assets/react.jpg"
>
</app-small-card
>

<app-small-card
Id="4"
cardTitle="Novo filme dos X-men está em pós produção, afirma diretor"
photoCover="https://midias.correiobraziliense.com.br/_midias/jpg/2022/07/22/675x450/1_xmen-26096415.jpeg?20220722171339?20220722171339"
cardTitle="Dicas para aprender Flutter"
photoCover="./../assets/flutter.jpg"
>
</app-small-card>
</div>
Expand Down
Binary file added src/assets/angular.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/cleancode.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/flutter.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/react.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
<title>MARVEL BLOG +</title>
<title>Front-end News</title>
<base href="/">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/x-icon" href="favicon.ico">
Expand Down
6 changes: 3 additions & 3 deletions src/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
margin:0;
padding:0;
box-sizing: border-box;
background-color: #111111;
color:white;
font-family: 'Segoe UI';
background-color: #ffffff;
color:black;
font-family: 'Roboto', sans-serif;
}

a{
Expand Down