diff --git a/css/css/home.css b/css/css/home.css index 3c48e59..46c70b7 100644 --- a/css/css/home.css +++ b/css/css/home.css @@ -1 +1 @@ -@media (min-width:900px){p{font-size:12px}#portada{width:100%;height:100%}.cd-horizontal-timeline .events-content{position:relative}.cd-horizontal-timeline .events-content li{position:absolute;z-index:1;width:100%;left:0;top:0;transform:translateX(-100%);opacity:0;animation-duration:.4s;animation-timing-function:ease-in-out}.cd-horizontal-timeline .events-content li.selected{position:relative;z-index:2;opacity:1;transform:translateX(0)}div.section-container{background:white}.cd-timeline-navigation{padding:0;margin:0;text-align:left;align:left}#timeline{z-index:10;position:absolute;bottom:0;left:0;width:100%;text-align:left;background-color:white;display:none}#timeline li{display:inline-block;width:13.9%;margin:0;padding:0;text-align:left;line-height:auto}#timeline a{background-color:transparent;text-align:left;line-height:auto}#timeline img{width:103%;opacity:.2;transition:all 1s}#timeline a.active img.img-menu{opacity:1}div.menu-content{height:100vh;background-color:white;font-size:14px;line-height:1.3em}div.extra-btn-container{position:absolute;left:-35px;top:20px;width:100px;height:100px}div.extra-btn-container a{font-family:'Londrina Solid',cursive;color:black;margin-bottom:20px;display:block}div.extra-btn-container2{position:absolute;left:-50px;top:120px;width:100px;height:100px}div.extra-btn-container3{position:absolute;left:-50px;top:220px;width:100px;height:100px}.carousel-btn{padding:0}.carousel-btn li{list-style:none}.carousel-btn a{font-family:'Londrina Solid',cursive}.carousel-btn a.active{background-color:#da222b;color:white}.carousel-btn a.active:hover,.carousel-btn a.active:active,.carousel-btn a.active:visited{background-color:#da222b;color:white}a.btn-circle{border-radius:40px}.map-popover{display:none}.referencias-popover{width:90%;height:80%}div.section-left{background-color:#ededed;min-height:100vh}a.switchMode{display:block;max-height:150px}div.section-inner-content{text-align:right}div.section-inner-content div.story-content{background-size:contain;background-position:center 5px;background-repeat:no-repeat}div.section-inner-content div.data-content{background-size:contain;background-position:center 5px;background-repeat:no-repeat}a.referencias{text-decoration:none;border-bottom:dotted 1px;color:#da222b;display:inline-block;margin-bottom:3em}a.referencias:hover{color:#fa222b}.menu-story-inner,.menu-data-inner{padding-top:2em;padding-bottom:2em}} \ No newline at end of file +@media (min-width:900px){p{font-size:12px}#portada{width:100%;height:100%}#equipo-row{font-family:'Londrina Solid',cursive;color:black;background-color:#af9f7b;padding:1em;margin-left:-15px;margin-right:-15px;text-align:center;font-weight:normal}#equipo-row span{font-weight:bold}.cd-horizontal-timeline .events-content{position:relative}.cd-horizontal-timeline .events-content li{position:absolute;z-index:1;width:100%;left:0;top:0;transform:translateX(-100%);opacity:0;animation-duration:.4s;animation-timing-function:ease-in-out}.cd-horizontal-timeline .events-content li.selected{position:relative;z-index:2;opacity:1;transform:translateX(0)}div.section-container{background:white}.cd-timeline-navigation{padding:0;margin:0;text-align:left;align:left}#timeline{z-index:10;position:absolute;bottom:0;left:0;width:100%;text-align:left;background-color:white;display:none}#timeline li{display:inline-block;width:13.9%;margin:0;padding:0;text-align:left;line-height:auto}#timeline a{background-color:transparent;text-align:left;line-height:auto}#timeline img{width:103%;opacity:.2;transition:all 1s}#timeline a.active img.img-menu{opacity:1}div.menu-content{height:100vh;background-color:white;font-size:14px;line-height:1.3em}div.extra-btn-container{position:absolute;left:-35px;top:20px;width:100px;height:100px}div.extra-btn-container a{font-family:'Londrina Solid',cursive;color:black;margin-bottom:20px;display:block}div.extra-btn-container2{position:absolute;left:-50px;top:120px;width:100px;height:100px}div.extra-btn-container3{position:absolute;left:-50px;top:220px;width:100px;height:100px}.carousel-btn{padding:0}.carousel-btn li{list-style:none}.carousel-btn a{font-family:'Londrina Solid',cursive}.carousel-btn a.active{background-color:#da222b;color:white}.carousel-btn a.active:hover,.carousel-btn a.active:active,.carousel-btn a.active:visited{background-color:#da222b;color:white}a.btn-circle{border-radius:40px}.map-popover{display:none}.referencias-popover{width:90%;height:80%}div.section-left{background-color:#ededed;min-height:100vh}a.switchMode{display:block;max-height:150px}div.section-inner-content{text-align:right}div.section-inner-content div.story-content{background-size:contain;background-position:center 5px;background-repeat:no-repeat}div.section-inner-content div.data-content{background-size:contain;background-position:center 5px;background-repeat:no-repeat}a.referencias{text-decoration:none;border-bottom:dotted 1px;color:#da222b;display:inline-block;margin-bottom:3em}a.referencias:hover{color:#fa222b}.menu-story-inner,.menu-data-inner{padding-top:2em;padding-bottom:2em}}ul.share-buttons{display:inline-block;list-style:none;padding:0;text-align:center}ul.share-buttons img{max-width:28px;margin-left:50px}ul.share-buttons li{display:inline}ul.share-buttons .sr-only{position:absolute;clip:rect(1px 1px 1px 1px);clip:rect(1px, 1px, 1px, 1px);padding:0;border:0;height:1px;width:1px;overflow:hidden} \ No newline at end of file diff --git a/css/css/home.css.map b/css/css/home.css.map index 824d22d..8bfd84e 100644 --- a/css/css/home.css.map +++ b/css/css/home.css.map @@ -1 +1 @@ -{"version":3,"sources":["home.less"],"names":[],"mappings":"AA6LC,QA7LyB,iBACtB,EACI,eAGJ,SACI,UAAA,CACA,YAGJ,uBAAwB,iBACpB,kBAGJ,uBAAwB,gBAAgB,IACpC,iBAAA,CACA,SAAA,CACA,UAAA,CACA,MAAA,CACA,KAAA,CACA,UAAW,iBAAX,CACA,SAAA,CACA,sBAAA,CACA,sCAGJ,uBAAwB,gBAAgB,GAAE,UAEtC,iBAAA,CACA,SAAA,CACA,SAAA,CACA,UAAW,cAGf,GAAG,mBACC,iBAEJ,wBACI,SAAA,CACA,QAAA,CACA,eAAA,CACA,WAEJ,UACI,UAAA,CACA,iBAAA,CACA,QAAA,CACA,MAAA,CAEA,UAAA,CACA,eAAA,CACA,sBAAA,CACA,aATJ,SAUI,IACI,oBAAA,CACA,WAAA,CACA,QAAA,CACA,SAAA,CACA,eAAA,CACA,iBAhBR,SAmBI,GACI,4BAAA,CACA,eAAA,CACA,iBAtBR,SA2BI,KACI,UAAA,CACA,UAAA,CACA,kBA9BR,SAiCI,EAAC,OAAQ,IAAG,UACR,UAIR,GAAG,cACC,YAAA,CACA,sBAAA,CACA,cAAA,CACA,kBAKJ,GAAG,qBACC,iBAAA,CACA,UAAA,CACA,QAAA,CACA,WAAA,CACA,aAEJ,GAAG,oBAAqB,GACpB,YAAc,wBAAd,CACA,WAAA,CACA,kBAAA,CACA,cAGJ,GAAG,sBACC,iBAAA,CACA,UAAA,CACA,SAAA,CACA,WAAA,CACA,aAGJ,GAAG,sBACC,iBAAA,CACA,UAAA,CACA,SAAA,CACA,WAAA,CACA,aAGJ,cACI,UADJ,aAEI,IACI,gBAHR,aAKI,GACI,YAAa,yBANrB,aASI,EAAC,QACG,wBAAA,CACA,YAXR,aAaI,EAAC,OAAO,OAbZ,aAqEH,CAxDsB,CAAC,OAAO,QAb3B,aAaoC,EAAC,OAAO,SACpC,wBAAA,CACA,YAIR,CAAC,YACG,mBAGJ,aACI,aAEJ,qBACI,SAAA,CACA,WAEJ,GAAG,cACC,wBAAA,CACA,iBAGJ,CAAC,YACG,aAAA,CACA,iBAGJ,GAAG,uBACC,iBADJ,GAAG,sBAEC,IAAG,eACC,uBAAA,CACA,8BAAA,CACA,4BALR,GAAG,sBAOC,IAAG,cACC,uBAAA,CACA,8BAAA,CACA,4BAGR,CAAC,aACG,oBAAA,CACA,wBAAA,CACA,aAAA,CAIA,oBAAA,CACA,kBAJA,CAJH,YAII,OACG,cAMR,kBAAmB,iBACf,eAAA,CACA"} \ No newline at end of file +{"version":3,"sources":["home.less"],"names":[],"mappings":"AA6MA,QA7M0B,iBACtB,EACI,eAGJ,SACI,UAAA,CACA,YAGJ,YACI,YAAc,wBAAd,CACA,WAAA,CACA,wBAAA,CAA2B,WAAA,CAC3B,iBAAA,CACA,kBAAA,CACA,iBAAA,CACA,mBAPJ,WAQI,MACI,iBAKR,uBAAwB,iBACpB,kBAGJ,uBAAwB,gBAAgB,IACpC,iBAAA,CACA,SAAA,CACA,UAAA,CACA,MAAA,CACA,KAAA,CACA,UAAW,iBAAX,CACA,SAAA,CACA,sBAAA,CACA,sCAGJ,uBAAwB,gBAAgB,GAAE,UAEtC,iBAAA,CACA,SAAA,CACA,SAAA,CACA,UAAW,cAGf,GAAG,mBACC,iBAEJ,wBACI,SAAA,CACA,QAAA,CACA,eAAA,CACA,WAEJ,UACI,UAAA,CACA,iBAAA,CACA,QAAA,CACA,MAAA,CAEA,UAAA,CACA,eAAA,CACA,sBAAA,CACA,aATJ,SAUI,IACI,oBAAA,CACA,WAAA,CACA,QAAA,CACA,SAAA,CACA,eAAA,CACA,iBAhBR,SAmBI,GACI,4BAAA,CACA,eAAA,CACA,iBAtBR,SA2BI,KACI,UAAA,CACA,UAAA,CACA,kBA9BR,SAiCI,EAAC,OAAQ,IAAG,UACR,UAIR,GAAG,cACC,YAAA,CACA,sBAAA,CACA,cAAA,CACA,kBAKJ,GAAG,qBACC,iBAAA,CACA,UAAA,CACA,QAAA,CACA,WAAA,CACA,aAEJ,GAAG,oBAAqB,GACpB,YAAc,wBAAd,CACA,WAAA,CACA,kBAAA,CACA,cAGJ,GAAG,sBACC,iBAAA,CACA,UAAA,CACA,SAAA,CACA,WAAA,CACA,aAGJ,GAAG,sBACC,iBAAA,CACA,UAAA,CACA,SAAA,CACA,WAAA,CACA,aAGJ,cACI,UADJ,aAEI,IACI,gBAHR,aAKI,GACI,YAAa,yBANrB,aASI,EAAC,QACG,wBAAA,CACA,YAXR,aAaI,EAAC,OAAO,OAbZ,aA8FH,CAjFsB,CAAC,OAAO,QAb3B,aAaoC,EAAC,OAAO,SACpC,wBAAA,CACA,YAIR,CAAC,YACG,mBAGJ,aACI,aAEJ,qBACI,SAAA,CACA,WAEJ,GAAG,cACC,wBAAA,CACA,iBAGJ,CAAC,YACG,aAAA,CACA,iBAGJ,GAAG,uBACC,iBADJ,GAAG,sBAEC,IAAG,eACC,uBAAA,CACA,8BAAA,CACA,4BALR,GAAG,sBAOC,IAAG,cACC,uBAAA,CACA,8BAAA,CACA,4BAGR,CAAC,aACG,oBAAA,CACA,wBAAA,CACA,aAAA,CAIA,oBAAA,CACA,kBAJA,CAJH,YAII,OACG,cAMR,kBAAmB,iBACf,eAAA,CACA,oBAKR,EAAE,eACE,oBAAA,CACF,eAAA,CACA,SAAA,CACA,kBAEF,EAAE,cAAe,KACb,cAAA,CACA,iBAEJ,EAAE,cAAe,IACf,eAGF,EAAE,cAAe,UACf,iBAAA,CACA,KAAM,qBAAN,CACA,KAAM,wBAAN,CACA,SAAA,CACA,QAAA,CACA,UAAA,CACA,SAAA,CACA"} \ No newline at end of file diff --git a/css/home.less b/css/home.less index 6bbdf00..f26b67c 100644 --- a/css/home.less +++ b/css/home.less @@ -9,6 +9,20 @@ height:100%; } + #equipo-row{ + font-family: 'Londrina Solid', cursive; + color:black; + background-color: #AF9F7B; padding: 1em; + margin-left:-15px; + margin-right:-15px; + text-align: center; + font-weight: normal; + span{ + font-weight: bold; + + } + } + .cd-horizontal-timeline .events-content { position: relative; } @@ -189,3 +203,28 @@ } } + +ul.share-buttons{ + display: inline-block; + list-style: none; + padding: 0; + text-align: center; +} +ul.share-buttons img{ + max-width: 28px; + margin-left:50px; +} +ul.share-buttons li{ + display: inline; +} + +ul.share-buttons .sr-only{ + position: absolute; + clip: rect(1px 1px 1px 1px); + clip: rect(1px, 1px, 1px, 1px); + padding: 0; + border: 0; + height: 1px; + width: 1px; + overflow: hidden; +} diff --git a/images/c0_portada.jpg b/images/c0_portada.jpg index 3e7cfb8..e34c4e7 100644 Binary files a/images/c0_portada.jpg and b/images/c0_portada.jpg differ diff --git a/images/c0_portada_cortada.jpg b/images/c0_portada_cortada.jpg new file mode 100644 index 0000000..e95c31b Binary files /dev/null and b/images/c0_portada_cortada.jpg differ diff --git a/js/.DS_Store b/js/.DS_Store index 912a1ac..3f10277 100644 Binary files a/js/.DS_Store and b/js/.DS_Store differ diff --git a/js/main-mvl.js b/js/main-mvl.js index 6aef75e..22e59f0 100644 --- a/js/main-mvl.js +++ b/js/main-mvl.js @@ -4,7 +4,7 @@ totalPages=7; currentPage=0; mode="desktop" sufix="desk" -//window.onresize = function(){ location.reload(); } + window.onload = function() { wwidth=$( window ).width(); if(wwidth<900) { @@ -14,6 +14,17 @@ window.onload = function() { loadData() /**** mobile ****/ + windowWidth = $(window).width(); + $(window).resize(function(){ + + // Check window width has actually changed and it's not just iOS triggering a resize event on scroll + if ($(window).width() != windowWidth) { + // Update the window width for next time + windowWidth = $(window).width(); + // Do stuff here + if(windowWidth>900) location.reload(); + } + }) } function reloadEvents(){ diff --git a/js/main.js b/js/main.js index fbbada0..72ce967 100644 --- a/js/main.js +++ b/js/main.js @@ -1,7 +1,9 @@ viewStatus= "story" /* data story */ pagesLoaded= 0 totalPages=8; -window.onresize = function(){ location.reload(); } +var windowWidth = $(window).width(); + + window.onload = function() { width = 1000, height = 1000; @@ -31,7 +33,18 @@ window.onload = function() { $('#nav-btn-page'+index + " a").addClass('active') } }); //turnEventsOn(); + windowWidth = $(window).width(); + $(window).resize(function(){ + // Check window width has actually changed and it's not just iOS triggering a resize event on scroll + if ($(window).width() != windowWidth) { + // Update the window width for next time + + windowWidth = $(window).width(); + // Do stuff here + if(windowWidth<900) location.reload(); + } + }) } function loadData(){ @@ -90,7 +103,7 @@ function loadModalEvent(j){ content: $('#map-page-'+j), closeButton: 'box' }); - console.log(j) + var modal2= new jBox('Modal', { width: '60%', diff --git a/templates/page6_desk.tmpl.html b/templates/page6_desk.tmpl.html index 2c3a1d3..5d3d07c 100644 --- a/templates/page6_desk.tmpl.html +++ b/templates/page6_desk.tmpl.html @@ -41,7 +41,7 @@
- Referencias bibliográficas - +
- + + ver mapa + + + + ver historia + + + ver datos +
diff --git a/templates/page6_mob.tmpl.html b/templates/page6_mob.tmpl.html index af6b427..bba3b56 100644 --- a/templates/page6_mob.tmpl.html +++ b/templates/page6_mob.tmpl.html @@ -38,7 +38,7 @@
- Referencias bibliográficas -
diff --git a/templates/page_mob.tmpl.html b/templates/page_mob.tmpl.html index da539c3..af9d126 100644 --- a/templates/page_mob.tmpl.html +++ b/templates/page_mob.tmpl.html @@ -33,10 +33,10 @@
- +
- +
{{:maptext}}
diff --git a/templates/portada_desk.tmpl.html b/templates/portada_desk.tmpl.html index 65e4dd2..a3dff85 100644 --- a/templates/portada_desk.tmpl.html +++ b/templates/portada_desk.tmpl.html @@ -1,29 +1,67 @@ -
-
-
- -
- Créditos +
+
+
+ +
+ +
+
-
+
+
+ Equipo: + Amanda Figueras | + Aránzazu Cruz | + Camino Prieto | + Ferrán Morales | + Ignasi Alcalde | + Mª Carmen Peñaranda | + María Luisa Ocaña | + Sergio Galán | + Victor Valles (ilustraciones) +
+
+
+

Agradecimientos:

+ A Elena Cabrera y Héctor Millano de PorCausa por aportar información de tremendo + valor y ayudarnos a creer que La Historia de Zainab valía la pena ser contada. + A Sergio Galán haciendo que la web historiadezainab.org sea una realidad. +
+
+

 

+ Y además, Hannah Williams, Alejandro Zapala, Samuel Granados, Beatriz Martínez, + Pablo Martín, JesúsDa, y todo el equipo de Visualizar'17 que nos dieron una fuerza + imprescindible para emprender este viaje. +
+
+
+ +
+ Compártelo: + +
+
+ +
+
+
+ Creative commons.
Medialab-prado 2017
+
+
-

Equipo:

-

Amanda Figueras

-

Aránzazu Cruz

-

Camino Prieto

-

Ferrán Morales

-

Ignasi Alcalde

-

Mª Carmen Peñaranda

-

María Luisa Ocaña

-

Sergio Galán

-

Victor Valles

-

Agradecimientos:

-

A Elena Cabrera y Héctor Millano de PorCausa por aportar información de tremendo valor y ayudándonos a creer que La Historia de Zainab valía la pena ser contada.

-

A Sergio Galán haciendo que la web historiadezainab.org sea una realidad.

-

Y además, Hannah Williams, Alejandro Zappala, Samuel Granados, Beatriz Martínez, Pablo Martín, JesúsDa, y todo el equipo de Visualizar'17 que nos dieron una fuerza imprescindible para emprender este viaje.

+ +
diff --git a/templates/portada_mob.tmpl.html b/templates/portada_mob.tmpl.html index d2f1b48..003b0bf 100644 --- a/templates/portada_mob.tmpl.html +++ b/templates/portada_mob.tmpl.html @@ -1,4 +1,4 @@ -
+