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

Render font family

Browse Source 
[MAILPOET-2911]
This commit is contained in:
Pavel Dohnal
2020-06-09 15:56:18 +02:00
committed by Veljko V
parent 7afdc9766f
commit 942e520c56
3 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/js/src/public.jsx
View File

@ -50,7 +50,7 @@ jQuery(($) => {
const originalFontFamily = formDiv.css('font-family'); const originalFontFamily = formDiv.css('font-family');
const newFontFamily = `"${fontName}", ${originalFontFamily}`; const newFontFamily = `"${fontName}", ${originalFontFamily}`;
formDiv.css('font-family', newFontFamily); formDiv.css('font-family', newFontFamily);
formDiv.find('input, option').css('font-family', 'inherit'); formDiv.find('option').css('font-family', 'inherit');
formDiv.find('input[type=text], textarea, input[type=email], select').css('font-family', newFontFamily); formDiv.find('input[type=text], textarea, input[type=email], select').css('font-family', newFontFamily);
formDiv.find(':header').css('font-family', 'inherit'); formDiv.find(':header').css('font-family', 'inherit');
} }

9
lib/Form/BlockStylesRenderer.php
View File

@ -23,12 +23,19 @@ class BlockStylesRenderer {
if (isset($styles['border_color'])) { if (isset($styles['border_color'])) {
$rules[] = "border-color:{$styles['border_color']};"; $rules[] = "border-color:{$styles['border_color']};";
} }
if (isset($formSettings['input_padding'])) { if (isset($styles['padding'])) {
$rules[] = "padding:{$styles['padding']}px;";
} elseif (isset($formSettings['input_padding'])) {
$rules[] = "padding:{$formSettings['input_padding']}px;"; $rules[] = "padding:{$formSettings['input_padding']}px;";
} }
if (isset($formSettings['alignment'])) { if (isset($formSettings['alignment'])) {
$rules[] = $this->convertAlignmentToMargin($formSettings['alignment']); $rules[] = $this->convertAlignmentToMargin($formSettings['alignment']);
} }
if (isset($styles['font_family'])) {
$rules[] = "font-family:'{$styles['font_family']}';" ;
} elseif (isset($formSettings['font_family'])) {
$rules[] = "font-family:'{$formSettings['font_family']}';" ;
}
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;";
} }

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

@ -97,4 +97,15 @@ class BlockStylesRendererTest extends \MailPoetUnitTest {
'styles' => ['font_color' => 'red'], 'styles' => ['font_color' => 'red'],
], 'input'))->notEquals(''); ], 'input'))->notEquals('');
} }
public function testItShouldRenderFontFamily() {
$styles = [];
$settings = [
'font_family' => 'font1',
];
$result = $this->renderer->renderForButton($styles, $settings);
expect($result)->contains("font-family:'font1'");
$result = $this->renderer->renderForButton(['font_family' => 'font2'], $settings);
expect($result)->contains("font-family:'font2'");
}
} }