Merge branch 'master' into sidebar-bottom-buttons

2015-02-24 12:05:03 -08:00 · 2015-02-24 12:05:03 -08:00 · e40fc46c77
parent 1efad51881 a691b7c72c
commit e40fc46c77
3 changed files with 3 additions and 4 deletions
--- a/styles/animation.less
+++ b/styles/animation.less
@ -37,9 +37,9 @@

@-webkit-keyframes fadein {
  from {
-    opacity:0;
+    opacity: 0;
  }
  to {
-    opacity:1;
+    opacity: 1;
  }
 }
--- a/styles/mixins.less
+++ b/styles/mixins.less
@ -33,5 +33,5 @@
  opacity: 0;
  -webkit-animation: fadein ease-in 1;
  -webkit-animation-fill-mode: forwards;
-  -webkit-animation-duration: 0.3s;
+  -webkit-animation-duration: 0.2s;
 }
--- a/styles/right-panel.less
+++ b/styles/right-panel.less
@ -1,6 +1,5 @@
 .details {
  .fade-in();
-  -webkit-animation-delay: 0.3s;
  background-color: @color-background;
  margin: 0;
  padding: 0;