diff --git a/src/App.vue b/src/App.vue index d2e7dd4..688b31f 100644 --- a/src/App.vue +++ b/src/App.vue @@ -87,7 +87,7 @@ export default { Gradients, }, computed: { - ...mapState(["grimoire", "session"]), + ...mapState(["grimoire", "session", "modals"]), ...mapState("players", ["players"]), }, data() { @@ -97,7 +97,7 @@ export default { }, methods: { keyup({ key, ctrlKey, metaKey }) { - if (ctrlKey || metaKey) return; + if (ctrlKey || metaKey || this.modals.role) return; switch (key.toLocaleLowerCase()) { case "g": this.$store.commit("toggleGrimoire"); diff --git a/src/assets/icons/plusone.png b/src/assets/icons/plusone.png new file mode 100644 index 0000000..a7018f5 Binary files /dev/null and b/src/assets/icons/plusone.png differ diff --git a/src/components/Token.vue b/src/components/Token.vue index 849dbfa..95417ce 100644 --- a/src/components/Token.vue +++ b/src/components/Token.vue @@ -1,7 +1,5 @@ diff --git a/src/components/modals/RoleModal.vue b/src/components/modals/RoleModal.vue index eadde8c..1ea8309 100644 --- a/src/components/modals/RoleModal.vue +++ b/src/components/modals/RoleModal.vue @@ -8,7 +8,26 @@ : "bluffing" }} -