1
0
mirror of https://github.com/exane/not-gwent-online synced 2024-11-23 19:36:53 +00:00

Merge remote-tracking branch 'origin/master'

This commit is contained in:
exane 2015-07-04 18:11:32 +02:00
commit 0b76e18554

View File

@ -183,6 +183,9 @@ $game-height: 800px;
.field-deck-number { .field-deck-number {
display: block; display: block;
text-align: center; text-align: center;
font-size: 14px;
margin: 3px 0 0 0;
color: #3f4c5b;
} }
.score, .score,
@ -349,8 +352,8 @@ $game-height: 800px;
.field-deck { .field-deck {
background: rgba(0,0,0,.6); background: rgba(0,0,0,.6);
float: left; float: left;
padding: 25px 15px; width: 65px;
width: auto; height: 90px;
cursor: pointer; cursor: pointer;
margin: 20px 0; margin: 20px 0;
transition: all .2s ease-in-out 0s; transition: all .2s ease-in-out 0s;
@ -358,22 +361,26 @@ $game-height: 800px;
&:hover { &:hover {
background: rgba(0,0,0,.9); background: rgba(0,0,0,.9);
} }
i {
width: 35px;
height: 40px;
display: block;
}
} }
.field-deck { .field-deck {
margin: 20px 0 0 10px; margin: 20px 0 0 10px;
} }
.discard-skull, .discard-skull {
.icon-deck {
background: url("../../assets/discard.png") no-repeat; background: url("../../assets/discard.png") no-repeat;
width: 35px; margin: 23px auto 0 auto;
height: 40px;
float: left;
} }
.icon-deck { .icon-deck {
background: url("../../assets/card_icon.png") no-repeat; background: url("../../assets/card_icon.png") no-repeat;
margin: 13px auto 0 auto;
} }
.card-preview { .card-preview {
@ -535,6 +542,13 @@ $game-height: 800px;
font-size: 17px; font-size: 17px;
} }
.alert-success {
background: #3f4c5b;
color: #fff;
border-radius: 0;
border: 0;
}
.container { .container {
position: relative; position: relative;
} }