Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Allow zero border size and border radius for button and inputs

Browse Source 
[MAILPOET-2604]
This commit is contained in:
Rostislav Wolny
2020-03-24 15:57:17 +01:00
committed by Veljko V
parent 7aaf07217a
commit f4369975ed
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/js/src/form_editor/blocks/custom_textarea/edit.jsx
View File

@@ -113,7 +113,7 @@ const CustomTextAreaEdit = ({ attributes, setAttributes, clientId }) => {
const inputStyles = !attributes.styles.inheritFromTheme ? { const inputStyles = !attributes.styles.inheritFromTheme ? {
borderRadius: attributes.styles.borderRadius ? `${attributes.styles.borderRadius}px` : 0, borderRadius: attributes.styles.borderRadius ? `${attributes.styles.borderRadius}px` : 0,
borderWidth: attributes.styles.borderSize ? `${attributes.styles.borderSize}px` : '1px', borderWidth: attributes.styles.borderSize !== undefined ? `${attributes.styles.borderSize}px` : '1px',
borderColor: attributes.styles.borderColor || 'initial', borderColor: attributes.styles.borderColor || 'initial',
} : {}; } : {};

2
assets/js/src/form_editor/blocks/submit/edit.jsx
View File

@@ -32,7 +32,7 @@ const SubmitEdit = ({ attributes, setAttributes }) => {
const styles = !attributes.styles.inheritFromTheme ? { const styles = !attributes.styles.inheritFromTheme ? {
fontWeight: attributes.styles.bold ? 'bold' : 'inherit', fontWeight: attributes.styles.bold ? 'bold' : 'inherit',
borderRadius: attributes.styles.borderRadius ? `${attributes.styles.borderRadius}px` : 0, borderRadius: attributes.styles.borderRadius ? `${attributes.styles.borderRadius}px` : 0,
borderWidth: attributes.styles.borderSize ? `${attributes.styles.borderSize}px` : '1px', borderWidth: attributes.styles.borderSize !== undefined ? `${attributes.styles.borderSize}px` : '1px',
borderColor: attributes.styles.borderColor || 'initial', borderColor: attributes.styles.borderColor || 'initial',
fontSize: attributes.styles.fontSize ? `${attributes.styles.fontSize}px` : 'inherit', fontSize: attributes.styles.fontSize ? `${attributes.styles.fontSize}px` : 'inherit',
color: attributes.styles.fontColor || 'inherit', color: attributes.styles.fontColor || 'inherit',

4
assets/js/src/form_editor/blocks/submit/styles_settings.tsx
View File

@@ -82,7 +82,7 @@ const StylesSettings = ({
/> />
<RangeControl <RangeControl
label={MailPoet.I18n.t('formSettingsBorderSize')} label={MailPoet.I18n.t('formSettingsBorderSize')}
value={localStyles.borderSize || 1} value={localStyles.borderSize !== undefined ? localStyles.borderSize : 1}
min={0} min={0}
max={10} max={10}
allowReset allowReset
@@ -91,7 +91,7 @@ const StylesSettings = ({
/> />
<RangeControl <RangeControl
label={MailPoet.I18n.t('formSettingsBorderRadius')} label={MailPoet.I18n.t('formSettingsBorderRadius')}
value={localStyles.borderRadius || 1} value={localStyles.borderRadius !== undefined ? localStyles.borderRadius : 1}
min={0} min={0}
max={40} max={40}
allowReset allowReset

2
assets/js/src/form_editor/blocks/text_input_edit.jsx
View File

@@ -21,7 +21,7 @@ const TextInputEdit = ({
const inputStyles = !styles.inheritFromTheme ? { const inputStyles = !styles.inheritFromTheme ? {
borderRadius: styles.borderRadius ? `${styles.borderRadius}px` : 0, borderRadius: styles.borderRadius ? `${styles.borderRadius}px` : 0,
borderWidth: styles.borderSize ? `${styles.borderSize}px` : '1px', borderWidth: styles.borderSize !== undefined ? `${styles.borderSize}px` : '1px',
borderColor: styles.borderColor || 'initial', borderColor: styles.borderColor || 'initial',
} : {}; } : {};