]> _ Git - cubedesigners-v7.git/commitdiff
(no commit message)
authorbruno@cubedesigners.com <bruno@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Tue, 26 Aug 2014 15:52:20 +0000 (15:52 +0000)
committerbruno@cubedesigners.com <bruno@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Tue, 26 Aug 2014 15:52:20 +0000 (15:52 +0000)
js/realisations.js
less/realisations.less

index 1377ef2f6f44eb51fba7ee692f6cbd91a8707c33..a68320ee91cd76a61fc40228c163aee7a0c058c1 100644 (file)
@@ -14,6 +14,8 @@ var showIds = new Array();
 function load_realisations() {\r
     initTagsLink();\r
     \r
+    $("#main").css('height', 1500);\r
+    \r
      $(".bloc").click( function () {\r
         \r
         var currentRea = $(this).attr("data-pos");\r
@@ -132,7 +134,7 @@ function load_realisations() {
                        \r
                        $("html, body").animate({ scrollTop: $('#detailContent').offset().top-100 }, 1000);\r
                        $('.close').css("top", $('#detailContent').offset().top);\r
-                        \r
+                        /*\r
                        $( "#detail" ).slideDown( "slow", function() {\r
                           \r
                            isAnim = false;\r
@@ -144,17 +146,28 @@ function load_realisations() {
                        }).animate(\r
                            { opacity: 1 },\r
                            { queue: true, duration: 'slow' }\r
-                         );\r
+                         );*/\r
+                  \r
+                  \r
+                         $( "#detail" ).addClass("showDown");\r
+                        $('#detail').one("webkitTransitionEnd transitionend oTransitionEnd msTransitionEnd transitionEnd", function(e) {\r
+                                isAnim = false;\r
+                           addCloseAction();\r
+                           currentSlide = 1;\r
+                           autoSlide = true;\r
+                           initSlideShow();\r
+                        });  \r
+                  \r
                    }\r
 \r
-                   $(".project-photo").each( function() {\r
+                   /*$(".project-photo").each( function() {\r
                        var id = $(this).parent().attr("data-pos");\r
                        if( id != currentRea ) {\r
                            $(this).addClass("gray");\r
                        }else{\r
                             $(this).removeClass("gray");\r
                         }\r
-                   });\r
+                   });*/\r
                        }\r
                        \r
                });\r
@@ -168,8 +181,9 @@ function load_realisations() {
 \r
 function addCloseAction() {\r
     $(".close").click(function() {\r
-        //$("html, body").animate({ scrollTop: 0 }, 1000);\r
-       $( "#detail" ).slideUp( "slow", function() {\r
+        $("html, body").animate({ scrollTop: 0 }, 1000);\r
+       \r
+       /* $( "#detail" ).slideUp( "slow", function() {\r
               $('#detailContent').remove();\r
               currentOpen = 0;\r
               $(".project-photo").each( function() {\r
@@ -178,7 +192,16 @@ function addCloseAction() {
           }).animate(\r
            { opacity: 1 },\r
            { queue: false, duration: 'slow' }\r
-         );\r
+         );*/\r
+            \r
+        $( "#detail" ).addClass("showUp");\r
+        $('#detail').one("webkitTransitionEnd transitionend oTransitionEnd msTransitionEnd transitionEnd", function(e) {\r
+                currentOpen = 0;\r
+                $(".project-photo").each( function() {\r
+                  $(this).removeClass("gray");\r
+                });\r
+        });\r
+  \r
     });\r
 }\r
 \r
index bcb1e34e2d7afcb896076683982f91cddbfd2b3b..51241972a81d90e8c550f139d157e8d400931ec0 100644 (file)
        height:440px;
        clear: both;
        display:none;
-       margin-bottom: 15px;
-       width:10000px;
+       margin-bottom: 15px;    
+        width:10000px;
        white-space: nowrap;
-        -webkit-transform: translate3d(0,0,0);
-        -webkit-backface-visibility: hidden;
-       -webkit-perspective: 1000;
-        transform: translate3d(0,0,0);
-    }
+       transition: all .5s;
+    }
+    
+    .showUp {
+        height:0px !important;
+        overflow:hidden;
+        opacity: 0;
+      }
+      
+      .showDown {
+        height:440px !important;
+        opacity: 1;
+      }
     
     #detailContent {
        overflow: visible;