mirrors/not-gwent-online
1
0
Fork 0
mirror of https://github.com/exane/not-gwent-online synced 2024-10-31 10:36:53 +00:00
Code Releases Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
exane 2015-07-04 16:18:30 +02:00
commit 95151cdab6
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/card_icon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 21 KiB

BIN
assets/discard.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 19 KiB

15
client/scss/main.scss
View File

@ -311,7 +311,8 @@ $game-height: 800px;
}*/ }*/
} }
.field-discard, .field-deck { .field-discard,
.field-deck {
background: rgba(0,0,0,.6); background: rgba(0,0,0,.6);
float: left; float: left;
padding: 25px 15px; padding: 25px 15px;
@ -325,18 +326,20 @@ $game-height: 800px;
} }
} }
.discard-skull { .field-deck {
margin: 20px 0 0 10px;
}
.discard-skull,
.icon-deck {
background: url("../../assets/discard.png") no-repeat; background: url("../../assets/discard.png") no-repeat;
width: 35px; width: 35px;
height: 35px; height: 40px;
float: left; float: left;
} }
.icon-deck { .icon-deck {
background: url("../../assets/card_icon.png") no-repeat; background: url("../../assets/card_icon.png") no-repeat;
width: 28px;
height: 40px;
float: left;
} }
.card-preview { .card-preview {

2
client/templates/info.handlebars
View File

@ -2,12 +2,10 @@
<div class="col-xs-12 col-lg-6 field-single field-leader">{{>card leader}}</div> <div class="col-xs-12 col-lg-6 field-single field-leader">{{>card leader}}</div>
<div class="col-xs-12 col-lg-6"> <div class="col-xs-12 col-lg-6">
<div class="row"> <div class="row">
<div class="col-xs-4"></div>
<div class="col-xs-4 info-title">Points:</div> <div class="col-xs-4 info-title">Points:</div>
<div class="col-xs-4 score">{{data.score}}</div> <div class="col-xs-4 score">{{data.score}}</div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-xs-4"><i class="icon-hand-card"></i></div>
<div class="col-xs-4 info-title">Hand:</div> <div class="col-xs-4 info-title">Hand:</div>
<div class="col-xs-4 hand-card">{{data.hand}}</div> <div class="col-xs-4 hand-card">{{data.hand}}</div>
</div> </div>