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

Change class name for columns with background

Browse Source 
[MAILPOET-2609]
This commit is contained in:
Rostislav Wolny
2020-03-03 11:32:19 +01:00
committed by Pavel Dohnal
parent 23a8a46858
commit 772df80f01
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
assets/css/src/components/_public.scss
View File

@ -71,7 +71,7 @@ $form-block-margin: 20px;
@mixin maxWidthColumns() { @mixin maxWidthColumns() {
flex-wrap: wrap; flex-wrap: wrap;
&.mailpoet_column_has_background .mailpoet_form_column:last-child .mailpoet_paragraph:last-child { &.mailpoet_column_with_background .mailpoet_form_column:last-child .mailpoet_paragraph:last-child {
margin-bottom: 0 !important; margin-bottom: 0 !important;
} }
} }
@ -129,7 +129,7 @@ $form-block-margin: 20px;
} }
@media (min-width: $form-break-small-width) { @media (min-width: $form-break-small-width) {
.mailpoet_form_form:not(.mailpoet_form_tight_container) .mailpoet_column_has_background & .mailpoet_paragraph:last-child { .mailpoet_form_form:not(.mailpoet_form_tight_container) .mailpoet_column_with_background & .mailpoet_paragraph:last-child {
margin-bottom: 0 !important; margin-bottom: 0 !important;
} }
} }

4
lib/Form/Block/Columns.php
View File

@ -28,9 +28,9 @@ class Columns {
} }
if (!empty($params['background_color'])) { if (!empty($params['background_color'])) {
$classes[] = "has-{$params['background_color']}-background-color"; $classes[] = "has-{$params['background_color']}-background-color";
$classes[] = "mailpoet_column_has_background"; $classes[] = "mailpoet_column_with_background";
} elseif (!empty($params['custom_background_color'])) { } elseif (!empty($params['custom_background_color'])) {
$classes[] = "mailpoet_column_has_background"; $classes[] = "mailpoet_column_with_background";
} }
if (!empty($params['text_color'])) { if (!empty($params['text_color'])) {
$classes[] = "has-{$params['text_color']}-color"; $classes[] = "has-{$params['text_color']}-color";

2
lib/Form/Util/Styles.php
View File

@ -12,7 +12,7 @@ class Styles {
} }
/* columns */ /* columns */
.mailpoet_column_has_background { .mailpoet_column_with_background {
padding: 10px; padding: 10px;
} }
/* space between columns */ /* space between columns */

4
tests/unit/Form/Block/ColumnsTest.php
View File

@ -46,7 +46,7 @@ class ColumnsTest extends \MailPoetUnitTest {
$column = $this->htmlParser->getElementByXpath($html, '//div[1]'); $column = $this->htmlParser->getElementByXpath($html, '//div[1]');
$class = $this->htmlParser->getAttribute($column, 'class'); $class = $this->htmlParser->getAttribute($column, 'class');
expect($class->textContent)->contains('has-vivid-red-background-color'); expect($class->textContent)->contains('has-vivid-red-background-color');
expect($class->textContent)->contains('mailpoet_column_has_background'); expect($class->textContent)->contains('mailpoet_column_with_background');
} }
public function testItShouldRenderTextColorClass() { public function testItShouldRenderTextColorClass() {
@ -75,7 +75,7 @@ class ColumnsTest extends \MailPoetUnitTest {
$style = $this->htmlParser->getAttribute($columns, 'style'); $style = $this->htmlParser->getAttribute($columns, 'style');
expect($style->textContent)->contains('background-color:#ffffff;'); expect($style->textContent)->contains('background-color:#ffffff;');
$class = $this->htmlParser->getAttribute($columns, 'class'); $class = $this->htmlParser->getAttribute($columns, 'class');
expect($class->textContent)->contains('mailpoet_column_has_background'); expect($class->textContent)->contains('mailpoet_column_with_background');
} }
public function testItShouldCustomTextColor() { public function testItShouldCustomTextColor() {