From 67d5a3d54ed75d6d01df513a5ea6a44ea558994c Mon Sep 17 00:00:00 2001 From: Rostislav Wolny Date: Tue, 24 Mar 2020 15:59:54 +0100 Subject: [PATCH] Ensure solid border style for styled inputs and button in form editor [MAILPOET-2604] --- assets/js/src/form_editor/blocks/custom_textarea/edit.jsx | 1 + assets/js/src/form_editor/blocks/submit/edit.jsx | 1 + assets/js/src/form_editor/blocks/text_input_edit.jsx | 1 + 3 files changed, 3 insertions(+) diff --git a/assets/js/src/form_editor/blocks/custom_textarea/edit.jsx b/assets/js/src/form_editor/blocks/custom_textarea/edit.jsx index 9aa150974b..71bdc89acf 100644 --- a/assets/js/src/form_editor/blocks/custom_textarea/edit.jsx +++ b/assets/js/src/form_editor/blocks/custom_textarea/edit.jsx @@ -115,6 +115,7 @@ const CustomTextAreaEdit = ({ attributes, setAttributes, clientId }) => { borderRadius: attributes.styles.borderRadius ? `${attributes.styles.borderRadius}px` : 0, borderWidth: attributes.styles.borderSize !== undefined ? `${attributes.styles.borderSize}px` : '1px', borderColor: attributes.styles.borderColor || 'initial', + borderStyle: 'solid', } : {}; if (attributes.styles.fullWidth) { diff --git a/assets/js/src/form_editor/blocks/submit/edit.jsx b/assets/js/src/form_editor/blocks/submit/edit.jsx index a83ddf1738..c3c525b7fd 100644 --- a/assets/js/src/form_editor/blocks/submit/edit.jsx +++ b/assets/js/src/form_editor/blocks/submit/edit.jsx @@ -34,6 +34,7 @@ const SubmitEdit = ({ attributes, setAttributes }) => { borderRadius: attributes.styles.borderRadius ? `${attributes.styles.borderRadius}px` : 0, borderWidth: attributes.styles.borderSize !== undefined ? `${attributes.styles.borderSize}px` : '1px', borderColor: attributes.styles.borderColor || 'initial', + borderStyle: 'solid', fontSize: attributes.styles.fontSize ? `${attributes.styles.fontSize}px` : 'inherit', color: attributes.styles.fontColor || 'inherit', } : {}; diff --git a/assets/js/src/form_editor/blocks/text_input_edit.jsx b/assets/js/src/form_editor/blocks/text_input_edit.jsx index dff623742e..9973febfc0 100644 --- a/assets/js/src/form_editor/blocks/text_input_edit.jsx +++ b/assets/js/src/form_editor/blocks/text_input_edit.jsx @@ -23,6 +23,7 @@ const TextInputEdit = ({ borderRadius: styles.borderRadius ? `${styles.borderRadius}px` : 0, borderWidth: styles.borderSize !== undefined ? `${styles.borderSize}px` : '1px', borderColor: styles.borderColor || 'initial', + borderStyle: 'solid', } : {}; if (styles.fullWidth) {