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.

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

CodeReview #26

Open
wants to merge 66 commits into
base: master
Choose a base branch
from
Open

CodeReview #26

Changes from 1 commit
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
498bfd7
Se agregó HTML
EtnaSI Mar 11, 2020
962161d
Se agregó CSS
EtnaSI Mar 11, 2020
1c91a70
Se agregó BD y JS
LizethRivera04 Mar 11, 2020
291d95b
Index
LizethRivera04 Mar 11, 2020
c7fe2e1
Merge branch 'master' of https://github.com/EtnaSI/CDMX009-Data-Lovers
LizethRivera04 Mar 11, 2020
0617c06
Se integró main y popup
LizethRivera04 Mar 12, 2020
6a2593c
Se modificó boton select Ordenar
EtnaSI Mar 12, 2020
7fb26ba
Se modificó estilo del select Ordenar
EtnaSI Mar 12, 2020
2f8e7e3
A
EtnaSI Mar 12, 2020
f9a3262
Ya todo funcionando, falta depurar código
EtnaSI Mar 12, 2020
fe63a16
Hacer funcionar popups
LizethRivera04 Mar 12, 2020
48f0a08
Funcionando, falta depurar código
EtnaSI Mar 14, 2020
a174687
Update README.md
EtnaSI Mar 16, 2020
b30c08c
Update README.md
EtnaSI Mar 16, 2020
e7bb4c5
Se agregaron imágenes de README
EtnaSI Mar 16, 2020
c5949c6
Listo README
EtnaSI Mar 16, 2020
47ab0b2
Update README.md
EtnaSI Mar 16, 2020
78ac729
Imagenes
EtnaSI Mar 16, 2020
f205589
Update README.md
EtnaSI Mar 16, 2020
07c0547
Update README.md
EtnaSI Mar 16, 2020
86f4f1f
Imágenes README
EtnaSI Mar 17, 2020
9c789a6
Update README.md
EtnaSI Mar 17, 2020
e642d17
Update README.md
EtnaSI Mar 17, 2020
2c9daa1
Delete historiasDeUsuario1.png
EtnaSI Mar 17, 2020
42e52c8
Delete historiasDeUsuario2.png
EtnaSI Mar 17, 2020
f9d00f7
Delete historiasDeUsuario3.png
EtnaSI Mar 17, 2020
07bad53
Delete historiasDeUsuario4.png
EtnaSI Mar 17, 2020
8a6b091
Delete historiasDeUsuario5.png
EtnaSI Mar 17, 2020
7ef740c
Update README.md
EtnaSI Mar 17, 2020
6e05300
Update README.md
EtnaSI Mar 17, 2020
a89951f
Add files via upload
EtnaSI Mar 17, 2020
334b35e
Update README.md
EtnaSI Mar 17, 2020
6052a27
Update README.md
EtnaSI Mar 17, 2020
1d807e5
Update README.md
EtnaSI Mar 17, 2020
1592498
Update README.md
EtnaSI Mar 17, 2020
aebe0a9
Delete historia7.png
EtnaSI Mar 17, 2020
fbae050
Delete historias1-2.png
EtnaSI Mar 17, 2020
87baa1f
Delete historias3-4.png
EtnaSI Mar 17, 2020
fe1a5ec
Delete historias5-6.png
EtnaSI Mar 17, 2020
fc6fa1e
Add files via upload
EtnaSI Mar 17, 2020
01f9050
Update README.md
EtnaSI Mar 17, 2020
a5b72ff
Update README.md
EtnaSI Mar 17, 2020
c9fa370
Update README.md
EtnaSI Mar 17, 2020
55a1575
Update README.md
EtnaSI Mar 17, 2020
dd80434
Cambios al README
EtnaSI Mar 17, 2020
e672262
Por ver el pull
LizethRivera04 Mar 17, 2020
ac91867
Se redujo main, se agregró docs
LizethRivera04 Mar 17, 2020
922fa86
Código depurado, pruebas
EtnaSI Mar 17, 2020
11e69a4
Merge branch 'master' of https://github.com/EtnaSI/CDMX009-Data-Lovers
EtnaSI Mar 17, 2020
7a4c438
Faltaba un div para acomodar las cards
LizethRivera04 Mar 17, 2020
7584b91
Merge branch 'master' of https://github.com/EtnaSI/CDMX009-Data-Lovers
EtnaSI Mar 17, 2020
9ca3575
Se agrega div faltante
EtnaSI Mar 18, 2020
80d5077
Se ajustó el diseño de las tarjetas
EtnaSI Mar 18, 2020
49b1d81
Update README.md
EtnaSI Mar 18, 2020
6006e8c
Update README.md
EtnaSI Mar 18, 2020
b90af45
Update README.md
EtnaSI Mar 19, 2020
69853f2
Se actualizó select Debilidades
EtnaSI Mar 19, 2020
f86a598
Se agregan opciones faltantes al select Debilidades
EtnaSI Mar 19, 2020
421f762
Se agregó footer
EtnaSI Mar 19, 2020
dd42167
Corrección de sintaxis
LizethRivera04 Mar 19, 2020
32386a5
Se corrigió link imagen pokemon
LizethRivera04 Mar 19, 2020
aa16a69
Se corrigió select weaknesses en docs
LizethRivera04 Mar 19, 2020
33239d3
Se depuró sintaxis código
LizethRivera04 Mar 19, 2020
cbdd1c6
Se corrigió select type en docs
LizethRivera04 Mar 19, 2020
084860d
Imagen WebSite
EtnaSI Aug 22, 2020
ef45d43
Add files via upload
EtnaSI Aug 22, 2020
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
234 changes: 234 additions & 0 deletions src/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,234 @@
@import url('https://fonts.googleapis.com/css?family=Saira+Condensed&display=swap');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bien por el uso de fuentes externas


*{
width: 100%;
margin: 0;
}
header {
background: url(./imagenes/imagenHeaderPokemon.jpeg);
background-position: center;
background-attachment: contain;
background-size: cover;
display: flex;
width: 100%;
height: 20%;
justify-content: center;
}
.logo{
display: flex;
align-self: center;
width: 400px;
height: auto;
}
.searchContainer {
width: 100%;
height: 80px;
background: #4F4F52;
display: flex;
justify-content: center;
}
.searchItems{
display: flex;
flex-direction: row;
align-items: center;
justify-content:space-around;
width: 80%;
}
.instruction {
color: #E5E5E5;
font-size: 35px;
font-family: Saira Condensed;
}
.type, .weaknesses{
border-radius: 5px;
border: 2px solid #E5E5E5;
font-size: 25px;
font-family: Saira Condensed;
color: #314F8B;
margin: 3%;
}
.goButton {
background: #E5E5E5;
border-radius: 100px;
font-family: Saira Condensed;
font-size: 25px;
color: #314F8B;
font-weight: bold;
text-decoration: none;
width: 200px;
}
.inputNumber {
width: auto;
height: 30px;
border-radius: 5px;
border: 2px solid #E5E5E5;
font-size: 25px;
font-family: Saira Condensed;
color: #314F8B;
margin: 3%;
}
.sortPokemonContainer{
width: 80%;
height: auto;
background: #4F4F52;
display: flex;
justify-content: center;
}
.sortPokemon{
width: 200px;
color: #314F8B;
border: 2px solid #E5E5E5;
font-size: 25px;
font-family: Saira Condensed;
display: flex;
align-items: center;
}
.displayPokemon{
display: flex;
flex-direction: row;
flex-wrap: wrap;
justify-content:space-around;
align-items: center;
align-content: space-around;
}
.cardsContainer{
width: 80%;
display: flex;
flex-direction: row;
flex-wrap: wrap;
justify-content:space-around;
align-items: center;
align-content: space-around;
margin-top: 3%;
}
.pokemonCard{
margin: 2.5% 0% 2.5% 0%;
display: flex;
flex-direction: column;
width: 300px;
height: 350px;
background: #E5E5E5;
border-radius: 10%;
}
.imageContainer{
width: 200px;
height: auto;
align-self: center;
margin-top:10%;
}
.cardImage{
align-self: center;
}
.cardNumber{
align-self: flex-start;
color: #646671;
font-size: 25px;
font-weight: bold;
font-family: Saira Condensed;
margin-left: 10%;
}
.cardName{
align-self: flex-start;
color: #3B3B3C;
font-size: 30px;
font-weight: bolder;
font-family: Saira Condensed;
margin-left: 10%;
}
.profileContainer{
display: flex;
flex-direction: column;
}
.profileCard{
display: flex;
flex-direction: row;
flex-wrap: wrap;
width: 750px;
height: 500px;
background: #E5E5E5;
border-radius: 10%;
margin-top: 5%;
}
.profileCardLeft{
display: flex;
flex-direction: column;
flex-wrap: wrap;
width: 350px;
height: auto;
}
.profileName{
color: #3B3B3C;
font-size: 50px;
font-weight: bolder;
font-family: Saira Condensed;
margin: 10% 0% 0% 15%;
}
.profileNumber{
color: #646671;
font-size: 40px;
font-weight: bolder;
font-family: Saira Condensed;
margin: 0% 0% 0% 15%;
}
.profileImageContainer{
display: flex;
width: 270px;
height: 270px;
background: #ffff;
border-radius: 10%;
margin: 5% 0% 0% 15%;
align-items: center;
align-content: center;
justify-content: center;
}
.profileImage {
width: 200px;
height: auto;
align-self: center;
}
.profileCardRight{
display: flex;
flex-direction: column;
flex-wrap: nowrap;
width: 400px;
height: auto;
align-items: center;
align-content: center;
justify-content: center;
}
.closeButton{
height: 20px;
width: auto;
background: #fff;
}
.spawnChanceTitle, .typeTitle, .weaknessesTitle{
align-self: flex-start;
color: #3B3B3C;
font-size: 27px;
font-weight: bolder;
font-family: Saira Condensed;
margin-left: 5%;
margin-top: 3%;
}
.profileEgg, .profileCandyCount, .profileSpawnChance, .profileType, .profileWeaknesses{
align-self: flex-start;
color: #646671;
font-size: 27px;
font-weight: lighter;
font-family: Saira Condensed;
margin-left: 5%;
}

/*.footer {
width: 100%;
background: #4F4F52;
height: 80px;
align-self: flex-end;
}

footer p {
font-size: 25px;
text-align: center;
color: #E5E5E5;
font-family: Saira Condensed;
}*/