diff --git a/src/pretalx/orga/templates/orga/cfp/flow.html b/src/pretalx/orga/templates/orga/cfp/flow.html index e280b5a1af..6d578c30a2 100644 --- a/src/pretalx/orga/templates/orga/cfp/flow.html +++ b/src/pretalx/orga/templates/orga/cfp/flow.html @@ -6,9 +6,7 @@ {% block stylesheets %} - {% compress css %} - - {% endcompress %} + {% endblock stylesheets %} {% block scripts %} diff --git a/src/pretalx/static/orga/css/flow.css b/src/pretalx/static/orga/css/flow.css index a1158225a7..a8f796c1e0 100644 --- a/src/pretalx/static/orga/css/flow.css +++ b/src/pretalx/static/orga/css/flow.css @@ -4,6 +4,7 @@ position: relative; user-select: none; margin-right: 270px; + width: 100%; #steps { display: flex; @@ -103,7 +104,7 @@ margin-bottom: 0; bottom: 1px; left: 250px; - right: 0; + right: 250px; box-shadow: var(--shadow-dialog); button { margin-left: auto; diff --git a/src/pretalx/static/orga/js/cfp_flow.js b/src/pretalx/static/orga/js/cfp_flow.js index 315f1803e7..3ea60bd8e2 100644 --- a/src/pretalx/static/orga/js/cfp_flow.js +++ b/src/pretalx/static/orga/js/cfp_flow.js @@ -30,7 +30,7 @@ var api = { } let currentLanguage = "en" -let currentModal = Vue.observable({ +let currentModal = Vue.reactive({ type: null, data: null, show: false, @@ -58,15 +58,17 @@ document.onclick = (event) => { currentModal.data = null } } -document.onkeypress = (event) => { +document.onkeydown = (event) => { if (!currentModal.data) return let isEscape = false - if ("key" in evt) { - isEscape = evt.key === "Escape" || evt.key === "Esc" + if ("key" in event) { + isEscape = event.key === "Escape" || event.key === "Esc" } else { - isEscape = evt.keyCode === 27 + isEscape = event.keyCode === 27 + } + if (isEscape) { + currentModal.data = null } - currentModal.data = null } function areEqual() { @@ -127,63 +129,138 @@ function areEqual() { return true } -Vue.component("field", { - template: ` -
- This is a custom question you added to the CfP. You can change or remove this CfP question here. -
-