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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
exane 2015-07-04 11:22:57 +02:00
commit e1bbb8dc7b
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
client/scss/main.scss
View File

@ -70,8 +70,23 @@ $game-height: 800px;
box-shadow: 0px 0px 10px #000; box-shadow: 0px 0px 10px #000;
} }
.handcard-wrap {
margin: 0 auto;
width: 800px;
}
.field-hand { .field-hand {
margin-top: 20px; //margin-top: 20px;
border: none;
transition: all .2s ease-in-out 0s;
position: fixed;
bottom: 0;
left: 0;
width: 100%;
background: rgba(6, 13, 22, .6);
height: auto;
z-index: 10;
.card { .card {
margin-left: -31px; margin-left: -31px;
&:first-child { &:first-child {
@ -300,6 +315,10 @@ $game-height: 800px;
} }
.waiting-for-opponent { .waiting-for-opponent {
// temp
display: none;
position: fixed; position: fixed;
//left: 43%; //left: 43%;
cursor: default; cursor: default;

2
client/templates/battle.handlebars
View File

@ -60,11 +60,13 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-xs-12 field field-hand {{#if isWaiting}}{{else}}active{{/if}}"> <div class="col-xs-12 field field-hand {{#if isWaiting}}{{else}}active{{/if}}">
<div class="handcard-wrap">
{{#each cards as |val key|}} {{#each cards as |val key|}}
{{>card val}} {{>card val}}
{{/each}} {{/each}}
</div> </div>
</div> </div>
</div>
</div> </div>
<div class="col-xs-3"> <div class="col-xs-3">
<div class="col-xs-12 card-preview"> <div class="col-xs-12 card-preview">