Fixes #21 merge to master

3lang3 · Jun 8, 2017 · 0dc9a08 · 0dc9a08
1 parent c7b7d33
commit 0dc9a08
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git 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);}
 }
diff --git a/src/components/Recommend/Recommend.jsx b/src/components/Recommend/Recommend.jsx
@@ -78,7 +78,7 @@ class Recommend extends React.Component {
                             </div>
                         </Scrollbars>
                     </div>
-                    : <div className={styles.empty}><Spinner /></div>
+                    : <div className={styles.empty}><Spinner color="#fff" /></div>
                 }
 
             </div>

diff --git a/src/reducers/layouts.js b/src/reducers/layouts.js
@@ -23,7 +23,7 @@ export default (state = initialState, action) => {
         case layoutsActions.CHAT:
             return {
                 ...state,
-                chat: action.payload
+                chat: action.payload || !state.chat
             }
 
         default: