Merge remote-tracking branch 'origin/master'

client/scss/main.scss

@@ -70,8 +70,23 @@ $game-height: 800px;
   box-shadow: 0px 0px 10px #000;
 }
 
+.handcard-wrap {
+  margin: 0 auto;
+  width: 800px;
+}
+
 .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 {
     margin-left: -31px;
     &:first-child {
@@ -300,6 +315,10 @@ $game-height: 800px;
 }
 
 .waiting-for-opponent {
+
+  // temp
+  display: none;
+
   position: fixed;
   //left: 43%;
   cursor: default;

client/templates/battle.handlebars

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