diff --git a/.DS_Store b/.DS_Store index b6a1396..164f16d 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/c2_IMG_grafico.jpg b/c2_IMG_grafico.jpg deleted file mode 100644 index f09370b..0000000 Binary files a/c2_IMG_grafico.jpg and /dev/null differ diff --git a/css/css/home.css b/css/css/home.css index 2858582..a6e95cc 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}div.extra-btn-container{position:absolute;left:-50px;top:20px;width:100px;height:100px}a.btn-circle{border-radius:40px}.map-popover{display:none}div.section-left{background-color:#ededed}a.switchMode{display:block;max-height:150px}div.section-inner-content{text-align:right} \ 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;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}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}div.section-left{background-color:#ededed}a.switchMode{display:block;max-height:150px}div.section-inner-content{text-align:right} \ No newline at end of file diff --git a/css/css/home.css.map b/css/css/home.css.map index b23f421..0047701 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,uBAKJ,GAAG,qBACC,iBAAA,CACA,UAAA,CACA,QAAA,CACA,WAAA,CACA,aAGJ,CAAC,YACG,mBAGJ,aACI,aAEJ,GAAG,cACH,yBAGA,CAAC,YACG,aAAA,CACA,iBAEJ,GAAG,uBACC"} \ 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,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,uBAKJ,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,aAsCC,CA1BkB,CAAC,OAAO,QAZ3B,aAYoC,EAAC,OAAO,SACpC,wBAAA,CACA,YAIR,CAAC,YACG,mBAGJ,aACI,aAEJ,GAAG,cACH,yBAGA,CAAC,YACG,aAAA,CACA,iBAEJ,GAAG,uBACC"} \ No newline at end of file diff --git a/css/home.less b/css/home.less index 9408855..1a5c8e0 100644 --- a/css/home.less +++ b/css/home.less @@ -95,6 +95,24 @@ div.extra-btn-container { height: 100px; } +.carousel-btn{ + padding: 0px; + li{ + list-style: none; + } + a{ + font-family: 'Londrina Solid', cursive; + } + a.active{ + background-color:#da222b; + color:white; + } + a.active:hover,a.active:active, a.active:visited { + background-color:#da222b; + color:white; + } + +} a.btn-circle { border-radius: 40px; } diff --git a/images/c2_IMG_grafico.jpg b/images/c2_IMG_grafico.jpg index b400773..f09370b 100644 Binary files a/images/c2_IMG_grafico.jpg and b/images/c2_IMG_grafico.jpg differ diff --git a/c6_IMG_grafico_inferior.jpg b/images/c6_IMG_grafico_inferior.jpg similarity index 100% rename from c6_IMG_grafico_inferior.jpg rename to images/c6_IMG_grafico_inferior.jpg diff --git a/index.html b/index.html index cb9113a..b8bf5d9 100644 --- a/index.html +++ b/index.html @@ -6,7 +6,7 @@ - + diff --git a/js/main.js b/js/main.js index 735bf19..1e9b0eb 100644 --- a/js/main.js +++ b/js/main.js @@ -55,6 +55,7 @@ function loadModalEvent(j){ content: $('#map-page-'+j), closeButton: 'box' }); + } function counterLoading(){ @@ -62,7 +63,10 @@ function counterLoading(){ if(pagesLoaded >= totalPages){ //Todas las plantillas cargadas $('.menu-content').on("click",'.switchMode', function(e){ - if(viewStatus=="story") viewStatus="data" + if(viewStatus=="story") + { + viewStatus="data" + } else{ viewStatus="story" } @@ -77,6 +81,13 @@ function counterLoading(){ //$('.menu-content .switchMode').empty().html("ver historia") } }) + + $('#page-6').on("click",'.carousel-btn a', function(e){ + $('.carousel-btn a.active').removeClass("active") + $(this).addClass("active") + }); + + } } diff --git a/templates/page6.html b/templates/page6.html index cf33bf1..914dcc3 100644 --- a/templates/page6.html +++ b/templates/page6.html @@ -6,7 +6,65 @@