68 commits

Author	SHA1	Message	Date
Marco Rizzetto	7b1710f5a6	Update menu	2017-10-01 15:33:23 +02:00
abe-	812bf3b74a	Update menu.html	2017-09-04 17:09:26 +02:00
abe-	9f71c85262	Update footer.html	2017-09-04 16:28:34 +02:00
abe-	22c4880f73	Update footer.html	2017-09-04 16:28:05 +02:00
abe-	8a8c478cb2	créditos	2017-09-04 16:26:32 +02:00
Marco Rizzetto	58f7b3779b	Actualización créditos	2017-09-01 23:00:53 +02:00
luissevillano	688fc29c47	Merge branch 'master' of github.com:medialab-prado/poblados-colonizacion-colonias-penitenciarias	2017-06-26 10:39:33 +02:00
luissevillano	7cffd678ab	comment link 'about' to avoid error 404	2017-06-26 10:39:28 +02:00
Luis	6220e40fd2	adding caption to sliders	2017-06-20 09:01:36 +02:00
luissevillano	c1cb48f869	page.title instead site	2017-06-19 12:42:40 +02:00
luissevillano	fb1385a639	Merge branch 'master' of github.com:medialab-prado/poblados-colonizacion-colonias-penitenciarias	2017-06-19 12:35:10 +02:00
luissevillano	504f38665d	improving metas	2017-06-19 12:35:06 +02:00
abe-	e335aaa96b	Merge branch 'master' of https://github.com/medialab-prado/poblados-colonizacion-colonias-penitenciarias	2017-06-19 12:22:02 +02:00
abe-	cef4422829	centrar visualizaciones	2017-06-19 12:21:58 +02:00
luissevillano	536e871754	adding social metas	2017-06-19 12:14:17 +02:00
abe-	5f874b82fd	centrar visualizaciones	2017-06-19 12:06:43 +02:00
abe-	4e6d3c0cb6	eliminados archivos en desuso	2017-06-19 11:30:50 +02:00
abe-	8ccf2bfb3c	chgs intro index.md	2017-06-19 00:12:43 +02:00
abe-	5ace8a8bf8	conflict merge resolved	2017-06-18 23:58:08 +02:00
abe-	62480d75a3	conflict merge resolved	2017-06-18 23:56:56 +02:00
Luis	ee41ade2fa	new woman pg title	2017-06-18 12:46:45 +02:00
abe-	7e50d1ee0f	titulos	2017-06-18 12:44:23 +02:00
Luis	0595c568f3	rm default font-awesome icons	2017-06-18 12:41:06 +02:00
Luis	52ddba08e6	Merge branch 'master' of github.com:medialab-prado/poblados-colonizacion-colonias-penitenciarias	2017-06-18 12:28:57 +02:00
Luis	33a05fd711	adding header logo	2017-06-18 12:28:52 +02:00
abe-	398cdc1dd8	about	2017-06-18 12:20:08 +02:00
abe-	9bdbacd066	titulos	2017-06-18 11:58:57 +02:00
abe-	fadf252f3f	titulos	2017-06-18 11:50:02 +02:00
abe-	30abdb9ef9	titulo pagina contexto	2017-06-18 11:32:11 +02:00
abe-	0933504b9e	titulo pagina contexto	2017-06-18 11:28:13 +02:00
abe-	a1e8b7488c	nueva intrudcción	2017-06-18 06:37:13 +02:00
abe-	acb86c18d2	timeline	2017-06-18 04:25:33 +02:00
abe-	611fc46561	menu	2017-06-18 00:33:58 +02:00
abe-	6efb6054b0	parcelas	2017-06-17 21:36:31 +02:00
Luis	b044042890	adding OpenSans to menu	2017-06-17 19:33:37 +02:00
Luis	a06d69f06d	fix menu css	2017-06-17 18:15:48 +02:00
abe-	f4f8e1061b	parcelas + img modelos	2017-06-17 18:09:53 +02:00
abe-	a260bcab63	parcelas	2017-06-17 16:34:49 +02:00
Luis	ef174080a5	new map height	2017-06-17 16:09:26 +02:00
Luis	0c4f989ac4	testing PT Serif	2017-06-17 15:58:25 +02:00
Luis	b7b39f605c	move custom css to changes.scss stylesheet	2017-06-17 15:28:37 +02:00
abe-	9b22130643	rename mapa.html	2017-06-17 13:28:16 +02:00
abe-	39c692ec8d	mapa.html	2017-06-17 13:19:49 +02:00
Luis	581d0f65a1	resizing iFrames to 100%	2017-06-17 13:18:25 +02:00
abe-	b7a8d5394e	subtitle	2017-06-17 02:49:04 +02:00
abe-	8de3f41fd5	presos timeline	2017-06-16 18:29:47 +02:00
abe-	d89ea4b0de	presos timeline	2017-06-16 18:13:32 +02:00
abe-	d09b115e0f	presos timeline	2017-06-16 18:13:05 +02:00
abe-	92ba357bbf	presos timeline	2017-06-16 17:14:17 +02:00
abe-	cd0fad7906	sliders	2017-06-13 02:59:58 +02:00