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

subiendo imagenes a carpeta assets #1

Open
wants to merge 32 commits into
base: master
Choose a base branch
from
+20,027 −3
Open

subiendo imagenes a carpeta assets #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
7705dd1
subiendo imagenes en carpeta assets
aurorex Feb 14, 2018
32ddae3
enlazando cambios
aurorex Feb 14, 2018
e74d13d
recorriendo imagenes y agregando funcionalidad onclick para consumir …
aurorex Feb 14, 2018
5dfbf67
subiendo estructura proyecto y servidor
LizbethFP Feb 14, 2018
bdff250
retirando carpeta icons
LizbethFP Feb 14, 2018
c3d2b99
enlazando cambios
aurorex Feb 14, 2018
44388d1
maquetado de imágenes
LizbethFP Feb 14, 2018
554a057
Merge pull request #1 from aurorex/master
LizbethFP Feb 14, 2018
00ca867
subiendo estructura de modal y fotos
LizbethFP Feb 15, 2018
6295aa0
Merge branch 'master' of https://github.com/LizbethFP/api-swapi
LizbethFP Feb 15, 2018
1ae4752
añadiendo colores
LizbethFP Feb 15, 2018
365649d
cambio de orden de personaje
LizbethFP Feb 15, 2018
311e7fe
estilos a modal e imágenes, más colores
LizbethFP Feb 15, 2018
301ab44
Merge pull request #2 from aurorex/master
LizbethFP Feb 15, 2018
8299606
añadiendo opacity a imgs y color a líneas de modal
LizbethFP Feb 15, 2018
63addbb
subiendo readme
aurorex Feb 15, 2018
e7be18c
Merge remote-tracking branch 'upstream/master'
aurorex Feb 15, 2018
a78d204
Merge pull request #3 from aurorex/master
LizbethFP Feb 15, 2018
bb45a53
modificando css
aurorex Feb 16, 2018
4cdd54f
modificando estilos
aurorex Feb 16, 2018
2123ae4
Merge remote-tracking branch 'upstream/master'
aurorex Feb 16, 2018
797e389
corección de imgs en README
LizbethFP Feb 16, 2018
2ef17b1
modificando estructura
aurorex Feb 16, 2018
a89a3b6
modificando estilos
aurorex Feb 16, 2018
e84c306
Merge remote-tracking branch 'upstream/master'
aurorex Feb 16, 2018
58aa2e7
Merge pull request #4 from aurorex/master
LizbethFP Feb 16, 2018
2be5074
Merge pull request #5 from aurorex/master
LizbethFP Feb 16, 2018
d7d2f13
reestructurando README
LizbethFP Mar 26, 2018
18ce04c
Merge branch 'master' of https://github.com/LizbethFP/api-swapi
LizbethFP Mar 26, 2018
033f4d3
corrigiendo README
LizbethFP Mar 26, 2018
2c02ebc
mejorando vista de personajes en mobile, tablet y desktop
LizbethFP Apr 9, 2018
45f05e2
arreglando diseño de modal
LizbethFP Apr 10, 2018
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules/
8 changes: 5 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# SWAPI
# API Swapi

> Recuerda seguir siempre esta [guía de estilos](https://github.com/Laboratoria/js-style-guide/)
La app Swapi nos brinda una colección de imagenes de los personajes de la pelicula STAR WARS con singulares características de cada personaje por medio de una ventana emergente al darle clic a cada uno. Esta información de obtuvo de la api oficial de Star Wars: SWAPI API.

Que la fuerza te acompañe en este ejercicio, revisa las siguientes slides para que puedas crear esta fenómenal app para los amantes de Star Wars.
![swapi-preview](https://user-images.githubusercontent.com/32282183/37887438-588f6c82-3087-11e8-89db-caebe2fa7b5f.png)

## Desarrollado para
[Laboratoria](http://laboratoria.la)
362 changes: 362 additions & 0 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.

Loading