From f7942a4a8bc2accde46e6772c03e9ce35f670b72 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Wed, 17 Aug 2022 18:11:18 +0530 Subject: [PATCH] fix: Keep action button size consistent --- frappe/public/js/frappe/web_form/web_form.js | 8 ++++---- frappe/public/scss/website/web_form.scss | 2 +- .../doctype/web_form/templates/web_form.html | 20 +++++++++---------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/frappe/public/js/frappe/web_form/web_form.js b/frappe/public/js/frappe/web_form/web_form.js index ccd88f0ba3..41f8014662 100644 --- a/frappe/public/js/frappe/web_form/web_form.js +++ b/frappe/public/js/frappe/web_form/web_form.js @@ -81,11 +81,11 @@ export default class WebForm extends frappe.ui.FieldGroup { } $(".web-form-footer .web-form-actions .left-area").prepend(` - + `); $(".web-form-footer .web-form-actions .right-area").prepend(` - + `); $(".btn-previous").on("click", function () { @@ -399,7 +399,7 @@ export default class WebForm extends frappe.ui.FieldGroup { render_success_page(data) { if (this.allow_edit && data.name) { $(".success-page").append(` - + ${__("Edit your response", null, "Button in web form")} `); @@ -407,7 +407,7 @@ export default class WebForm extends frappe.ui.FieldGroup { if (this.login_required && !this.allow_multiple && !this.show_list && data.name) { $(".success-page").append(` - + ${__("View your response", null, "Button in web form")} `); diff --git a/frappe/public/scss/website/web_form.scss b/frappe/public/scss/website/web_form.scss index 0a4350e0bf..6bc515b173 100644 --- a/frappe/public/scss/website/web_form.scss +++ b/frappe/public/scss/website/web_form.scss @@ -137,7 +137,7 @@ justify-content: space-between; .btn { - font-size: var(--font-size-base); + font-size: var(--text-base); } .center-area { diff --git a/frappe/website/doctype/web_form/templates/web_form.html b/frappe/website/doctype/web_form/templates/web_form.html index fce6401457..08a8b87097 100644 --- a/frappe/website/doctype/web_form/templates/web_form.html +++ b/frappe/website/doctype/web_form/templates/web_form.html @@ -3,25 +3,25 @@ {% block breadcrumbs %}{% endblock %} {% macro header_buttons() %} + {% if allow_edit and doc_name and not is_form_editable %} + + {{ _("Edit Response", null, "Button in web form") }} + {% endif %} + {% if allow_print and not is_new %} {% set print_format_url = "/printview?doctype=" + doc_type + "&name=" + doc_name + "&format=" + print_format %} - + {% endif %} - - {% if allow_edit and doc_name and not is_form_editable %} - - {{ _("Edit", null, "Button in web form") }} - {% endif %} {% endmacro %} {% macro action_buttons() %} {% if is_new or is_form_editable %}
- + {% if is_form_editable %} {{ _("Reset Form", null, "Button in web form") }} {% else %} @@ -32,7 +32,7 @@
- +
{% endif %} {% endmacro %} @@ -133,10 +133,10 @@
{% else %} {% if show_list %} - {{ _("See previous responses", null, "Button in web form") }} + {{ _("See previous responses", null, "Button in web form") }} {% endif %} {% if not login_required or allow_multiple %} - {{ _("Submit another response", null, "Button in web form") }} + {{ _("Submit another response", null, "Button in web form") }} {% endif %} {% endif %}