Merge pull request #16 from Alxmerino/multiple-timers

Multiple timers
Alxmerino · Mar 18, 2017 · b3c90c6 · b3c90c6
2 parents 719af0b + 6e912a5
commit b3c90c6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/src/js/components/TimerItem.js b/src/js/components/TimerItem.js
@@ -36,7 +36,7 @@ const TimerItem = ({onClose, onStart, onStop, onTitleToggle, started, title, dis
                 <button
                     type="button"
                     onClick={clickAction}
-                    className={`timer-${timerStatus} btn btn-info btn-xs`}
+                    className={`timer-${timerStatus} btn btn-info btn-sm`}
                 >
                     <span className={`glyphicon glyphicon-${timerStatus}`} aria-hidden="true"></span>
                 </button>

diff --git a/src/js/reducers/index.js b/src/js/reducers/index.js
@@ -106,9 +106,9 @@ export default function reducer(state={
             let newState = _.assign({}, state);
 
             newState.timers = _.map(newState.timers, (timer) => {
-                timer.started = false;
 
                 if (timer.id === id) {
+                    timer.started = false;
                     timer.endTime = moment.now();
                     // Save duration in case we want to start timer again
                     timer.durationCycle = timer.duration;

diff --git a/src/scss/app.scss b/src/scss/app.scss
@@ -39,6 +39,8 @@
 
     &-title {
         flex-grow: 1;
+        margin-bottom: 0;
+        margin-right: 20px;
     }
 }