From 758d9d7abe46add5d108d0a0c7459c643551e037 Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Fri, 26 Sep 2014 14:10:58 +0200
Subject: [PATCH] fix #1099

---
 app/coffee/modules/nav.coffee               | 10 ++++-----
 app/styles/layout/base.scss                 | 24 +++++++++++++++------
 app/styles/modules/common/projects-nav.scss |  2 +-
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/app/coffee/modules/nav.coffee b/app/coffee/modules/nav.coffee
index 3574b873..44c913c6 100644
--- a/app/coffee/modules/nav.coffee
+++ b/app/coffee/modules/nav.coffee
@@ -121,13 +121,12 @@ ProjectsNavigationDirective = ($rootscope, animationFrame, $timeout, tgLoader, $
 
             timeout timeoutValue, ->
                 overlay.one 'transitionend', () ->
+                    $(document.body).removeClass("loading-project open-projects-nav closed-projects-nav")
                     overlay.hide()
 
-                $(document.body)
-                    .removeClass("loading-project open-projects-nav")
-                    .addClass("closed-projects-nav")
+                $(document.body).addClass("closed-projects-nav")
 
-                    tgLoader.disablePreventLoading()
+                tgLoader.disablePreventLoading()
 
     renderProjects  = ($el, projects) ->
         html = projectsTemplate({projects: projects})
@@ -170,8 +169,7 @@ ProjectsNavigationDirective = ($rootscope, animationFrame, $timeout, tgLoader, $
                 return
             # END HACK
 
-            $(document.body)
-                .addClass('loading-project')
+            $(document.body).addClass('loading-project')
 
             tgLoader.preventLoading()
 
diff --git a/app/styles/layout/base.scss b/app/styles/layout/base.scss
index 1c128cec..3ce71939 100644
--- a/app/styles/layout/base.scss
+++ b/app/styles/layout/base.scss
@@ -46,6 +46,23 @@ body {
             @include transition (all 1s ease);
             opacity: .9;
         }
+        &.closed-projects-nav {
+            .projects-nav {
+                @include transform(translate3d(-300px, 0, 0));
+                @include transition (transform 1s ease);
+            }
+            .projects-nav-overlay {
+                @include transition (all 1s ease);
+                @include transform(translate3d(0, 0, 0));
+                opacity: 0;
+            }
+            .master {
+                @include transform(translate3d(0, 0, 0));
+            }
+            .menu {
+                @include transform(translate3d(0, 0, 0));
+            }
+        }
     }
     &.loading-project {
         overflow: hidden;
@@ -61,13 +78,6 @@ body {
     }
 }
 
-.closed-projects-nav {
-    .projects-nav {
-        @include transform(translate3d(-300px, 0, 0));
-        @include transition (transform 1s ease);
-    }
-}
-
 .loader-active {
     overflow: hidden;
 }
diff --git a/app/styles/modules/common/projects-nav.scss b/app/styles/modules/common/projects-nav.scss
index 00c22290..2d76fc88 100644
--- a/app/styles/modules/common/projects-nav.scss
+++ b/app/styles/modules/common/projects-nav.scss
@@ -97,7 +97,7 @@
 }
 
 .projects-nav-overlay {
-    @include transition (all 1s ease);
+    /* @include transition (all 1s ease); */
     @extend %background-taiga;
     //background-blend-mode: multiply;
     //background-color: $green-taiga;