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

Use transparent as border color of submit button when color is not set

Browse Source 
[MAILPOET-2870]
This commit is contained in:
Rostislav Wolny
2020-04-30 13:45:33 +02:00
committed by Veljko V
parent 40f83bf3a7
commit e17d3fc293
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,7 @@ const SubmitEdit = ({ attributes, setAttributes }) => {
fontWeight: attributes.styles.bold ? 'bold' : 'inherit', fontWeight: attributes.styles.bold ? 'bold' : 'inherit',
borderRadius: attributes.styles.borderRadius !== undefined ? `${attributes.styles.borderRadius}px` : 0, borderRadius: attributes.styles.borderRadius !== undefined ? `${attributes.styles.borderRadius}px` : 0,
borderWidth: attributes.styles.borderSize !== undefined ? `${attributes.styles.borderSize}px` : '1px', borderWidth: attributes.styles.borderSize !== undefined ? `${attributes.styles.borderSize}px` : '1px',
borderColor: attributes.styles.borderColor || 'initial', borderColor: attributes.styles.borderColor || 'transparent',
borderStyle: 'solid', borderStyle: 'solid',
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',

3
lib/Form/BlockStylesRenderer.php
View File

@ -40,6 +40,9 @@ class BlockStylesRenderer {
if (isset($styles['font_size'])) { if (isset($styles['font_size'])) {
$rules[] = "font-size:" . intval($styles['font_size']) . "px;"; $rules[] = "font-size:" . intval($styles['font_size']) . "px;";
} }
if (!isset($styles['border_color'])) {
$rules[] = "border-color:transparent;";
}
if (isset($styles['bold']) && $styles['bold'] === '1') { if (isset($styles['bold']) && $styles['bold'] === '1') {
$rules[] = "font-weight:bold;"; $rules[] = "font-weight:bold;";
} }

10
tests/unit/Form/BlockStylesRendererTest.php
View File

@ -48,12 +48,12 @@ class BlockStylesRendererTest extends \MailPoetUnitTest {
} }
public function testItShouldRenderSingleButtonStyles() { public function testItShouldRenderSingleButtonStyles() {
expect($this->renderer->renderForButton(['border_radius' => 10]))->equals('border-style:solid;border-radius:10px;'); expect($this->renderer->renderForButton(['border_radius' => 10]))->equals('border-style:solid;border-radius:10px;border-color:transparent;');
expect($this->renderer->renderForButton(['border_color' => '#fff']))->equals('border-style:solid;border-color:#fff;'); expect($this->renderer->renderForButton(['border_color' => '#fff']))->equals('border-style:solid;border-color:#fff;');
expect($this->renderer->renderForButton(['border_size' => 10]))->equals('border-style:solid;border-width:10px;'); expect($this->renderer->renderForButton(['border_size' => 10]))->equals('border-style:solid;border-width:10px;border-color:transparent;');
expect($this->renderer->renderForButton(['background_color' => '#dddddd']))->equals('background-color:#dddddd;'); expect($this->renderer->renderForButton(['background_color' => '#dddddd']))->equals('background-color:#dddddd;border-color:transparent;');
expect($this->renderer->renderForButton(['font_color' => '#aaa']))->equals('color:#aaa;'); expect($this->renderer->renderForButton(['font_color' => '#aaa']))->equals('color:#aaa;border-color:transparent;');
expect($this->renderer->renderForButton(['font_size' => 10]))->equals('font-size:10px;'); expect($this->renderer->renderForButton(['font_size' => 10]))->equals('font-size:10px;border-color:transparent;');
} }
public function testItShouldCompleteButtonStyles() { public function testItShouldCompleteButtonStyles() {