Skip to content

Commit

Permalink
Added timer icon
Browse files Browse the repository at this point in the history
  • Loading branch information
marc-ed-raffalli committed Nov 1, 2017
1 parent 47b3557 commit 7ae58ee
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"react": "^15.6.1",
"react-dom": "^15.6.1",
"react-ga": "^2.3.5",
"react-ionicons": "^1.5.9",
"react-leaflet": "^1.4.1",
"react-redux": "^5.0.5",
"react-router-dom": "^4.1.2",
Expand Down
7 changes: 5 additions & 2 deletions src/components/game-header/GameHeader.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component} from 'react';
import Ionicon from 'react-ionicons';

import Timer from '../../containers/Timer';
import Rounds from '../../containers/Rounds';
Expand Down Expand Up @@ -61,7 +62,7 @@ export default class GameHeader extends Component {
...timerStyles,
fontSize: undefined,
top: 0,
left: 0
left: 24 + 'px'
};
}

Expand All @@ -73,12 +74,14 @@ export default class GameHeader extends Component {
<div className="col-2 col-sm-1">
<div className="text-nowrap"><Rounds/></div>
<div className="gg-gameHeader-timer">
<Ionicon color={timerStyles.color} icon="ion-android-stopwatch"/>
<div className="gg-gameHeader-timerLabel"
data-animate={this.state.timerAnimation === 'back'}
ref={elt => {
this.timerElt = elt;
}}
style={timerStyles}><Timer/></div>
style={timerStyles}>
<Timer/></div>
</div>
</div>
<div className="col-8 col-sm-10">
Expand Down

0 comments on commit 7ae58ee

Please sign in to comment.