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
d0934bbc8d
@ -42,8 +42,8 @@ module.exports = {
|
|||||||
faction: "Northern Realm",
|
faction: "Northern Realm",
|
||||||
type: 0
|
type: 0
|
||||||
},
|
},
|
||||||
"sigismunt_dijkstra": {
|
"sigismund_dijkstra": {
|
||||||
name: "Sigismunt Dijkstra",
|
name: "Sigismund Dijkstra",
|
||||||
power: 4,
|
power: 4,
|
||||||
ability: "spy",
|
ability: "spy",
|
||||||
img: "dijkstra",
|
img: "dijkstra",
|
||||||
@ -210,6 +210,40 @@ module.exports = {
|
|||||||
faction: "Northern Realm",
|
faction: "Northern Realm",
|
||||||
type: 3
|
type: 3
|
||||||
},
|
},
|
||||||
|
"philippa_eilhart": {
|
||||||
|
name: "Philippa Eilhart",
|
||||||
|
power: 10,
|
||||||
|
ability: "hero",
|
||||||
|
img: "eilhart",
|
||||||
|
faction: "Northern Realm",
|
||||||
|
type: 1
|
||||||
|
},
|
||||||
|
"esterad_thyssen": {
|
||||||
|
name: "Esterad Thyssen",
|
||||||
|
power: 10,
|
||||||
|
ability: "hero",
|
||||||
|
img: "thyssen",
|
||||||
|
faction: "Northern Realm",
|
||||||
|
type: 0
|
||||||
|
},
|
||||||
|
"siege_tower": {
|
||||||
|
name: "Siege Tower",
|
||||||
|
power: 6,
|
||||||
|
ability: null,
|
||||||
|
img: "siege_tower",
|
||||||
|
faction: "Northern Realm",
|
||||||
|
type: 2
|
||||||
|
},
|
||||||
|
"catapult": {
|
||||||
|
name: "Catapult",
|
||||||
|
power: 8,
|
||||||
|
ability: "tight_bond",
|
||||||
|
img: "catapult",
|
||||||
|
faction: "Northern Realm",
|
||||||
|
type: 2
|
||||||
|
},
|
||||||
|
|
||||||
|
|
||||||
"decoy": {
|
"decoy": {
|
||||||
name: "Decoy",
|
name: "Decoy",
|
||||||
power: -1,
|
power: -1,
|
||||||
@ -227,6 +261,7 @@ module.exports = {
|
|||||||
type: 4
|
type: 4
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
||||||
"impenetrable_fog": {
|
"impenetrable_fog": {
|
||||||
name: "Impenetrable Fog",
|
name: "Impenetrable Fog",
|
||||||
power: -1,
|
power: -1,
|
||||||
@ -402,7 +437,7 @@ module.exports = {
|
|||||||
"havekar_smuggler": {
|
"havekar_smuggler": {
|
||||||
name: "Havekar Smuggler",
|
name: "Havekar Smuggler",
|
||||||
power: 5,
|
power: 5,
|
||||||
ability: "spy",
|
ability: "muster",
|
||||||
img: "smuggler1",
|
img: "smuggler1",
|
||||||
faction: "Scoia'tael",
|
faction: "Scoia'tael",
|
||||||
type: 0
|
type: 0
|
||||||
|
@ -1,5 +1,19 @@
|
|||||||
module.exports = {
|
module.exports = {
|
||||||
|
|
||||||
template: require('../views/chat.html')
|
template: require('../views/chat.html'),
|
||||||
|
|
||||||
|
data: function() {
|
||||||
|
return {
|
||||||
|
message: ''
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
methods: {
|
||||||
|
submitChat: function(e) {
|
||||||
|
e.preventDefault();
|
||||||
|
|
||||||
|
console.log(this.message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
};
|
};
|
@ -11,7 +11,7 @@
|
|||||||
blaa blaa
|
blaa blaa
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<textarea class="chatbox" placeholder="Type an message..." autofocus></textarea>
|
<textarea class="chatbox" placeholder="Type an message..." v-model="message" autofocus v-on="keydown: submitChat(this) | key 'enter'"></textarea>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</section>
|
</section>
|
@ -75,6 +75,7 @@
|
|||||||
text-align: center;
|
text-align: center;
|
||||||
color: darken(#8798ac, 30%);
|
color: darken(#8798ac, 30%);
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
|
text-transform: uppercase;
|
||||||
|
|
||||||
@include transition();
|
@include transition();
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user