taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix #1099

stable
Juanfran 2014-09-26 14:10:58 +02:00
parent 66abe776d1
commit 758d9d7abe
3 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/coffee/modules/nav.coffee
View File

@ -121,13 +121,12 @@ ProjectsNavigationDirective = ($rootscope, animationFrame, $timeout, tgLoader, $
timeout timeoutValue, -> timeout timeoutValue, ->
overlay.one 'transitionend', () -> overlay.one 'transitionend', () ->
$(document.body).removeClass("loading-project open-projects-nav closed-projects-nav")
overlay.hide() overlay.hide()
$(document.body) $(document.body).addClass("closed-projects-nav")
.removeClass("loading-project open-projects-nav")
.addClass("closed-projects-nav")
tgLoader.disablePreventLoading() tgLoader.disablePreventLoading()
renderProjects = ($el, projects) -> renderProjects = ($el, projects) ->
html = projectsTemplate({projects: projects}) html = projectsTemplate({projects: projects})
@ -170,8 +169,7 @@ ProjectsNavigationDirective = ($rootscope, animationFrame, $timeout, tgLoader, $
return return
# END HACK # END HACK
$(document.body) $(document.body).addClass('loading-project')
.addClass('loading-project')
tgLoader.preventLoading() tgLoader.preventLoading()

24
app/styles/layout/base.scss
View File

@ -46,6 +46,23 @@ body {
@include transition (all 1s ease); @include transition (all 1s ease);
opacity: .9; 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 { &.loading-project {
overflow: hidden; 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 { .loader-active {
overflow: hidden; overflow: hidden;
} }

2
app/styles/modules/common/projects-nav.scss
View File

@ -97,7 +97,7 @@
} }
.projects-nav-overlay { .projects-nav-overlay {
@include transition (all 1s ease); /* @include transition (all 1s ease); */
@extend %background-taiga; @extend %background-taiga;
//background-blend-mode: multiply; //background-blend-mode: multiply;
//background-color: $green-taiga; //background-color: $green-taiga;