From 2c7542df2b6051b7fc0f3c7d5952e3bf4801320e Mon Sep 17 00:00:00 2001 From: devfake Date: Wed, 24 Jun 2015 15:21:17 +0200 Subject: [PATCH] load cards --- .../app/modules/deck-builder/components/deck-builder.js | 3 ++- .../app/modules/deck-builder/views/deck-builder.html | 9 ++++++--- site/client/assets/sass/_inner.scss | 1 + 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/site/client/app/modules/deck-builder/components/deck-builder.js b/site/client/app/modules/deck-builder/components/deck-builder.js index 733bd0c..66f116b 100644 --- a/site/client/app/modules/deck-builder/components/deck-builder.js +++ b/site/client/app/modules/deck-builder/components/deck-builder.js @@ -13,7 +13,7 @@ module.exports = { leaders: [], leader: null, - factionFilter: 'Northern Realm' + factionFilter: 'northern_realm' } }, @@ -23,6 +23,7 @@ module.exports = { methods: { changeDeck: function(deck) { + // todo: load animation $('.all-cards').addClass('remove'); this.factionFilter = deck; $('.all-cards').scrollTop(0); diff --git a/site/client/app/modules/deck-builder/views/deck-builder.html b/site/client/app/modules/deck-builder/views/deck-builder.html index f1de554..d1d73a8 100644 --- a/site/client/app/modules/deck-builder/views/deck-builder.html +++ b/site/client/app/modules/deck-builder/views/deck-builder.html @@ -1,6 +1,6 @@
- Northern Realm - Scoia'tael + Northern Realm + Scoia'tael Monster
@@ -18,7 +18,6 @@
-
\ No newline at end of file diff --git a/site/client/assets/sass/_inner.scss b/site/client/assets/sass/_inner.scss index e403208..94d108a 100644 --- a/site/client/assets/sass/_inner.scss +++ b/site/client/assets/sass/_inner.scss @@ -21,6 +21,7 @@ main { height: calc(100vh - 150px); min-height: 400px; clear: both; + position: relative; color: #fff;