Merge pull request #47 from Eug-VS/benzin

Migrate to BENZIN

2 files changed, 11 insertions, 8 deletions

diff --git a/src/pages/Timer/Timer.js b/src/pages/Timer/Timer.js
index 1323d97..6020c1b 100644
--- a/src/pages/Timer/Timer.js
+++ b/src/pages/Timer/Timer.js
@@ -2,10 +2,13 @@ import React from 'react';
 
 import { post } from '../../requests';
 
-import Window from '../../components/Window/Window';
-import ContentSection from '../../components/ContentSection/ContentSection';
+import {
+  Window,
+  ContentSection,
+  SmartList,
+} from 'react-benzin';
+
 import TimerButton from './TimerButton/TimerButton';
-import SmartList from '../../components/SmartList/SmartList';
 import SolutionCard from '../../components/SolutionCard/SolutionCard';
 
 import { Button, makeStyles } from '@material-ui/core';
@@ -63,12 +66,12 @@ const Timer = ({ user, recentSolutions, setRecentSolutions, setPage }) => {
               Every speedcuber will benefit
               from using it - both amateur and professional!
             </p>
-            <Button variant="contained" color="secondary" onClick={handleLearnMore}> Learn more </Button>
+            <Button variant="contained" color="primary" onClick={handleLearnMore}> Learn more </Button>
           </ContentSection>
           {user.id === null &&
           <ContentSection sectionName="Log into an account">
             <p> Tell us your name so we can track your progress</p>
-            <Button variant="contained" color="secondary" onClick={handleLogin} size="large"> Login </Button>
+            <Button variant="contained" color="primary" onClick={handleLogin} size="large"> Login </Button>
           </ContentSection>
           }
           <TimerButton registerResult={registerResult} />
diff --git a/src/pages/Timer/TimerButton/TimerButton.js b/src/pages/Timer/TimerButton/TimerButton.js
index 0f43c5a..fdb6b7c 100644
--- a/src/pages/Timer/TimerButton/TimerButton.js
+++ b/src/pages/Timer/TimerButton/TimerButton.js
@@ -7,7 +7,7 @@ const useStyles = makeStyles(theme => ({
   root: {
     textAlign: 'center',
     padding: theme.spacing(5),
-    background: theme.palette.primary.main,
+    background: theme.palette.background.elevation3,
     marginTop: theme.spacing(10),
   },
 }));
@@ -74,7 +74,7 @@ const TimerButton = ({ registerResult }) => {
 
   const composeHelperText = () => {
     switch (mode) {
-      case 'running': return '_';
+      case 'running': return 'Go fast!';
       case 'countdown': return 'Release SPACE to begin';
       case 'over': return 'You are too late!';
       default: return 'Hold SPACE to start countdown';
@@ -90,7 +90,7 @@ const TimerButton = ({ registerResult }) => {
   };
 
   return (
-    <Paper elevation={3} className={classes.root}>
+    <Paper className={classes.root}>
       <Typography variant="h1"> {time} </Typography>
       <Typography variant="h5" color={helperColor()}>
         {composeHelperText()}