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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
exane 2015-07-04 15:39:21 +02:00
commit 49686661ba
2 changed files with 19 additions and 3 deletions

View File

@ -88,7 +88,7 @@ $game-height: 800px;
bottom: 0; bottom: 0;
left: 0; left: 0;
width: 100%; width: 100%;
background: rgba(6, 13, 22, .7); background: rgba(6, 13, 22, .8);
height: 110px; height: 110px;
z-index: 20; z-index: 20;
@ -295,6 +295,22 @@ $game-height: 800px;
}*/ }*/
} }
.field-discard {
background-color: rgba(0,0,0,.6);
float: left;
padding: 25px 15px;
width: auto;
cursor: pointer;
margin: 20px 0;
}
.discard-scull {
background: url(discard.png) no-repeat;
width: 35px;
height: 35px;
float: left;
}
.card-preview { .card-preview {
div { div {
position: fixed; position: fixed;

View File

@ -73,12 +73,12 @@
</div> </div>
<div class="col-xs-12 right-side right-side-foe foe"> <div class="col-xs-12 right-side right-side-foe foe">
<div class="col-xs-8 field-discard field-single"> <div class="col-xs-8 field-discard field-single">
discard deck <i class="discard-scull"></i>
</div> </div>
</div> </div>
<div class="col-xs-12 right-side right-side-player player"> <div class="col-xs-12 right-side right-side-player player">
<div class="col-xs-8 field-discard field-single"> <div class="col-xs-8 field-discard field-single">
discard deck <i class="discard-scull"></i>
</div> </div>
</div> </div>
</div> </div>