Merge branch 'master' into sidebar-bottom-buttons

This commit is contained in:
Sean Li 2015-02-24 12:05:03 -08:00
commit e40fc46c77
3 changed files with 3 additions and 4 deletions

View File

@ -37,9 +37,9 @@
@-webkit-keyframes fadein { @-webkit-keyframes fadein {
from { from {
opacity:0; opacity: 0;
} }
to { to {
opacity:1; opacity: 1;
} }
} }

View File

@ -33,5 +33,5 @@
opacity: 0; opacity: 0;
-webkit-animation: fadein ease-in 1; -webkit-animation: fadein ease-in 1;
-webkit-animation-fill-mode: forwards; -webkit-animation-fill-mode: forwards;
-webkit-animation-duration: 0.3s; -webkit-animation-duration: 0.2s;
} }

View File

@ -1,6 +1,5 @@
.details { .details {
.fade-in(); .fade-in();
-webkit-animation-delay: 0.3s;
background-color: @color-background; background-color: @color-background;
margin: 0; margin: 0;
padding: 0; padding: 0;