mirror of
https://github.com/exane/not-gwent-online
synced 2024-10-31 10:36:53 +00:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
961fe30da8
@ -13,7 +13,7 @@ module.exports = {
|
|||||||
leaders: [],
|
leaders: [],
|
||||||
leader: null,
|
leader: null,
|
||||||
|
|
||||||
factionFilter: 'Northern Realm'
|
factionFilter: 'northern_realm'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
@ -23,6 +23,7 @@ module.exports = {
|
|||||||
|
|
||||||
methods: {
|
methods: {
|
||||||
changeDeck: function(deck) {
|
changeDeck: function(deck) {
|
||||||
|
// todo: load animation
|
||||||
$('.all-cards').addClass('remove');
|
$('.all-cards').addClass('remove');
|
||||||
this.factionFilter = deck;
|
this.factionFilter = deck;
|
||||||
$('.all-cards').scrollTop(0);
|
$('.all-cards').scrollTop(0);
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
<div class="heading">
|
<div class="heading">
|
||||||
<a v-class="active: factionFilter == 'Northern Realm'" v-on="click: changeDeck('Northern Realm')">Northern Realm</a>
|
<a v-class="active: factionFilter == 'northern_realm'" v-on="click: changeDeck('northern_realm')">Northern Realm</a>
|
||||||
<a v-class="active: factionFilter == 'scoiatael'" v-on="click: changeDeck('sco bla')">Scoia'tael</a>
|
<a v-class="active: factionFilter == 'scoiatael'" v-on="click: changeDeck('scoiatael')">Scoia'tael</a>
|
||||||
<a v-class="active: factionFilter == 'monster'" v-on="click: changeDeck('monster')">Monster</a>
|
<a v-class="active: factionFilter == 'monster'" v-on="click: changeDeck('monster')">Monster</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -18,7 +18,6 @@
|
|||||||
<div class="clear-space"></div>
|
<div class="clear-space"></div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="shadow-all-cards"></div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
@ -41,4 +40,8 @@
|
|||||||
.remove {
|
.remove {
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.load-deck {
|
||||||
|
|
||||||
|
}
|
||||||
</style>
|
</style>
|
@ -21,6 +21,7 @@ main {
|
|||||||
height: calc(100vh - 150px);
|
height: calc(100vh - 150px);
|
||||||
min-height: 400px;
|
min-height: 400px;
|
||||||
clear: both;
|
clear: both;
|
||||||
|
position: relative;
|
||||||
|
|
||||||
color: #fff;
|
color: #fff;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user