From e5cd13faf3fc6322cec27984cb57e589c6ca3fa9 Mon Sep 17 00:00:00 2001 From: Sergio Date: Thu, 28 Sep 2017 15:21:25 +0200 Subject: [PATCH] mejoras --- css/css/home.css | 2 +- css/css/home.css.map | 2 +- css/home.less | 11 +++++++---- js/main.js | 1 - templates/page1.html | 9 ++++++--- templates/page2.html | 9 ++++----- templates/page3.html | 7 ++++--- templates/page4.html | 8 ++++---- templates/page5.html | 7 ++++--- templates/page6.html | 7 ++++--- templates/page7.html | 7 ++++--- 11 files changed, 39 insertions(+), 31 deletions(-) diff --git a/css/css/home.css b/css/css/home.css index d4ba2e6..977e58a 100644 --- a/css/css/home.css +++ b/css/css/home.css @@ -1 +1 @@ -p{font-size:12px}.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)}.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}#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;padding-left:50px;padding-right:70px}div.extra-btn-container{position:absolute;left:700px;bottom:200px}a.btn-circle{border-radius:40px}.map-popover{display:none}div.section-left{background-color:#bebeb6}a.switchMode{display:block}div.section-inner-content{text-align:right} \ No newline at end of file +p{font-size:12px}.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}#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;padding-left:50px;padding-right:70px}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 diff --git a/css/css/home.css.map b/css/css/home.css.map index 5e35352..592a38c 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,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,cAMf,wBACI,SAAA,CACA,QAAA,CACA,eAAA,CACA,WAEJ,UACI,UAAA,CACA,iBAAA,CACA,QAAA,CACA,MAAA,CACA,YAAA,CACA,UAAA,CACA,eAAA,CACA,uBARJ,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,iBAAA,CACA,mBAGJ,GAAG,qBACC,iBAAA,CACA,UAAA,CACA,aAGJ,CAAC,YACG,mBAGJ,aACI,aAEJ,GAAG,cACH,yBAGA,CAAC,YACG,cAEJ,GAAG,uBACC"} \ No newline at end of file +{"version":3,"sources":["home.less"],"names":[],"mappings":"AACA,EACI,eAGJ,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,uBARJ,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,iBAAA,CACA,mBAGJ,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 diff --git a/css/home.less b/css/home.less index cfd44d0..846aca7 100644 --- a/css/home.less +++ b/css/home.less @@ -29,7 +29,7 @@ p { } div.section-container { - + background: white; } .cd-timeline-navigation{ padding:0px; @@ -84,8 +84,10 @@ div.menu-content { div.extra-btn-container { position: absolute; - left: 700px; - bottom: 200px; + left: -50px; + top: 20px; + width: 100px; + height: 100px; } a.btn-circle { @@ -96,11 +98,12 @@ a.btn-circle { display: none; } div.section-left{ -background-color: #bebeb6; +background-color: #ededed; } a.switchMode{ display: block; + max-height: 150px; } div.section-inner-content { text-align:right; diff --git a/js/main.js b/js/main.js index d2247a6..ea605bf 100644 --- a/js/main.js +++ b/js/main.js @@ -45,7 +45,6 @@ function loadModalEvent(j){ }); } - function counterLoading(){ pagesLoaded++; if(pagesLoaded >= totalPages){ diff --git a/templates/page1.html b/templates/page1.html index 57b94df..326d482 100644 --- a/templates/page1.html +++ b/templates/page1.html @@ -25,11 +25,14 @@ + +
+ +
+ -
- ver mapa -
+
diff --git a/templates/page2.html b/templates/page2.html index 2408403..bdcfaf1 100644 --- a/templates/page2.html +++ b/templates/page2.html @@ -23,13 +23,12 @@
- +
+ +
-
- ver mapa -
- +
diff --git a/templates/page3.html b/templates/page3.html index e6f5d08..84d849d 100644 --- a/templates/page3.html +++ b/templates/page3.html @@ -23,11 +23,12 @@
+
+ +
-
- ver mapa -
+
diff --git a/templates/page4.html b/templates/page4.html index 4c4e80c..4ed03fe 100644 --- a/templates/page4.html +++ b/templates/page4.html @@ -23,12 +23,12 @@
- +
+ +
-
- ver mapa -
+
diff --git a/templates/page5.html b/templates/page5.html index 5331aea..c7b44e9 100644 --- a/templates/page5.html +++ b/templates/page5.html @@ -24,11 +24,12 @@
+
+ +
-
- ver mapa -
+
diff --git a/templates/page6.html b/templates/page6.html index 02aab14..29e6424 100644 --- a/templates/page6.html +++ b/templates/page6.html @@ -25,11 +25,12 @@
+
+ +
-
- ver mapa -
+
diff --git a/templates/page7.html b/templates/page7.html index fe4f793..399b8d0 100644 --- a/templates/page7.html +++ b/templates/page7.html @@ -24,11 +24,12 @@
+
+ +
-
- ver mapa -
+