diff options
-rw-r--r-- | src/components/SmartList/SmartList.js | 2 | ||||
-rw-r--r-- | src/developers.json | 6 | ||||
-rw-r--r-- | src/pages/Timer/TimerButton/TimerButton.js | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/components/SmartList/SmartList.js b/src/components/SmartList/SmartList.js index 68235a2..b462c47 100644 --- a/src/components/SmartList/SmartList.js +++ b/src/components/SmartList/SmartList.js @@ -7,7 +7,7 @@ import AutoSizer from 'react-virtualized-auto-sizer'; const SmartList = ({ itemSize, itemCount, renderItem }) => { return ( - <div style={{ flex: '1 1 auto'}}> + <div style={{ flex: '1 1 auto', overflow: 'hidden' }}> <AutoSizer> {({ width, height }) => ( <FixedSizeList diff --git a/src/developers.json b/src/developers.json index f3e5357..00ed2e3 100644 --- a/src/developers.json +++ b/src/developers.json @@ -6,5 +6,9 @@ { "username": "asketonim", "role": "Front-end, management" + }, + { + "username": "soleni", + "role": "Testing" } -]
\ No newline at end of file +] diff --git a/src/pages/Timer/TimerButton/TimerButton.js b/src/pages/Timer/TimerButton/TimerButton.js index 1376717..0f43c5a 100644 --- a/src/pages/Timer/TimerButton/TimerButton.js +++ b/src/pages/Timer/TimerButton/TimerButton.js @@ -107,8 +107,8 @@ const convertTimeToString = timeDelta => { resultTime += minute + ':'; let second = Math.floor(timeDelta / 1000); - if (second < 10) resultTime += '0'; if (second > 59) second %= 60; + if (second < 10) resultTime += '0'; resultTime += second + ':'; const mill = Math.floor((timeDelta % 1000) / 10); |