From d9e2fbe386e859262ce774827be61185f64550bd Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sat, 22 Jul 2017 18:18:30 +1000
Subject: [PATCH] Apply all vars to mail brand css

---
 modules/system/lang/en/lang.php               |  2 +-
 .../models/mailbrandsetting/custom.less       | 24 ++++++++++++-------
 .../mailbrandsetting/sample_template.htm      |  4 ++--
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/modules/system/lang/en/lang.php b/modules/system/lang/en/lang.php
index 6f69ca17d..4e75cb430 100644
--- a/modules/system/lang/en/lang.php
+++ b/modules/system/lang/en/lang.php
@@ -225,7 +225,7 @@ return [
         'return' => 'Return to template list'
     ],
     'mail_brand' => [
-        'menu_label' => 'Customize mail templates',
+        'menu_label' => 'Mail branding',
         'menu_description' => 'Modify the colors and appearance of mail templates.',
     ],
     'install' => [
diff --git a/modules/system/models/mailbrandsetting/custom.less b/modules/system/models/mailbrandsetting/custom.less
index b1471ab17..ea5617297 100644
--- a/modules/system/models/mailbrandsetting/custom.less
+++ b/modules/system/models/mailbrandsetting/custom.less
@@ -40,7 +40,7 @@ a img {
 /* Typography */
 
 h1 {
-    color: #2F3133;
+    color: @heading-color;
     font-size: 19px;
     font-weight: bold;
     margin-top: 0;
@@ -48,7 +48,7 @@ h1 {
 }
 
 h2 {
-    color: #2F3133;
+    color: @heading-color;
     font-size: 16px;
     font-weight: bold;
     margin-top: 0;
@@ -56,7 +56,7 @@ h2 {
 }
 
 h3 {
-    color: #2F3133;
+    color: @heading-color;
     font-size: 14px;
     font-weight: bold;
     margin-top: 0;
@@ -108,7 +108,7 @@ img {
 }
 
 .header a, .header span {
-    color: #bbbfc3;
+    color: @header-color;
     font-size: 19px;
     font-weight: bold;
     text-decoration: none;
@@ -163,7 +163,7 @@ img {
 }
 
 .footer p {
-    color: #AEAEAE;
+    color: @footer-color;
     font-size: 12px;
     text-align: center;
 }
@@ -171,6 +171,7 @@ img {
 /* Tables */
 
 .table table {
+    border-collapse: collapse;
     margin: 30px auto;
     width: 100%;
     -premailer-cellpadding: 0;
@@ -179,7 +180,7 @@ img {
 }
 
 .table th {
-    border-bottom: 1px solid #EDEFF2;
+    border-bottom: 1px solid @table-border-color;
     padding-bottom: 8px;
 }
 
@@ -246,7 +247,7 @@ img {
 }
 
 .panel-content {
-    background-color: #EDEFF2;
+    background-color: @panel-bg;
     padding: 16px;
 }
 
@@ -262,8 +263,8 @@ img {
 /* Promotions */
 
 .promotion {
-    background-color: #FFFFFF;
-    border: 2px dashed #9BA2AB;
+    background-color: @promotion-bg;
+    border: 2px dashed @promotion-border-color;
     margin: 0;
     margin-bottom: 25px;
     margin-top: 25px;
@@ -282,3 +283,8 @@ img {
     font-size: 15px;
     text-align: center;
 }
+
+.promotion p:last-of-type {
+    margin-bottom: 0;
+    padding-bottom: 0;
+}
diff --git a/modules/system/models/mailbrandsetting/sample_template.htm b/modules/system/models/mailbrandsetting/sample_template.htm
index 91ecc71ea..0214cd286 100644
--- a/modules/system/models/mailbrandsetting/sample_template.htm
+++ b/modules/system/models/mailbrandsetting/sample_template.htm
@@ -6,8 +6,8 @@ Cumque dicta <a>doloremque eaque</a>, enim error laboriosam pariatur possimus te
 ## Heading 2
 
 {% component 'table' %}
-| Item          | Description   | Price  |
-| ------------- |:-------------:| --------:|
+| Item          | Description   | Price    |
+|:------------- |:-------------:| --------:|
 | Item 1        | Centered      | $10      |
 | Item 2        | Right-Aligned | $20      |
 {% endcomponent %}