From de0a9198c14c1004c8ab319da43ff02e9759e385 Mon Sep 17 00:00:00 2001
From: gloas <gloas@afi-sa.fr>
Date: Wed, 28 Apr 2021 11:04:33 +0200
Subject: [PATCH] hotline MT #133590 upgrade cardify_horizontal hydratation
---
VERSIONS_HOTLINE/133590 | 1 +
.../Intonation/Assets/css/intonation.css | 1 +
.../templates/Intonation/Library/Settings.php | 6 +++---
.../scenarios/Templates/ChiliAccordionTest.php | 18 ++++++++++++++++++
4 files changed, 23 insertions(+), 3 deletions(-)
create mode 100644 VERSIONS_HOTLINE/133590
diff --git a/VERSIONS_HOTLINE/133590 b/VERSIONS_HOTLINE/133590
new file mode 100644
index 00000000000..ff85141026c
--- /dev/null
+++ b/VERSIONS_HOTLINE/133590
@@ -0,0 +1 @@
+ - ticket #133590 : Magasin de thèmes : Amélioration du rendu par défaut de média et description à droite.
\ No newline at end of file
diff --git a/library/templates/Intonation/Assets/css/intonation.css b/library/templates/Intonation/Assets/css/intonation.css
index e6d426b621e..da84b786fa0 100644
--- a/library/templates/Intonation/Assets/css/intonation.css
+++ b/library/templates/Intonation/Assets/css/intonation.css
@@ -613,6 +613,7 @@ dl.row {
.no_truncate,
.no_truncate * {
max-width: none;
+ white-space: break-spaces;
}
.badge-group .badge.no_truncate .text-truncate {
diff --git a/library/templates/Intonation/Library/Settings.php b/library/templates/Intonation/Library/Settings.php
index 1d15b4c12b1..a90674717f6 100644
--- a/library/templates/Intonation/Library/Settings.php
+++ b/library/templates/Intonation/Library/Settings.php
@@ -238,9 +238,9 @@ class Intonation_Library_Settings extends Intonation_System_Abstract {
'div class rich_content_actions' => 'col-12 px-0 mt-3 record_summary',
'div class rich_content_row_actions' => 'col col-lg-12 pt-1 mt-1 mr-1 pr-1 w-s_nowrap',
- 'div class cardify_horizontal_img' => 'col-3 p-3',
- 'div class cardify_horizontal_content' => 'col col-sm-6 py-3',
- 'div class cardify_horizontal_actions' => 'col-12 col-sm-3 p-3',
+ 'div class cardify_horizontal_img' => 'col-12 col-sm-3 px-3 px-sm-0',
+ 'div class cardify_horizontal_content' => 'col-12 col-sm-6 px-3',
+ 'div class cardify_horizontal_actions' => 'col-12 col-sm-3 px-3 px-sm-0',
'div class loading_icon' => 'spinner-border',
'div class review_author' => 'col-12 col-lg-6 text-md-left',
diff --git a/tests/scenarios/Templates/ChiliAccordionTest.php b/tests/scenarios/Templates/ChiliAccordionTest.php
index 2faec970414..7f913cf5e05 100644
--- a/tests/scenarios/Templates/ChiliAccordionTest.php
+++ b/tests/scenarios/Templates/ChiliAccordionTest.php
@@ -104,6 +104,24 @@ class ChiliAccordionWidgetTest extends AbstractControllerTestCase {
}
+ /** @test */
+ public function cardifyHorizontalImgShouldBeHydratedWithCol12ColSm3Px3() {
+ $this->assertXPath('//div[@class = "cardify_horizontal_img col-12 col-sm-3 px-3 px-sm-0"]');
+ }
+
+
+ /** @test */
+ public function cardifyHorizontalContentShouldBeHydratedWithCol12ColSm6Px3() {
+ $this->assertXPath('//div[@class = "cardify_horizontal_content col-12 col-sm-6 px-3"]');
+ }
+
+
+ /** @test */
+ public function cardifyHorizontalActionsShouldBeHydratedWithCol12ColSm3Px3() {
+ $this->assertXPath('//div[@class = "cardify_horizontal_actions col-12 col-sm-3 px-3 px-sm-0"]');
+ }
+
+
/** @test */
public function pageShouldBeHTML5Valid() {
$this->assertHTML5();
--
GitLab