revert back sideNav animations

pull/1134/head
Diego Sampaio 10 years ago
parent 844dc4ed5e
commit b9693bd7c5
  1. 6
      client/lib/accountBox.coffee
  2. 4
      client/lib/sideNav.coffee
  3. 2
      client/views/app/sideNav/sideNav.html
  4. 4
      client/views/app/tabBar/membersList.html
  5. 10
      packages/rocketchat-theme/assets/stylesheets/base.less

@ -13,13 +13,13 @@
SideNav.closeFlex()
return;
status = 1
self.options.removeClass("_hidden")
self.options.removeClass("animated-hidden")
self.box.addClass("active")
SideNav.toggleArrow 1
close = ->
status = 0
self.options.addClass("_hidden")
self.options.addClass("animated-hidden")
self.box.removeClass("active")
SideNav.toggleArrow -1
@ -32,4 +32,4 @@
open: open
close: close
init: init
)()
)()

@ -48,12 +48,12 @@
animating = true
if status is -1 or (status isnt 1 and flexNav.opened)
flexNav.opened = false
flexNav.addClass "hidden"
flexNav.addClass "animated-hidden"
else
flexNav.opened = true
# added a delay to make sure the template is already rendered before animating it
setTimeout ->
flexNav.removeClass "hidden"
flexNav.removeClass "animated-hidden"
, 50
setTimeout ->
animating = false

@ -23,7 +23,7 @@
<div class="unread-rooms bottom-unread-rooms hidden">
{{_ "More_unreads"}} <i class="icon-down-big"></i>
</div>
<div class="flex-nav hidden">
<div class="flex-nav animated-hidden">
<section>
{{> Template.dynamic template=flexTemplate data=flexData}}
</section>

@ -2,7 +2,7 @@
<div class="content">
{{> videoCall}}
{{#if isGroupChat}}
<div class="list-view{{#if $.Session.get 'showUserInfo'}} -hidden{{/if}}">
<div class="list-view{{#if $.Session.get 'showUserInfo'}} animated-hidden{{/if}}">
{{#with roomUsers}}
<div class="status">
<h2>{{_ "Members_List"}}</h2>
@ -35,7 +35,7 @@
{{/with}}
</div>
{{/if}}
<div class="user-view animated{{#unless showUserInfo}} -hidden{{/unless}}">
<div class="user-view animated{{#unless showUserInfo}} animated-hidden{{/unless}}">
{{> userInfo user=flexUserInfo showAll=isGroupChat video=isDirectChat}}
</div>
</div>

@ -916,7 +916,7 @@ a.github-fork {
opacity: 1;
visibility: visible;
.transition(opacity .2s ease-out);
&.-hidden {
&.animated-hidden {
visibility: hidden;
opacity: 0;
}
@ -1013,7 +1013,7 @@ a.github-fork {
.transition(transform .3s cubic-bezier(.5, 0, .1, 1));
z-index:99;
&._hidden {
&.animated-hidden {
.transform(translateY(-100%) translateY(-50px));
}
> .wrapper {
@ -1114,7 +1114,7 @@ a.github-fork {
overflow-x: hidden;
width: @rooms-box-width;
.transition(transform .3s cubic-bezier(.5, 0, .1, 1));
&.hidden {
&.animated-hidden {
.transform(translateX(-100%));
header,
footer,
@ -1607,7 +1607,7 @@ a.github-fork {
margin-right: -4px;
}
}
.hidden {
.animated-hidden {
visibility: hidden;
display: none;
}
@ -2743,7 +2743,7 @@ a.github-fork {
1),
opacity .125s ease-out .1s);
}
> .-hidden {
> .animated-hidden {
.transform(translateX(100%));
opacity: 0;
}

Loading…
Cancel
Save