From 0dc9a08394ce03522b2e352a97bb7b3a938658f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B5=AA=E6=B5=AA=E6=B5=AA?= <675483520@qq.com> Date: Thu, 8 Jun 2017 23:29:06 +0800 Subject: [PATCH] Fixes #21 merge to master --- src/components/Recommend/Recommend.css | 6 +++--- src/components/Recommend/Recommend.jsx | 2 +- src/reducers/layouts.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/Recommend/Recommend.css b/src/components/Recommend/Recommend.css index aa2115d..e9dfda3 100644 --- a/src/components/Recommend/Recommend.css +++ b/src/components/Recommend/Recommend.css @@ -16,7 +16,7 @@ .outerWrapper { opacity: 0; - animation: zoomIn 1.5s ease forwards; + animation: zoomIn 2s ease forwards; width: 100%; height: 100%; } @@ -73,6 +73,6 @@ } @keyframes zoomIn { - from {opacity: 0; transform: scale(1.05) } - to {opacity: 1; transform: scale(1)} + from {opacity: 0; transform: scale(1.02); filter: grayscale(1); } + to {opacity: 1; transform: scale(1); filter: grayscale(0);} } \ No newline at end of file diff --git a/src/components/Recommend/Recommend.jsx b/src/components/Recommend/Recommend.jsx index 474cd99..7fcdc16 100644 --- a/src/components/Recommend/Recommend.jsx +++ b/src/components/Recommend/Recommend.jsx @@ -78,7 +78,7 @@ class Recommend extends React.Component { - :