diff --git a/client/js/client.js b/client/js/client.js index c1f4b29..7241672 100644 --- a/client/js/client.js +++ b/client/js/client.js @@ -167,7 +167,7 @@ let SideView = Backbone.View.extend({ $field.find(".field-close").html(html) $field.find(".large-field-counter").html(score) if(horn){ - this.$fields.find(".field-horn-close").html(this.template(horn)); + this.$fields.find(".field-horn-close").html(this.templateCards([horn])); } let isInfluencedByWeather; @@ -196,7 +196,7 @@ let SideView = Backbone.View.extend({ $field.find(".field-range").html(html) $field.find(".large-field-counter").html(score) if(horn){ - this.$fields.find(".field-horn-range").html(this.template(horn)); + this.$fields.find(".field-horn-range").html(this.templateCards([horn])); } let isInfluencedByWeather; @@ -225,7 +225,7 @@ let SideView = Backbone.View.extend({ $field.find(".field-siege").html(html) $field.find(".large-field-counter").html(score) if(horn){ - this.$fields.find(".field-horn-siege").html(this.template(horn)); + this.$fields.find(".field-horn-siege").html(this.templateCards([horn])); } let isInfluencedByWeather; @@ -438,7 +438,7 @@ let BattleView = Backbone.View.extend({ if(this.handCards){ - this.calculateMargin(this.$el.find(".field-hand")); + this.calculateMargin(this.$el.find(".handcard-wrap")); } if(this.user.get("isReDrawing")){ diff --git a/client/scss/main.scss b/client/scss/main.scss index 1cd84fa..bfeb825 100644 --- a/client/scss/main.scss +++ b/client/scss/main.scss @@ -7,12 +7,14 @@ $height: 600px; $game-height: 800px; + .container { - min-width: 960px; + min-width: 970px; + width: 970px important; background: rgba(5,5,5,0.25); padding: 20px; + margin-bottom: 150px; } - .board { height: $game-height; //border: 1px solid black; @@ -39,6 +41,7 @@ $game-height: 800px; //width: 100%; height: 100px; border: 1px solid black; + /*margin-bottom: 15px;*/ /* overflow: hidden;