From 23c6c37c8dc35c591fb06e606d9a95d982187f0e Mon Sep 17 00:00:00 2001
From: stefanorigano <sri@odoo.com>
Date: Mon, 7 Nov 2016 11:43:11 +0100
Subject: [PATCH] [FIX] mass_mailing: vertical alignments & multiline text
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* vertical alignment: Keep ‘vertical-align: top’ as default, but
define ‘middle’ exceptions for header and footer snippets.

* ‘comparison_table’: multiline text.
Remove inline style for inner <p/> elements and define default padding
for parent <td/> instead. This will allow to create multiple line of
text keeping a coherent margin between each <td/>.
A css set of rules triggering any kind of elements allow to use
multiline text for any kind of tag (p, h1, etc..)

* Footer snippets padding, minor
---
 .../static/src/less/themes/theme_default.less | 19 +++++++++++++++++++
 addons/mass_mailing/views/snippets_themes.xml | 16 ++++++++--------
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/addons/mass_mailing/static/src/less/themes/theme_default.less b/addons/mass_mailing/static/src/less/themes/theme_default.less
index 8999132c2ae..2c01e9be498 100644
--- a/addons/mass_mailing/static/src/less/themes/theme_default.less
+++ b/addons/mass_mailing/static/src/less/themes/theme_default.less
@@ -141,6 +141,9 @@
             display: inline-block;
         }
     }
+    td {
+        vertical-align: middle;
+    }
 }
 
 .o_mail_block_header_text_social {
@@ -187,6 +190,18 @@
         height: 1px;
         background-color: darken(@o_mm_def_color_alpha, 15%);
     }
+    table table {
+        td, th {
+            vertical-align: middle;
+        }
+        td {
+            padding: 10px 20px;
+            * {
+                margin: 0;
+                line-height: 1.3;
+            }
+        }
+    }
 }
 
 .o_mail_block_discount2 {
@@ -202,6 +217,7 @@
     .o_mail_table_styles {
         border-top: 2px solid @o_mm_def_color_alpha;
         padding-top: 20px;
+        padding-bottom: 20px;
     }
 
     .o_mail_footer_links {
@@ -241,6 +257,9 @@
             }
         }
     }
+    td {
+        vertical-align: middle;
+    }
 }
 
 .o_mail_display_coupon {
diff --git a/addons/mass_mailing/views/snippets_themes.xml b/addons/mass_mailing/views/snippets_themes.xml
index dad98262117..e92bbdcdd03 100644
--- a/addons/mass_mailing/views/snippets_themes.xml
+++ b/addons/mass_mailing/views/snippets_themes.xml
@@ -245,22 +245,22 @@
                                     </tr>
                                     <tr>
                                         <td class="o_mail_col_mv">
-                                            <p style="margin: 0 15px 15px;">Basic features</p>
+                                            <p>Basic features</p>
                                         </td>
                                     </tr>
                                     <tr>
                                         <td class="o_mail_col_mv">
-                                            <p style="margin: 0 15px 15px;">Basic management</p>
+                                            <p>Basic management</p>
                                         </td>
                                     </tr>
                                     <tr>
                                         <td class="o_mail_col_mv">
-                                            <p style="margin: 0 15px 15px;">No customization</p>
+                                            <p>No customization</p>
                                         </td>
                                     </tr>
                                     <tr>
                                         <td class="o_mail_col_mv">
-                                            <p style="margin: 0 15px 15px;">No support</p>
+                                            <p>No support</p>
                                         </td>
                                     </tr>
                                 </tbody>
@@ -301,22 +301,22 @@
                                     </tr>
                                     <tr>
                                         <td class="o_mail_col_mv">
-                                            <p style="margin: 0 15px 15px;"><strong>Advanced</strong> features</p>
+                                            <p><strong>Advanced</strong> features</p>
                                         </td>
                                     </tr>
                                     <tr>
                                         <td class="o_mail_col_mv">
-                                            <p style="margin: 0 15px 15px;"><strong>Total</strong> management</p>
+                                            <p><strong>Total</strong> management</p>
                                         </td>
                                     </tr>
                                     <tr>
                                         <td class="o_mail_col_mv">
-                                            <p style="margin: 0 15px 15px;"><strong>Fully customizable</strong></p>
+                                            <p><strong>Fully customizable</strong></p>
                                         </td>
                                     </tr>
                                     <tr>
                                         <td class="o_mail_col_mv">
-                                            <p style="margin: 0 15px 15px;"><strong>24/7 Support</strong></p>
+                                            <p><strong>24/7 Support</strong></p>
                                         </td>
                                     </tr>
                                 </tbody>