merge master

This commit is contained in:
Gabriele Cirulli
2014-03-10 12:10:22 +01:00
2 changed files with 13 additions and 4 deletions
+5 -2
View File
@@ -164,16 +164,19 @@ hr {
height: 60px; height: 60px;
line-height: 60px; line-height: 60px;
margin-top: 222px; } margin-top: 222px; }
.game-container .game-message .lower {
display: block;
margin-top: 59px; }
.game-container .game-message a { .game-container .game-message a {
display: inline-block; display: inline-block;
background: #a69382; background: #8f7a66;
border-radius: 3px; border-radius: 3px;
padding: 0 20px; padding: 0 20px;
text-decoration: none; text-decoration: none;
color: #f9f6f2; color: #f9f6f2;
height: 40px; height: 40px;
line-height: 42px; line-height: 42px;
margin-top: 59px; } margin-left: 9px; }
.game-container .game-message .score-sharing { .game-container .game-message .score-sharing {
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
+8 -2
View File
@@ -180,16 +180,22 @@ hr {
// line-height: $field-width; // line-height: $field-width;
} }
.lower {
display: block;
margin-top: 59px;
}
a { a {
display: inline-block; display: inline-block;
background: darken($game-container-background, 10%); background: darken($game-container-background, 20%);
border-radius: 3px; border-radius: 3px;
padding: 0 20px; padding: 0 20px;
text-decoration: none; text-decoration: none;
color: $bright-text-color; color: $bright-text-color;
height: 40px; height: 40px;
line-height: 42px; line-height: 42px;
margin-top: 59px; margin-left: 9px;
// margin-top: 59px;
} }
.score-sharing { .score-sharing {