diff --git a/client/scss/main.scss b/client/scss/main.scss index 40731e3..93fb893 100644 --- a/client/scss/main.scss +++ b/client/scss/main.scss @@ -120,9 +120,7 @@ $game-height: 800px; margin: 3px; height: 90px; overflow: hidden; - /*img { - height: 120px; - }*/ + i { display: block; @@ -139,29 +137,32 @@ $game-height: 800px; font-size: 20px; color: black; }*/ - .card-attr-positive { - color: #00b000; + .card-attr-positive span { + color: #00b000 !important; } - span { - color: #ff2d00; - font-weight: bold; - font-size: 16px; + .card-attr-power { position: absolute; - text-shadow: 1px 1px 1px #101010; - text-align: center; - //margin-top: 62px; - //margin-left: 3px; + margin-top: -3px; + margin-left: -4px; //margin-top: 2px; cursor: default; - //background: #ffffff; - //border-radius: 10px; - //padding: 2px; padding-top: 4px; //padding-left: -4px; height: 37px; width: 30px; background: url("../../assets/card_strength_border.png") no-repeat; + + span { + color: #ff2d00; + text-shadow: 1px 1px 1px #101010; + text-align: center; + font-weight: bold; + font-size: 16px; + width: 30px; + display: block; + margin-left: -2px; + } } &.disabled { @@ -305,6 +306,7 @@ $game-height: 800px; z-index: 200; width: 100%; } + .notification { height: 0; margin-left: 250px; diff --git a/client/templates/fieldCards.handlebars b/client/templates/fieldCards.handlebars index ccb6cc4..e6f8ce0 100644 --- a/client/templates/fieldCards.handlebars +++ b/client/templates/fieldCards.handlebars @@ -1,6 +1,10 @@ {{#each this}}
- {{#if diff}}{{power}}{{/if}} + {{#if diff}} + + {{power}} + + {{/if}}
{{/each}} \ No newline at end of file diff --git a/server/Battle.js b/server/Battle.js index aa93f0e..47fd0bf 100644 --- a/server/Battle.js +++ b/server/Battle.js @@ -62,6 +62,7 @@ var Battle = (function(){ this.p2.draw(10); + this.update(); diff --git a/server/CardManager.js b/server/CardManager.js index f87a936..4b87353 100644 --- a/server/CardManager.js +++ b/server/CardManager.js @@ -10,6 +10,7 @@ var CardManager = (function(){ */ this._id = 0; + this._cards = {}; }; var r = CardManager.prototype; /** @@ -19,6 +20,7 @@ var CardManager = (function(){ */ r._id = null; + r._cards = null; r.create = function(key, owner) { return this._cards[this._id] = Card(key, owner, this._id++);