Merge remote-tracking branch 'origin/master'

Conflicts:
	client/scss/main.scss
This commit is contained in:
exane 2015-07-04 20:53:06 +02:00
commit 8ab784e24e
1 changed files with 2 additions and 2 deletions

View File

@ -36,7 +36,7 @@ $game-height: 800px;
margin-top: 33px;
text-align: center;
font-size: 20px;
color: #8aa5c1;
color: #8798ac;
}
.field {
@ -126,7 +126,7 @@ $game-height: 800px;
height: 100px;
//width: 64px;
background-position: 7px 20px;
opacity: 0.5;
opacity: 0.4;
}