diff --git a/css/css/home.css b/css/css/home.css index caa3a78..2566593 100644 --- a/css/css/home.css +++ b/css/css/home.css @@ -1 +1 @@ -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;height:100px;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:13px;line-height:1.3em}div.extra-btn-container{position:absolute;left:-50px;top:20px;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}a.switchMode{display:block;max-height:150px}div.section-inner-content{text-align:right}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 +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:13px;line-height:1.3em}div.extra-btn-container{position:absolute;left:-50px;top:20px;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}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;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 diff --git a/css/css/home.css.map b/css/css/home.css.map index 4b906bd..9b1629d 100644 --- a/css/css/home.css.map +++ b/css/css/home.css.map @@ -1 +1 @@ -{"version":3,"sources":["home.less"],"names":[],"mappings":"AACA,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,CACA,YAAA,CACA,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,aAGJ,cACI,UADJ,aAEI,IACI,gBAHR,aAKI,GACI,YAAa,yBANrB,aAQI,EAAC,QACG,wBAAA,CACA,YAVR,aAYI,EAAC,OAAO,OAZZ,aA6DC,CAjDkB,CAAC,OAAO,QAZ3B,aAYoC,EAAC,OAAO,SACpC,wBAAA,CACA,YAIR,CAAC,YACG,mBAGJ,aACI,aAEJ,qBACI,SAAA,CACA,WAEJ,GAAG,cACC,yBAGJ,CAAC,YACG,aAAA,CACA,iBAEJ,GAAG,uBACC,iBASJ,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":"AACA,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,aAGJ,cACI,UADJ,aAEI,IACI,gBAHR,aAKI,GACI,YAAa,yBANrB,aAQI,EAAC,QACG,wBAAA,CACA,YAVR,aAYI,EAAC,OAAO,OAZZ,aAgEC,CApDkB,CAAC,OAAO,QAZ3B,aAYoC,EAAC,OAAO,SACpC,wBAAA,CACA,YAIR,CAAC,YACG,mBAGJ,aACI,aAEJ,qBACI,SAAA,CACA,WAEJ,GAAG,cACC,yBAGJ,CAAC,YACG,aAAA,CACA,iBAEJ,GAAG,uBACC,iBADJ,GAAG,sBAEC,IAAG,eACC,uBAAA,CACA,0BAAA,CACA,4BAQR,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 diff --git a/css/home.less b/css/home.less index 3817ffc..27563f9 100644 --- a/css/home.less +++ b/css/home.less @@ -47,7 +47,7 @@ div.section-container { position: absolute; bottom: 0; left: 0; - height: 100px; + /*height: 100px;*/ width: 100%; text-align: left; background-color: white; @@ -137,11 +137,14 @@ a.switchMode{ div.section-inner-content { text-align:right; div.story-content { - + background-size: contain; + background-position: center; + background-repeat: no-repeat; } - div.data-content { - + background-size: contain; + background-position: center; + background-repeat: no-repeat; } } a.referencias{ diff --git a/js/main.js b/js/main.js index 9f7a9a7..26bbf5f 100644 --- a/js/main.js +++ b/js/main.js @@ -35,8 +35,10 @@ window.onload = function() { } function loadPageTemplates(){ + $('#portada').load("templates/portada.html",function(){ + loadModalEvent(0); + }) - $('#portada').load("templates/portada.html") for (var i=1; i<= totalPages; i++){ (function (n) { $('#page-'+n).load("templates/page"+n+".html",function(){ @@ -45,11 +47,11 @@ function loadPageTemplates(){ }) })(i) } - //turnEventsOn(); } function loadModalEvent(j){ + //console.log(j) var modal = new jBox('Modal', { attach: '#map-btn-page-'+j, content: $('#map-page-'+j), @@ -70,6 +72,9 @@ function loadModalEvent(j){ function counterLoading(){ pagesLoaded++; if(pagesLoaded >= totalPages){ + var ssize=$( window ).height(); + var bottomSize=$( "#timeline" ).height(); + $('.story-content').css("height",ssize-bottomSize+'px') //Todas las plantillas cargadas $('.menu-content').on("click",'.switchMode', function(e){ if(viewStatus=="story") diff --git a/templates/page1.html b/templates/page1.html index 4412684..b66f70c 100644 --- a/templates/page1.html +++ b/templates/page1.html @@ -2,11 +2,11 @@
-
- +
+
-
diff --git a/templates/page2.html b/templates/page2.html index 6b116a4..554783a 100644 --- a/templates/page2.html +++ b/templates/page2.html @@ -2,11 +2,11 @@
-
- +
+
-
diff --git a/templates/page3.html b/templates/page3.html index c7954a3..9c4c85a 100644 --- a/templates/page3.html +++ b/templates/page3.html @@ -2,11 +2,11 @@
-
- +
+
-
diff --git a/templates/page4.html b/templates/page4.html index c16b889..61c7605 100644 --- a/templates/page4.html +++ b/templates/page4.html @@ -2,11 +2,11 @@
-
- +
+
-
diff --git a/templates/page5.html b/templates/page5.html index 1f8d0ff..6bec690 100644 --- a/templates/page5.html +++ b/templates/page5.html @@ -2,11 +2,11 @@
-
- +
+
-
@@ -30,7 +30,7 @@
- Grecia vive una llegada exponencial de personas migrantes en 2015, aumentando en más de 800.000 personas respecto al año anterior. + Grecia vive una llegada exponencial de personas migrantes en 2015, con un aumento de más de 800.000 personas respecto al año anterior. Las solicitudes de asilo suponen un escaso 2% sobre el millón de personas que han llegado a Grecia desde 2014. En 2016, 8 de cada 10 solicitudes quedaron pendientes de gestionar. diff --git a/templates/page6.html b/templates/page6.html index ad94735..218af71 100644 --- a/templates/page6.html +++ b/templates/page6.html @@ -2,8 +2,8 @@
-
- +
+