Merge remote-tracking branch 'origin/master'

assets/data/cards.js

@@ -42,8 +42,8 @@ module.exports = {
     faction: "Northern Realm",
     type: 0
   },
-  "sigismunt_dijkstra": {
+  "sigismund_dijkstra": {
-    name: "Sigismunt Dijkstra",
+    name: "Sigismund Dijkstra",
     power: 4,
     ability: "spy",
     img: "dijkstra",
@@ -210,6 +210,40 @@ module.exports = {
     faction: "Northern Realm",
     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": {
     name: "Decoy",
     power: -1,
@@ -227,6 +261,7 @@ module.exports = {
     type: 4
   },
 
+
   "impenetrable_fog": {
     name: "Impenetrable Fog",
     power: -1,
@@ -402,7 +437,7 @@ module.exports = {
   "havekar_smuggler": {
     name: "Havekar Smuggler",
     power: 5,
-    ability: "spy",
+    ability: "muster",
     img: "smuggler1",
     faction: "Scoia'tael",
     type: 0

site/client/app/components/chat.js

@@ -1,5 +1,19 @@
 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);
+    }
+  }
 
 };

site/client/app/views/chat.html

@@ -11,7 +11,7 @@
       blaa blaa
     </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>
 
 </section>

site/client/assets/sass/_modal.scss

@@ -75,6 +75,7 @@
   text-align: center;
   color: darken(#8798ac, 30%);
   cursor: pointer;
+  text-transform: uppercase;
 
   @include transition();