SplendidBear-Websites/MineSeeker
Private
Public Access
1
0
Fork 0
Code Pull Requests 1 Releases Activity

bugfix resign button existence #11

Browse Source
This commit is contained in:
Root
2016-11-20 13:05:45 +01:00
parent 864f322f6b
commit 180c827380
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Mine/SeekerBundle/Resources/public/css/style.mineseeker.css
View File

@@ -505,6 +505,7 @@ main {
background: -ms-linear-gradient(top, rgba(70, 73, 66, 1) 0%, rgba(140, 138, 139, 1) 69%, rgba(96, 89, 97, 1) 100%); background: -ms-linear-gradient(top, rgba(70, 73, 66, 1) 0%, rgba(140, 138, 139, 1) 69%, rgba(96, 89, 97, 1) 100%);
background: linear-gradient(to bottom, rgba(70, 73, 66, 1) 0%, rgba(140, 138, 139, 1) 69%, rgba(96, 89, 97, 1) 100%); background: linear-gradient(to bottom, rgba(70, 73, 66, 1) 0%, rgba(140, 138, 139, 1) 69%, rgba(96, 89, 97, 1) 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#464942', endColorstr='#605961', GradientType=0); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#464942', endColorstr='#605961', GradientType=0);
display: block;
position: relative; position: relative;
width: 95%; width: 95%;
height: 50px; height: 50px;
@@ -513,11 +514,12 @@ main {
font-size: 22px; font-size: 22px;
text-transform: uppercase; text-transform: uppercase;
text-align: center; text-align: center;
line-height: 45px; line-height: 40px;
border: 3px solid #484742; border: 3px solid #484742;
color: #fff; color: #fff;
margin: 10px auto 0 auto; margin: 10px auto 0 auto;
outline: none;
cursor: pointer; cursor: pointer;
-webkit-border-radius: 5px; -webkit-border-radius: 5px;

11
src/Mine/SeekerBundle/Resources/public/js/mine-seeker/user/user-control.js
View File

@@ -24,7 +24,7 @@ class UserControl extends React.Component {
} }
onClickBombSelector(clickedPlayer) { onClickBombSelector(clickedPlayer) {
var activePlayer = this.state.activePlayer ? 'blue' : 'red'; let activePlayer = this.state.activePlayer ? 'blue' : 'red';
if (this.youCanSelectBomb(activePlayer, clickedPlayer)) { if (this.youCanSelectBomb(activePlayer, clickedPlayer)) {
this.state.bombSelected = !this.state.bombSelected; this.state.bombSelected = !this.state.bombSelected;
@@ -35,6 +35,11 @@ class UserControl extends React.Component {
} }
} }
getResignClass(webPlayer) {
let activePlayer = this.state.activePlayer === 1 ? 'blue' : 'red';
return "resign" + (webPlayer !== activePlayer ? ' disabled' : '');
}
activeMines() { activeMines() {
return "active-mines" + (this.state.foundMines ? ' found-mine' : ''); return "active-mines" + (this.state.foundMines ? ' found-mine' : '');
} }
@@ -61,10 +66,10 @@ class UserControl extends React.Component {
webPlayer={this.props.webPlayer} webPlayer={this.props.webPlayer}
active={this.state.activePlayer === 0} active={this.state.activePlayer === 0}
onClickBombSelector={this.onClickBombSelector.bind(this, 0)}/> onClickBombSelector={this.onClickBombSelector.bind(this, 0)}/>
<div className="resign"> <button className={this.getResignClass(this.props.webPlayer)}>
<div className="resign-shine"></div> <div className="resign-shine"></div>
Resign Resign
</div> </button>
</div> </div>
); );
} }