From 2b50849caa5fe69eb21077663e6f00dab88ab9e3 Mon Sep 17 00:00:00 2001 From: Sergio Date: Wed, 27 Sep 2017 13:00:50 +0200 Subject: [PATCH] sin transicion, cambio menu --- css/css/home.css | 2 +- css/css/home.css.map | 2 +- css/home.less | 14 +------------- js/main.js | 12 ++++++------ templates/page1.html | 14 ++++++++++---- templates/page2.html | 14 +++++++++++--- templates/page3.html | 14 +++++++++++--- templates/page4.html | 14 +++++++++++--- templates/page5.html | 13 ++++++++++--- templates/page6.html | 14 +++++++++++--- templates/page7.html | 13 ++++++++++--- 11 files changed, 83 insertions(+), 43 deletions(-) diff --git a/css/css/home.css b/css/css/home.css index 610e910..57b419f 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)}div.section-container{background-color:white}#timeline{z-index:10;position:absolute;bottom:0;left:0;height:100px;width:100%}#timeline li{display:inline-block}#timeline a{background-color:white}#timeline a.active{background-color:orange}div.menu-content{height:100vh;background-color:white}div.extra-btn-container{position:absolute;left:700px;bottom:200px}a.btn-circle{border-radius:40px}.map-popover{display:none}div.section-inner-content div.story-content{transform-style:preserve-3d;transition:all 1s linear;backface-visibility:hidden;position:absolute;top:0;left:0}div.section-inner-content div.data-content{transform-style:preserve-3d;transition:all 1s linear;backface-visibility:hidden;transform:rotateY(180deg);position:absolute;top:0;left:0} \ 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-color:white}#timeline{z-index:10;position:absolute;bottom:0;left:0;height:100px;width:100%}#timeline li{display:inline-block}#timeline a{background-color:white}#timeline a.active{background-color:orange}div.menu-content{height:100vh;background-color:white}div.extra-btn-container{position:absolute;left:700px;bottom:200px}a.btn-circle{border-radius:40px}.map-popover{display:none} \ No newline at end of file diff --git a/css/css/home.css.map b/css/css/home.css.map index 9e3860e..dad9126 100644 --- a/css/css/home.css.map +++ b/css/css/home.css.map @@ -1 +1 @@ -{"version":3,"sources":["home.less"],"names":[],"mappings":"AAAA,EACI,eAIJ,uBAAwB,iBACtB,kBAEF,uBAAwB,gBAAgB,IACtC,iBAAA,CACA,SAAA,CACA,UAAA,CACA,MAAA,CACA,KAAA,CACA,UAAW,iBAAX,CACA,SAAA,CACA,sBAAA,CACA,sCAEF,uBAAwB,gBAAgB,GAAE,UAExC,iBAAA,CACA,SAAA,CACA,SAAA,CACA,UAAW,cAEb,GAAG,mBAEC,uBAGJ,UACI,UAAA,CACA,iBAAA,CACA,QAAA,CACA,MAAA,CACA,YAAA,CACA,WANJ,SAOI,IACI,qBARR,SAUI,GACI,uBAXR,SAaI,EAAC,QACG,wBAIR,GAAG,cACC,YAAA,CACA,uBAGJ,GAAG,qBACC,iBAAA,CACA,UAAA,CACA,aAGJ,CAAC,YACG,mBAGJ,aACI,aAGJ,GAAG,sBACC,IAAG,eACC,2BAAA,CACA,wBAAA,CACA,0BAAA,CACA,iBAAA,CACA,KAAA,CACA,OAPR,GAAG,sBAUC,IAAG,cACC,2BAAA,CACA,wBAAA,CACA,0BAAA,CACA,UAAW,eAAX,CACA,iBAAA,CACA,KAAA,CACA"} \ No newline at end of file +{"version":3,"sources":["home.less"],"names":[],"mappings":"AAAA,EACI,eAIJ,uBAAwB,iBACtB,kBAEF,uBAAwB,gBAAgB,IACtC,iBAAA,CACA,SAAA,CACA,UAAA,CACA,MAAA,CACA,KAAA,CACA,UAAW,iBAAX,CACA,SAAA,CACA,sBAAA,CACA,sCAEF,uBAAwB,gBAAgB,GAAE,UAExC,iBAAA,CACA,SAAA,CACA,SAAA,CACA,UAAW,cAEb,GAAG,mBAEC,uBAGJ,UACI,UAAA,CACA,iBAAA,CACA,QAAA,CACA,MAAA,CACA,YAAA,CACA,WANJ,SAOI,IACI,qBARR,SAUI,GACI,uBAXR,SAaI,EAAC,QACG,wBAIR,GAAG,cACC,YAAA,CACA,uBAGJ,GAAG,qBACC,iBAAA,CACA,UAAA,CACA,aAGJ,CAAC,YACG,mBAGJ,aACI"} \ No newline at end of file diff --git a/css/home.less b/css/home.less index afdb920..28d9667 100644 --- a/css/home.less +++ b/css/home.less @@ -69,22 +69,10 @@ a.btn-circle{ div.section-inner-content{ div.story-content{ - transform-style: preserve-3d; - transition: all 1.0s linear; - backface-visibility: hidden; - position:absolute; - top:0; - left:0; } div.data-content{ - transform-style: preserve-3d; - transition: all 1.0s linear; - backface-visibility: hidden; - transform: rotateY(180deg); - position:absolute; - top:0; - left:0; + } diff --git a/js/main.js b/js/main.js index 35a19fd..d2247a6 100644 --- a/js/main.js +++ b/js/main.js @@ -56,14 +56,14 @@ function counterLoading(){ viewStatus="story" } if(viewStatus=="story"){ - $('.story-content').css('transform','rotateY(0)') - $('.data-content').css('transform','rotateY(180deg)') - $('.menu-content .switchMode').empty().html("ver datos") + $('.story-content, .menu-story-content').show(); + $('.data-content, .menu-data-content').hide(); + //$('.menu-content .switchMode').empty().html("ver datos") } else{ - $('.story-content').css('transform','rotateY(180deg)') - $('.data-content').css('transform','rotateY(0)') - $('.menu-content .switchMode').empty().html("ver historia") + $('.story-content, .menu-story-content').hide(); + $('.data-content, .menu-data-content').show(); + //$('.menu-content .switchMode').empty().html("ver historia") } }) } diff --git a/templates/page1.html b/templates/page1.html index b8f05aa..18c701d 100644 --- a/templates/page1.html +++ b/templates/page1.html @@ -5,7 +5,7 @@
-
+
@@ -13,9 +13,15 @@
-

menu

- VER DATOS - +
+

menu

+ VER DATOS +
+
diff --git a/templates/page2.html b/templates/page2.html index 32acd85..b5fafac 100644 --- a/templates/page2.html +++ b/templates/page2.html @@ -5,15 +5,23 @@
-
+
-

menu pag 2

- VER DATOS + +
+

menu

+ VER DATOS +
+
diff --git a/templates/page3.html b/templates/page3.html index 457f290..94115ad 100644 --- a/templates/page3.html +++ b/templates/page3.html @@ -5,15 +5,23 @@
-
+
-

menu pagina 3

- VER DATOS + +
+

menu

+ VER DATOS +
+
diff --git a/templates/page4.html b/templates/page4.html index c69bd97..75ccc5f 100644 --- a/templates/page4.html +++ b/templates/page4.html @@ -5,15 +5,23 @@
-
+
-

menu pag 4

- VER DATOS + +
+

menu

+ VER DATOS +
+
diff --git a/templates/page5.html b/templates/page5.html index 045452f..5a02092 100644 --- a/templates/page5.html +++ b/templates/page5.html @@ -5,7 +5,7 @@
-
+
@@ -13,8 +13,15 @@
-

menu

- VER DATOS +
+

menu

+ VER DATOS +
+
diff --git a/templates/page6.html b/templates/page6.html index 5835d0d..5299e05 100644 --- a/templates/page6.html +++ b/templates/page6.html @@ -5,7 +5,7 @@
-
+
@@ -13,8 +13,16 @@
-

menu

- VER DATOS + +
+

menu

+ VER DATOS +
+
diff --git a/templates/page7.html b/templates/page7.html index 710d992..0237c44 100644 --- a/templates/page7.html +++ b/templates/page7.html @@ -5,7 +5,7 @@
-
+
@@ -13,8 +13,15 @@
-

menu

- VER DATOS +
+

menu

+ VER DATOS +
+