Skip to content
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.

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

Yaelvc #21

Open
wants to merge 25 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
c9f150f
Actualizando README
MarielaTorresB Jun 28, 2019
f631c33
Modificando readme, agregando enlace a la encuesta
MarielaTorresB Jun 28, 2019
504d1d8
Merge pull request #1 from MarielaTorresB/Mariela
Daynizyvc Jun 28, 2019
fbe1b3c
Agregando enlace al primer prototipo en Marvel
MarielaTorresB Jun 28, 2019
433a6a4
Merge pull request #2 from MarielaTorresB/Mariela
Daynizyvc Jun 28, 2019
143af96
Se muestra la API en la app Web y se registra nuestra primer historia…
Daynizyvc Jul 2, 2019
4057744
Merge pull request #3 from Daynizyvc/daynizyvc
Daynizyvc Jul 2, 2019
9d0963c
Probando estilos de CSS diferentes
MarielaTorresB Jul 2, 2019
1b67ddd
Añadiendo estilos CSS
MarielaTorresB Jul 3, 2019
c2069dd
Añadimos la barra menú, que ya es responsive
Daynizyvc Jul 5, 2019
f8ceec2
Merge pull request #4 from Daynizyvc/yaelvc
Daynizyvc Jul 5, 2019
4ca4997
Implementando visualización en tarjetas que giran, queda pendiente ev…
MarielaTorresB Jul 6, 2019
f150d29
Agregando gif transparente y menú
MarielaTorresB Jul 6, 2019
7d9aa7e
Versión que ya filtra por tipo de pokémon, sigue sin mostrar la infor…
MarielaTorresB Jul 7, 2019
f125a32
Merge pull request #5 from MarielaTorresB/Mariela
Daynizyvc Jul 8, 2019
a3f459c
acpetando cambios
Daynizyvc Jul 8, 2019
0d7ab38
fusionandp cambios
Daynizyvc Jul 8, 2019
e4189bb
funcion de pintar agregada
Daynizyvc Jul 10, 2019
bcc43c2
Se agregó la funcion de ordenar
Daynizyvc Jul 10, 2019
aec8230
Se ha agregado la gráfica y ya esta todo revisado por las dos
Daynizyvc Jul 13, 2019
3877595
Se agrego la grafica y detalles del css (responsive)
Daynizyvc Jul 15, 2019
8a1d735
Se agregaron cambios en las listas desplegables
Daynizyvc Jul 15, 2019
0cf470a
Se actualizo readme
Daynizyvc Jul 15, 2019
5e81508
Se arreglo lo de los test
Daynizyvc Jul 15, 2019
566ca50
Readme modificado
Daynizyvc Aug 1, 2019
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
Prev Previous commit
Next Next commit
Añadimos la barra menú, que ya es responsive
Daynizyvc committed Jul 5, 2019

Verified

This commit was signed with the committer’s verified signature.
commit c2069dd3850437ca612a26bde873ca6961d52338
Binary file added images/Pokmon.jpg
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 images/allPokemones.jpg
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 images/iconColor.png
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 images/iconGraph.png
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 images/iconoInicio
Binary file not shown.
Binary file added images/imagesOne.png
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 images/pokemones.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
38 changes: 37 additions & 1 deletion src/index.html
Original file line number Diff line number Diff line change
@@ -8,6 +8,7 @@
<title>Pokemon Start</title>
<link rel="icon" type="image/jpeg" href="../images/icon.jpg"/>
<link rel="stylesheet" href="style.css" />
<link href="https://fonts.googleapis.com/css?family=Indie+Flower|Rajdhani|Shadows+Into+Light&display=swap" rel="stylesheet">

</head>
<body>
@@ -17,11 +18,46 @@
<header class = "header">
<figure class ="titulo">
<a>
<img src="../images/titulo.gif">
<img src="../images/titulo.gif" width="100%">
</a>
</figure>
</header>

<nav class = "options">
<div class="option-one">
<figure class = "home">
<a>
<img src="../images/iconoInicio" width="40%">
</a>
</figure>
</div>

<div class = "option-two">
<figure class="show-pokemon">
<a>
<img src="../images/imagesOne.png" width="60%">
</a>
</figure>
</div>

<div class = "option-three">
<figure class = "stadistics">
<a>
<img src = "../images/iconColor.png" width = 60%>
</a>
</figure>
</div>
</nav>

<section class="information">
<div>

</div>
<div>

</div>
</section>

<section class = "all-Pokemon" id="all-Pokemon">

</section>
10 changes: 8 additions & 2 deletions src/main.js
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ const mostrarData = () => {
pokeCard +=

`<div class = "box-Pokemon">
<div class = "img">
<div class = "img-P">
<img class = "poke-img" src = "${element.img}"/>
</div>
<div class = "datos">
@@ -22,4 +22,10 @@ const mostrarData = () => {
});
allPokemon.innerHTML = pokeCard;
};
mostrarData();

mostrarData();

/*let numPokemon = POKEMON.pokemon.type.filter(function(element){
return element.lenght < 4;
});
console.log(numPokemon);*/
80 changes: 77 additions & 3 deletions src/style.css
Original file line number Diff line number Diff line change
@@ -1,20 +1,94 @@
*{
background: linear-gradient(to bottom right, red , blue); /* Standard syntax */
margin: 0%;
}

body{
padding: 0%;
}
.header{
display: flex;
justify-content: center;
background: white;
align-items: center;
background:white;
margin: 0%;
width: 100vw;
height: 25vh;
}

.titulo{
display: flex;
width: 50%;
height: 70%;
}

.options{
width: 100%wv;
height: 20%;
display: flex;
justify-content: space-around;
align-items: center;
background:black;
}

.option-one{
width: 30%;
display: flex;
}

.option-two{
width: 20%;
display: flex;
}

.option-three{
width: 20%;
display: flex;
}

.all-Pokemon{
display: flex;
flex-wrap: wrap;
align-content: space-between;
justify-content: space-between;
background: red;
}

.box-Pokemon{
width: 20%;
justify-content: space-between;
background: rgba(247, 247, 111);
border: 20px solid #d5fa02;
align-items: center;
|padding: 1%;
margin: 20px;
filter: drop-shadow(5px, 5px, 10px, #444);
}

.datos{
display: flex;
justify-content: space-around;
justify-content: space-around;
margin: auto;
align-items: center;
border-radius: 15px;
}

.img-P{
align-self: flex-start;
justify-self: flex-start;
padding: 10%;

}

.number{
font-family: 'Indie Flower', cursive;
font-family: 'Rajdhani', sans-serif;
font-family: 'Shadows Into Light', cursive;
font-size: 3em;
}

.name{
font-family: 'Indie Flower', cursive;
font-family: 'Rajdhani', sans-serif;
font-family: 'Shadows Into Light', cursive;
font-size: 3em;
}