spree_core 4.1.14 → 4.2.0.beta

data/app/views/spree/order_mailer/cancel_email.text.erb

@@ -1,4 +1,4 @@
-<%= Spree.t('order_mailer.cancel_email.dear_customer') %>
+<%= Spree.t('order_mailer.cancel_email.dear_customer', name: name_for(@order)) %>
 
 <%= Spree.t('order_mailer.cancel_email.instructions') %>
 
@@ -10,7 +10,29 @@
 <% end %>
 ============================================================
 <%= Spree.t('order_mailer.subtotal') %> <%= @order.display_item_total %>
+<% if @order.line_item_adjustments.exists? %>
+  <% if @order.all_adjustments.promotion.eligible.exists? %>
+    <% @order.all_adjustments.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
+      <%= Spree.t(:promotion) %>: <%= label %> <%= Spree::Money.new(adjustments.sum(&:amount), currency: @order.currency) %>
+    <% end %>
+  <% end %>
+<% end %>
+
+<% @order.shipments.group_by { |s| s.selected_shipping_rate.try(:name) }.each do |name, shipments| %>
+  <%= Spree.t(:shipping) %>: <%= name %> <%= Spree::Money.new(shipments.sum(&:discounted_cost), currency: @order.currency) %>
+<% end %>
+
+<% if @order.all_adjustments.eligible.tax.exists? %>
+  <% @order.all_adjustments.eligible.tax.group_by(&:label).each do |label, adjustments| %>
+    <%= Spree.t(:tax) %>: <%= label %> <%= Spree::Money.new(adjustments.sum(&:amount), currency: @order.currency) %>
+  <% end %>
+<% end %>
+
 <% @order.adjustments.eligible.each do |adjustment| %>
-  <%= raw(adjustment.label) %> <%= adjustment.display_amount %>
+  <% next if (adjustment.source_type == 'Spree::TaxRate') and (adjustment.amount == 0) %>
+  <%= adjustment.label %> <%= adjustment.display_amount %>
 <% end %>
+============================================================
 <%= Spree.t('order_mailer.total') %> <%= @order.display_total %>
+<%= Spree.t('order_mailer.cancel_email.thanks') %>
+<%= Spree.t('order_mailer.store_team', store_name: current_store.name) %>

data/app/views/spree/order_mailer/confirm_email.html.erb

@@ -1,70 +1,23 @@
-<table class="row header">
+<h1>
+  <%= Spree.t('order_mailer.confirm_email.dear_customer', name: name_for(@order)) %>
+</h1>
+<p>
+  <%= Spree.t('order_mailer.confirm_email.instructions') %>
+</p>
+<table class="purchase" role="presentation">
   <tr>
     <td>
-      <p class="lede">
-        <%= Spree.t('order_mailer.confirm_email.dear_customer') %>
-      </p>
-      <p>
-        <%= Spree.t('order_mailer.confirm_email.instructions') %>
-      </p>
-      <p>
-        <%= Spree.t('order_mailer.confirm_email.order_summary', number: @order.number) %>
-      </p>
-      <table class="container">
-        <tr>
-          <td class="wrapper last">
-            <table class="twelve columns">
-              <%= render collection: @order.line_items, partial: 'spree/shared/mailer_line_item', as: :line_item %>
-              <%= render 'spree/order_mailer/subtotal', order: @order %>
-              <% if @order.line_item_adjustments.exists? %>
-                <% if @order.all_adjustments.promotion.eligible.exists? %>
-                  <% @order.all_adjustments.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
-                    <tr>
-                      <td class="six sub-columns">
-                        <%= Spree.t(:promotion) %> <%= label %>:
-                      </td>
-                      <td class="six sub-columns last right">
-                        <%= Spree::Money.new(adjustments.sum(&:amount), currency: @order.currency) %>
-                      </td>
-                    </tr>
-                  <% end %>
-                <% end %>
-              <% end %>
-              <% @order.shipments.group_by { |s| s.selected_shipping_rate.try(:name) }.each do |name, shipments| %>
-                <tr>
-                  <td class="six sub-columns">
-                    <%= Spree.t(:shipping) %> <%= name %>:
-                  </td>
-                  <td class="six sub-columns last right">
-                    <%= Spree::Money.new(shipments.sum(&:discounted_cost), currency: @order.currency) %>
-                  </td>
-                </tr>
-              <% end %>
-              <% if @order.all_adjustments.eligible.tax.exists? %>
-                <% @order.all_adjustments.eligible.tax.group_by(&:label).each do |label, adjustments| %>
-                  <tr>
-                    <td class="six sub-columns">
-                      <%= Spree.t(:tax) %> <%= label %>:
-                    </td>
-                    <td class="six sub-columns last right">
-                      <%= Spree::Money.new(adjustments.sum(&:amount), currency: @order.currency) %>
-                    </td>
-                  </tr>
-                <% end %>
-              <% end %>
-              <% @order.adjustments.eligible.each do |adjustment| %>
-                <% next if (adjustment.source_type == 'Spree::TaxRate') || (adjustment.amount == 0) %>
-                <%= render 'spree/order_mailer/adjustment', adjustment: adjustment %>
-              <% end %>
-              <%= render 'spree/order_mailer/total', order: @order %>
-            </table>
-          </td>
-        </tr>
-      </table>
-      <p>
-        <%= Spree.t('order_mailer.confirm_email.thanks') %>
-      </p>
+      <h3><%= Spree.t('order_mailer.confirm_email.order_summary', number: @order.number) %></h3>
+    </td>
+  </tr>
+  <tr>
+    <td colspan="2">
+      <%= render 'spree/shared/purchased_items_table', line_items: @order.line_items, order: @order %>
     </td>
-    <td class="expander"></td>
   </tr>
 </table>
+<p>
+  <%= Spree.t('order_mailer.confirm_email.thanks') %>
+  <br />
+  <%= Spree.t('order_mailer.store_team', store_name: current_store.name) %>
+</p>

data/app/views/spree/order_mailer/confirm_email.text.erb

@@ -1,4 +1,4 @@
-<%= Spree.t('order_mailer.confirm_email.dear_customer') %>
+<%= Spree.t('order_mailer.confirm_email.dear_customer', name: name_for(@order)) %>
 
 <%= Spree.t('order_mailer.confirm_email.instructions') %>
 
@@ -36,3 +36,4 @@
 <%= Spree.t('order_mailer.total') %> <%= @order.display_total %>
 
 <%= Spree.t('order_mailer.confirm_email.thanks') %>
+<%= Spree.t('order_mailer.store_team', store_name: current_store.name) %>

data/app/views/spree/order_mailer/store_owner_notification_email.html.erb

@@ -0,0 +1,23 @@
+<h1>
+  <%= Spree.t('order_mailer.store_owner_notification_email.heading') %>
+</h1>
+<p>
+  <%= Spree.t('order_mailer.store_owner_notification_email.instructions') %>
+</p>
+<table class="purchase" role="presentation">
+  <tr>
+    <td>
+      <h3><%= Spree.t('order_mailer.store_owner_notification_email.order_summary', number: @order.number) %></h3>
+    </td>
+  </tr>
+  <tr>
+    <td colspan="2">
+      <%= render 'spree/shared/purchased_items_table', line_items: @order.line_items, order: @order %>
+    </td>
+  </tr>
+</table>
+<p>
+  <%= Spree.t('order_mailer.store_owner_notification_email.thanks') %>
+  <br />
+  <%= Spree.t('order_mailer.store_team', store_name: current_store.name) %>
+</p>

data/app/views/spree/order_mailer/store_owner_notification_email.text.erb

@@ -0,0 +1,38 @@
+<%= Spree.t('order_mailer.store_owner_notification_email.heading') %>
+
+<%= Spree.t('order_mailer.store_owner_notification_email.instructions') %>
+
+============================================================
+<%= Spree.t('order_mailer.store_owner_notification_email.order_summary', number: @order.number) %>
+============================================================
+<% @order.line_items.each do |item| %>
+  <%= item.variant.sku %> <%= raw(item.variant.product.name) %> <%= raw(item.variant.options_text) -%> (<%=item.quantity%>) <%= Spree.t('at_symbol') %>  <%= item.single_money %> = <%= item.display_amount %>
+<% end %>
+============================================================
+<%= Spree.t('order_mailer.subtotal') %> <%= @order.display_item_total %>
+<% if @order.line_item_adjustments.exists? %>
+  <% if @order.all_adjustments.promotion.eligible.exists? %>
+    <% @order.all_adjustments.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
+<%= Spree.t(:promotion) %>: <%= label %> <%= Spree::Money.new(adjustments.sum(&:amount), currency: @order.currency) %>
+    <% end %>
+  <% end %>
+<% end %>
+
+<% @order.shipments.group_by { |s| s.selected_shipping_rate.try(:name) }.each do |name, shipments| %>
+<%= Spree.t(:shipping) %>: <%= name %> <%= Spree::Money.new(shipments.sum(&:discounted_cost), currency: @order.currency) %>
+<% end %>
+
+<% if @order.all_adjustments.eligible.tax.exists? %>
+  <% @order.all_adjustments.eligible.tax.group_by(&:label).each do |label, adjustments| %>
+<%= Spree.t(:tax) %>: <%= label %> <%= Spree::Money.new(adjustments.sum(&:amount), currency: @order.currency) %>
+  <% end %>
+<% end %>
+
+<% @order.adjustments.eligible.each do |adjustment| %>
+  <% next if (adjustment.source_type == 'Spree::TaxRate') and (adjustment.amount == 0) %>
+<%= adjustment.label %> <%= adjustment.display_amount %>
+<% end %>
+============================================================
+<%= Spree.t('order_mailer.total') %> <%= @order.display_total %>
+<%= Spree.t('order_mailer.store_owner_notification_email.thanks') %>
+<%= Spree.t('order_mailer.store_team', store_name: current_store.name) %>

data/app/views/spree/reimbursement_mailer/reimbursement_email.html.erb

@@ -1,61 +1,56 @@
-<table class="row header">
-  <tr>
-    <td>
-      <p class="lede">
-        <%= Spree.t('reimbursement_mailer.reimbursement_email.dear_customer') %>
-      </p>
-      <p>
-        <%= Spree.t('reimbursement_mailer.reimbursement_email.instructions') %>
-      </p>
-      <p>
-        <%= Spree.t('reimbursement_mailer.reimbursement_email.refund_summary') %>
-      </p>
-      <p>
-        <%= Spree.t('reimbursement_mailer.reimbursement_email.total_refunded', total: @reimbursement.display_total) %>
-      </p>
+<h1>
+  <%= Spree.t('reimbursement_mailer.reimbursement_email.dear_customer', name: name_for(@order)) %>
+</h1>
+<p>
+  <%= Spree.t('reimbursement_mailer.reimbursement_email.instructions') %>
+</p>
+<p>
+  <%= Spree.t('reimbursement_mailer.reimbursement_email.refund_summary') %>
+</p>
+<p>
+  <%= Spree.t('reimbursement_mailer.reimbursement_email.total_refunded', total: @reimbursement.display_total) %>
+</p>
+<% if @reimbursement.return_items.exchange_requested.present? %>
+  <p>
+    <%= Spree.t('reimbursement_mailer.reimbursement_email.exchange_summary') %>
+  </p>
 
-      <% if @reimbursement.return_items.exchange_requested.present? %>
-        
-        <p>
-        <%= Spree.t('reimbursement_mailer.reimbursement_email.exchange_summary') %>
-        </p>
-
-        <table class="container">
-          <tr>
-            <td class="wrapper last">
-              <table class="twelve columns">
-
-                <% @reimbursement.return_items.exchange_requested.each do |return_item| %>
-                  <tr>
-                    <td class="six sub-columns">
-                      <%= return_item.variant.sku %>
-                    </td>
-                    <td>
-                      <%= link_to raw(return_item.variant.product.name),
-                                  spree.product_url(return_item.variant.product) %>
-                    </td>
-                    <td>
-                      <%= "(#{raw(return_item.exchange_variant.options_text)})" if return_item.exchange_variant.options_text.present? -%>
-                    </td>
-                  </tr>
-                <% end %>
-
-              </table>
-            </td>
-          </tr>
-        </table>
-
-
-        <% if @reimbursement.return_items.awaiting_return.present? && Spree::Config[:expedited_exchanges] %>
-          <p>
-          <%= Spree.t('reimbursement_mailer.reimbursement_email.days_to_send', days: Spree::Config[:expedited_exchanges_days_window]) %>
+  <table class="purchase_content">
+    <% @reimbursement.return_items.exchange_requested.each do |return_item| %>
+      <tr>
+        <td class="purchase_image">
+          <% if frontend_available? %>
+            <%= link_to(image_tag(variant_image_url(return_item.variant)), spree.product_url(return_item.variant.product)) %>
+          <% else %>
+            <%= image_tag(variant_image_url(return_item.variant)) %>
+          <% end %>
+        </td>
+        <td class="purchase_item">
+          <strong>
+            <span class="f-fallback">
+              <% if frontend_available? %>
+                <%= link_to raw(return_item.variant.name), spree.product_url(return_item.variant.product) %>
+              <% else %>
+                <%= raw(return_item.variant.name) %>
+              <% end %>
+            </span>
+          </strong>
+          <p class="purchase_item--additional">
+            <%= "(#{raw(return_item.exchange_variant.options_text)})" if return_item.exchange_variant.options_text.present? -%>
           </p>
-        <% end %>
+        </td>
+      </tr>
+    <% end %>
+  </table>
+  <% if @reimbursement.return_items.awaiting_return.present? && Spree::Config[:expedited_exchanges] %>
+    <p>
+      <%= Spree.t('reimbursement_mailer.reimbursement_email.days_to_send', days: Spree::Config[:expedited_exchanges_days_window]) %>
+    </p>
+  <% end %>
+<% end %>
 
-      <% end %>
-      <p>
-        <%= Spree.t('reimbursement_mailer.reimbursement_email.thanks') %>
-      </p>
-    <td class="expander"></td>
-  </tr>
-</table>
+<p>
+  <%= Spree.t('reimbursement_mailer.reimbursement_email.thanks') %>
+  <br />
+  <%= Spree.t('reimbursement_mailer.reimbursement_email.store_team', store_name: current_store.name) %>
+</p>

data/app/views/spree/reimbursement_mailer/reimbursement_email.text.erb

@@ -1,4 +1,4 @@
-<%= Spree.t('reimbursement_mailer.reimbursement_email.dear_customer') %>
+<%= Spree.t('reimbursement_mailer.reimbursement_email.dear_customer', name: name_for(@reimbursement.order)) %>
 
 <%= Spree.t('reimbursement_mailer.reimbursement_email.instructions') %>
 
@@ -20,3 +20,5 @@
 <%= Spree.t('reimbursement_mailer.reimbursement_email.days_to_send', days: Spree::Config[:expedited_exchanges_days_window]) %>
 <% end %>
 <% end %>
+<%= Spree.t('reimbursement_mailer.reimbursement_email.thanks') %>
+<%= Spree.t('reimbursement_mailer.reimbursement_email.store_team', store_name: current_store.name) %>

data/app/views/spree/shared/_base_mailer_footer.html.erb

@@ -1,19 +1,11 @@
 <!-- You can override this template to design your own footer.
-<table class="row footer">
+<table class="email-footer" align="center" width="570" cellpadding="0" cellspacing="0" role="presentation">
   <tr>
-    <td class="wrapper last">
-
-      <table class="twelve columns">
-        <tr>
-          <td align="center">
-            <center>
-              <p style="text-align:center;"><a href="#">Terms</a> | <a href="#">Privacy</a> | <a href="#">Unsubscribe</a></p>
-            </center>
-          </td>
-          <td class="expander"></td>
-        </tr>
-      </table>
-
+    <td class="content-cell" align="center">
+      <p class="f-fallback sub align-center">
+        <a href="#">Terms</a> | <a href="#">Privacy</a> |
+        <a href="#">Unsubscribe</a>
+      </p>
     </td>
   </tr>
 </table>

data/app/views/spree/shared/_base_mailer_header.html.erb

@@ -1,33 +1,13 @@
 <!-- You can override this template to design your own header. -->
-<table class="row header">
-  <tr>
-    <td class="center" align="center">
-      <center>
-
-        <table class="container">
-          <tr>
-            <td class="wrapper last">
-
-              <table class="twelve columns">
-                <tr>
-                  <td class="twelve sub-columns last">
-                    <% if frontend_available? %>
-                      <%= link_to spree.root_url, class: 'template-label' do %>
-                        <%= image_tag Spree::Config.logo, class: 'logo', alt: Spree::Store.current.name, title: Spree::Store.current.name %>
-                      <% end %>
-                    <% else %>
-                      <%= image_tag Spree::Config.logo, class: 'logo', alt: Spree::Store.current.name, title: Spree::Store.current.name %>
-                    <% end %>
-                  </td>
-                  <td class="expander"></td>
-                </tr>
-              </table>
-
-            </td>
-          </tr>
-        </table>
-
-      </center>
-    </td>
-  </tr>
-</table>
+<% store_name = @order&.store&.name || current_store.name %>
+<tr>
+  <td class="email-masthead">
+    <% if frontend_available? %>
+      <%= link_to spree.root_url, class: 'template-label' do %>
+        <%= image_tag logo_path, class: 'logo', alt: store_name, title: store_name %>
+      <% end %>
+    <% else %>
+      <%= image_tag logo_path, class: 'logo', alt: store_name, title: store_name %>
+    <% end %>
+  </td>
+</tr>

data/app/views/spree/shared/_base_mailer_stylesheets.html.erb

@@ -1,777 +1,445 @@
-<style>
-  /**********************************************
-  * Ink v1.0.5 - Copyright 2013 ZURB Inc        *
-  **********************************************/
+<style type="text/css" rel="stylesheet" media="all">
+  /* Base ------------------------------ */
 
-  /* Client-specific Styles and Reset */
+  @import url("https://fonts.googleapis.com/css?family=Nunito+Sans:400,700&display=swap");
 
-  #outlook a {
-    padding:0;
-  }
-
-  body{
-    width:100% !important;
-    min-width: 100%;
-    -webkit-text-size-adjust:100%;
-    -ms-text-size-adjust:100%;
-    margin:0;
-    padding:0;
-  }
-
-    /* .ExternalClass applies to Outlook.com (the artist formerly known as Hotmail)  */
-
-  .ExternalClass {
-    width:100%;
-  }
-
-  .ExternalClass,
-  .ExternalClass p,
-  .ExternalClass span,
-  .ExternalClass font,
-  .ExternalClass td,
-  .ExternalClass div {
-    line-height: 100%;
-  }
-
-  #backgroundTable {
-    margin:0;
-    padding:0;
-    width:100% !important;
-    line-height: 100% !important;
-  }
-
-  img {
-    outline:none;
-    text-decoration:none;
-    -ms-interpolation-mode: bicubic;
-    width: auto;
-    max-width: 100%;
-    float: left;
-    clear: both;
-    display: block;
+  body {
+    width: 100% !important;
+    height: 100%;
+    margin: 0;
+    -webkit-text-size-adjust: none;
   }
 
-  center {
-    width: 100%;
-    min-width: 580px;
+  a {
+    color: #3869D4;
   }
 
   a img {
     border: none;
   }
 
-  p {
-    margin: 0 0 0 10px;
-  }
-
-  table {
-    border-spacing: 0;
-    border-collapse: collapse;
-  }
-
   td {
     word-break: break-word;
-    -webkit-hyphens: none;
-    -moz-hyphens: none;
-    hyphens: none;
-    border-collapse: collapse !important;
-  }
-
-  table, tr, td {
-    padding: 0;
-    vertical-align: top;
-    text-align: left;
   }
 
-  hr {
-    color: #d9d9d9;
-    background-color: #d9d9d9;
-    height: 1px;
-    border: none;
+  .preheader {
+    display: none !important;
+    visibility: hidden;
+    mso-hide: all;
+    font-size: 1px;
+    line-height: 1px;
+    max-height: 0;
+    max-width: 0;
+    opacity: 0;
+    overflow: hidden;
   }
 
-  /* Responsive Grid */
+  /* Type ------------------------------ */
 
-  table.body {
-    height: 100%;
-    width: 100%;
+  body,
+  td,
+  th {
+    font-family: "Nunito Sans", Helvetica, Arial, sans-serif;
   }
 
-  table.container {
-    width: 580px;
-    margin: 0 auto;
-    text-align: inherit;
+  h1 {
+    margin-top: 0;
+    color: #333333;
+    font-size: 22px;
+    font-weight: bold;
+    text-align: left;
   }
 
-  table.row {
-    padding: 0px;
-    width: 100%;
-    position: relative;
+  h2 {
+    margin-top: 0;
+    color: #333333;
+    font-size: 16px;
+    font-weight: bold;
+    text-align: left;
   }
 
-  table.container table.row {
-    display: block;
+  h3 {
+    margin-top: 0;
+    color: #333333;
+    font-size: 14px;
+    font-weight: bold;
+    text-align: left;
   }
 
-  td.wrapper {
-    padding: 10px 20px 0px 0px;
-    position: relative;
+  td,
+  th {
+    font-size: 16px;
   }
 
-  table.columns,
-  table.column {
-    margin: 0 auto;
+  p,
+  ul,
+  ol,
+  blockquote {
+    margin: .4em 0 1.1875em;
+    font-size: 16px;
+    line-height: 1.625;
   }
 
-  table.columns td,
-  table.column td {
-    padding: 0px 0px 10px;
-  }
-
-  table.columns td.sub-columns,
-  table.column td.sub-columns,
-  table.columns td.sub-column,
-  table.column td.sub-column {
-    padding-right: 10px;
-  }
-
-  td.sub-column, td.sub-columns {
-    min-width: 0px;
-  }
-
-  table.row td.last,
-  table.container td.last {
-    padding-right: 0px;
-  }
-
-  table.one { width: 30px; }
-  table.two { width: 80px; }
-  table.three { width: 130px; }
-  table.four { width: 180px; }
-  table.five { width: 230px; }
-  table.six { width: 280px; }
-  table.seven { width: 330px; }
-  table.eight { width: 380px; }
-  table.nine { width: 430px; }
-  table.ten { width: 480px; }
-  table.eleven { width: 530px; }
-  table.twelve { width: 580px; }
-
-  table.one center { min-width: 30px; }
-  table.two center { min-width: 80px; }
-  table.three center { min-width: 130px; }
-  table.four center { min-width: 180px; }
-  table.five center { min-width: 230px; }
-  table.six center { min-width: 280px; }
-  table.seven center { min-width: 330px; }
-  table.eight center { min-width: 380px; }
-  table.nine center { min-width: 430px; }
-  table.ten center { min-width: 480px; }
-  table.eleven center { min-width: 530px; }
-  table.twelve center { min-width: 580px; }
-
-  table.one .panel center { min-width: 10px; }
-  table.two .panel center { min-width: 60px; }
-  table.three .panel center { min-width: 110px; }
-  table.four .panel center { min-width: 160px; }
-  table.five .panel center { min-width: 210px; }
-  table.six .panel center { min-width: 260px; }
-  table.seven .panel center { min-width: 310px; }
-  table.eight .panel center { min-width: 360px; }
-  table.nine .panel center { min-width: 410px; }
-  table.ten .panel center { min-width: 460px; }
-  table.eleven .panel center { min-width: 510px; }
-  table.twelve .panel center { min-width: 560px; }
-
-  .body .columns td.one,
-  .body .column td.one { width: 8.333333%; }
-  .body .columns td.two,
-  .body .column td.two { width: 16.666666%; }
-  .body .columns td.three,
-  .body .column td.three { width: 25%; }
-  .body .columns td.four,
-  .body .column td.four { width: 33.333333%; }
-  .body .columns td.five,
-  .body .column td.five { width: 41.666666%; }
-  .body .columns td.six,
-  .body .column td.six { width: 50%; }
-  .body .columns td.seven,
-  .body .column td.seven { width: 58.333333%; }
-  .body .columns td.eight,
-  .body .column td.eight { width: 66.666666%; }
-  .body .columns td.nine,
-  .body .column td.nine { width: 75%; }
-  .body .columns td.ten,
-  .body .column td.ten { width: 83.333333%; }
-  .body .columns td.eleven,
-  .body .column td.eleven { width: 91.666666%; }
-  .body .columns td.twelve,
-  .body .column td.twelve { width: 100%; }
-
-  td.offset-by-one { padding-left: 50px; }
-  td.offset-by-two { padding-left: 100px; }
-  td.offset-by-three { padding-left: 150px; }
-  td.offset-by-four { padding-left: 200px; }
-  td.offset-by-five { padding-left: 250px; }
-  td.offset-by-six { padding-left: 300px; }
-  td.offset-by-seven { padding-left: 350px; }
-  td.offset-by-eight { padding-left: 400px; }
-  td.offset-by-nine { padding-left: 450px; }
-  td.offset-by-ten { padding-left: 500px; }
-  td.offset-by-eleven { padding-left: 550px; }
-
-  td.expander {
-    visibility: hidden;
-    width: 0px;
-    padding: 0 !important;
+  p.sub {
+    font-size: 13px;
   }
 
-  table.columns .text-pad,
-  table.column .text-pad {
-    padding-left: 10px;
-    padding-right: 10px;
-  }
+  /* Utilities ------------------------------ */
 
-  table.columns .left-text-pad,
-  table.columns .text-pad-left,
-  table.column .left-text-pad,
-  table.column .text-pad-left {
-    padding-left: 10px;
+  .align-right {
+    text-align: right;
   }
 
-  table.columns .right-text-pad,
-  table.columns .text-pad-right,
-  table.column .right-text-pad,
-  table.column .text-pad-right {
-    padding-right: 10px;
+  .align-left {
+    text-align: left;
   }
 
-  /* Block Grid */
-
-  .block-grid {
-    width: 100%;
-    max-width: 580px;
+  .align-center {
+    text-align: center;
   }
 
-  .block-grid td {
+  /* Buttons ------------------------------ */
+
+  .button {
+    background-color: #3869D4;
+    border-top: 10px solid #3869D4;
+    border-right: 18px solid #3869D4;
+    border-bottom: 10px solid #3869D4;
+    border-left: 18px solid #3869D4;
     display: inline-block;
-    padding:10px;
+    color: #FFF;
+    text-decoration: none;
+    border-radius: 3px;
+    box-shadow: 0 2px 3px rgba(0, 0, 0, 0.16);
+    -webkit-text-size-adjust: none;
+    box-sizing: border-box;
   }
 
-  .two-up td {
-    width:270px;
+  .button--green {
+    background-color: #22BC66;
+    border-top: 10px solid #22BC66;
+    border-right: 18px solid #22BC66;
+    border-bottom: 10px solid #22BC66;
+    border-left: 18px solid #22BC66;
   }
 
-  .three-up td {
-    width:173px;
+  .button--red {
+    background-color: #FF6136;
+    border-top: 10px solid #FF6136;
+    border-right: 18px solid #FF6136;
+    border-bottom: 10px solid #FF6136;
+    border-left: 18px solid #FF6136;
   }
 
-  .four-up td {
-    width:125px;
+  @media only screen and (max-width: 500px) {
+    .button {
+      width: 100% !important;
+      text-align: center !important;
+    }
   }
 
-  .five-up td {
-    width:96px;
-  }
+  /* Attribute list ------------------------------ */
 
-  .six-up td {
-    width:76px;
+  .attributes {
+    margin: 0 0 21px;
   }
 
-  .seven-up td {
-    width:62px;
+  .attributes_content {
+    background-color: #F4F4F7;
+    padding: 16px;
   }
 
-  .eight-up td {
-    width:52px;
+  .attributes_item {
+    padding: 0;
   }
 
-  /* Alignment and Visibility Classes */
+  /* Related Items ------------------------------ */
 
-  table.center, td.center {
-    text-align: center;
+  .related {
+    width: 100%;
+    margin: 0;
+    padding: 25px 0 0 0;
+    -premailer-width: 100%;
+    -premailer-cellpadding: 0;
+    -premailer-cellspacing: 0;
   }
 
-  h1.center,
-  h2.center,
-  h3.center,
-  h4.center,
-  h5.center,
-  h6.center,
-  p.center {
-    text-align: center;
+  .related_item {
+    padding: 10px 0;
+    color: #CBCCCF;
+    font-size: 15px;
+    line-height: 18px;
   }
 
-  span.center {
+  .related_item-title {
     display: block;
-    width: 100%;
-    text-align: center;
-  }
-
-  img.center {
-    margin: 0 auto;
-    float: none;
+    margin: .5em 0 0;
   }
 
-  .show-for-small,
-  .hide-for-desktop {
-    display: none;
-    width:0;
-    mso-hide:all;
-    overflow:hidden;
+  .related_item-thumb {
+    display: block;
+    padding-bottom: 10px;
   }
 
-  .show-for-small *,
-  .hide-for-desktop * {
-  	mso-hide:all;
+  .related_heading {
+    border-top: 1px solid #CBCCCF;
+    text-align: center;
+    padding: 25px 0 10px;
   }
 
-  /* Typography */
+  /* Discount Code ------------------------------ */
 
-  body, table.body, h1, h2, h3, h4, h5, h6, p, td {
-    color: #222222;
-    font-family: Helvetica, Arial, sans-serif;
-    font-weight: normal;
-    padding:0;
+  .discount {
+    width: 100%;
     margin: 0;
-    text-align: left;
-    line-height: 1.3;
-  }
-
-  h1, h2, h3, h4, h5, h6 {
-    word-break: normal;
-  }
-
-  h1 {font-size: 40px;}
-  h2 {font-size: 36px;}
-  h3 {font-size: 32px;}
-  h4 {font-size: 28px;}
-  h5 {font-size: 24px;}
-  h6 {font-size: 20px;}
-  body, table.body, p, td {font-size: 14px;line-height:19px;}
-
-  p.lead, p.lede, p.leed {
-    font-size: 18px;
-    line-height:21px;
-  }
-
-  p {
-    margin-bottom: 10px;
-  }
-
-  small {
-    font-size: 10px;
+    padding: 24px;
+    -premailer-width: 100%;
+    -premailer-cellpadding: 0;
+    -premailer-cellspacing: 0;
+    background-color: #F4F4F7;
+    border: 2px dashed #CBCCCF;
   }
 
-  a {
-    color: #2ba6cb;
-    text-decoration: none;
+  .discount_heading {
+    text-align: center;
   }
 
-  a:hover {
-    color: #2795b6 !important;
+  .discount_body {
+    text-align: center;
+    font-size: 15px;
   }
 
-  a:active {
-    color: #2795b6 !important;
-  }
+  /* Social Icons ------------------------------ */
 
-  a:visited {
-    color: #2ba6cb !important;
-  }
-
-  h1 a,
-  h2 a,
-  h3 a,
-  h4 a,
-  h5 a,
-  h6 a {
-    color: #2ba6cb;
+  .social {
+    width: auto;
   }
 
-  h1 a:active,
-  h2 a:active,
-  h3 a:active,
-  h4 a:active,
-  h5 a:active,
-  h6 a:active {
-    color: #2ba6cb !important;
+  .social td {
+    padding: 0;
+    width: auto;
   }
 
-  h1 a:visited,
-  h2 a:visited,
-  h3 a:visited,
-  h4 a:visited,
-  h5 a:visited,
-  h6 a:visited {
-    color: #2ba6cb !important;
+  .social_icon {
+    height: 20px;
+    margin: 0 8px 10px 8px;
+    padding: 0;
   }
 
-  /* Panels */
-
-  .panel {
-    background: #f2f2f2;
-    border: 1px solid #d9d9d9;
-    padding: 10px !important;
-  }
+  /* Data table ------------------------------ */
 
-  .sub-grid table {
+  .purchase {
     width: 100%;
+    margin: 0;
+    -premailer-width: 100%;
+    -premailer-cellpadding: 0;
+    -premailer-cellspacing: 0;
   }
 
-  .sub-grid td.sub-columns {
-    padding-bottom: 0;
-  }
-
-  /* Buttons */
-
-  table.button,
-  table.tiny-button,
-  table.small-button,
-  table.medium-button,
-  table.large-button {
+  .purchase_content {
     width: 100%;
-    overflow: hidden;
-  }
-
-  table.button td,
-  table.tiny-button td,
-  table.small-button td,
-  table.medium-button td,
-  table.large-button td {
-    box-sizing:border-box;
-    -moz-box-sizing:border-box;
-    -webkit-box-sizing:border-box;
-    display: block;
-    width: auto !important;
-    text-align: center;
-    background: #2ba6cb;
-    border: 1px solid #2284a1;
-    color: #ffffff;
-    padding: 8px 0;
-    line-height: initial !important;
+    margin: 0;
+    -premailer-width: 100%;
+    -premailer-cellpadding: 0;
+    -premailer-cellspacing: 0;
   }
 
-  table.tiny-button td {
-    padding: 5px 0;
+  .purchase_item {
+    padding: 10px 4px;
+    color: #51545E;
+    font-size: 15px;
+    line-height: 18px;
+    width: 62%;
   }
 
-  table.small-button td {
-    padding: 8px 0;
+  .purchase_image {
+    width: 18%;
+    padding: 5px;
   }
 
-  table.medium-button td {
-    padding: 12px 0;
+  .purchase_item p {
+    margin: 0;
+    padding: 0.1em 0;
   }
 
-  table.large-button td {
-    padding: 21px 0;
+  .purchase_item--additional {
+    font-size: 12px;
   }
 
-  table.button td a,
-  table.tiny-button td a,
-  table.small-button td a,
-  table.medium-button td a,
-  table.large-button td a {
-    font-weight: bold;
-    text-decoration: none;
-    font-family: Helvetica, Arial, sans-serif;
-    color: #ffffff;
-    font-size: 16px;
-    display: block;
-    height: 100%;
-    width: 100%;
+  .purchase_heading {
+    padding-bottom: 8px;
+    border-bottom: 1px solid #EAEAEC;
   }
 
-  table.tiny-button td a {
+  .purchase_heading p {
+    margin: 0;
+    color: #85878E;
     font-size: 12px;
-    font-weight: normal;
   }
 
-  table.small-button td a {
-    font-size: 16px;
+  .purchase_footer {
+    padding-top: 15px;
+    border-top: 1px solid #EAEAEC;
   }
 
-  table.medium-button td a {
-    font-size: 20px;
+  .purchase_total {
+    margin: 0;
+    text-align: right;
+    font-weight: bold;
+    color: #333333;
   }
 
-  table.large-button td a {
-    font-size: 24px;
+  .purchase_total--label {
+    padding: 0 15px 0 0;
   }
 
-  table.button:hover td,
-  table.button:visited td,
-  table.button:active td {
-    background: #2795b6 !important;
+  body {
+    background-color: #F2F4F6;
+    color: #51545E;
   }
 
-  table.button:hover td a,
-  table.button:visited td a,
-  table.button:active td a {
-    color: #ffffff !important;
+  p {
+    color: #51545E;
   }
 
-  table.button:hover td,
-  table.tiny-button:hover td,
-  table.small-button:hover td,
-  table.medium-button:hover td,
-  table.large-button:hover td {
-    background: #2795b6 !important;
+  .email-wrapper {
+    width: 100%;
+    margin: 0;
+    padding: 0;
+    -premailer-width: 100%;
+    -premailer-cellpadding: 0;
+    -premailer-cellspacing: 0;
+    background-color: #F2F4F6;
   }
 
-  table.button:hover td a,
-  table.button:active td a,
-  table.button td a:visited,
-  table.tiny-button:hover td a,
-  table.tiny-button:active td a,
-  table.tiny-button td a:visited,
-  table.small-button:hover td a,
-  table.small-button:active td a,
-  table.small-button td a:visited,
-  table.medium-button:hover td a,
-  table.medium-button:active td a,
-  table.medium-button td a:visited,
-  table.large-button:hover td a,
-  table.large-button:active td a,
-  table.large-button td a:visited {
-    color: #ffffff !important;
+  .email-content {
+    width: 100%;
+    margin: 0;
+    padding: 0;
+    -premailer-width: 100%;
+    -premailer-cellpadding: 0;
+    -premailer-cellspacing: 0;
   }
 
-  table.secondary td {
-    background: #e9e9e9;
-    border-color: #d0d0d0;
-    color: #555555;
-  }
+  /* Masthead ----------------------- */
 
-  table.secondary td a {
-    color: #555555;
+  .email-masthead {
+    padding: 25px 0;
+    text-align: center;
   }
 
-  table.secondary:hover td {
-    background: #d0d0d0 !important;
-    color: #555555;
+  .email-masthead_logo {
+    width: 94px;
   }
 
-  table.secondary:hover td a,
-  table.secondary td a:visited,
-  table.secondary:active td a {
-    color: #555555 !important;
+  .email-masthead_name {
+    font-size: 16px;
+    font-weight: bold;
+    color: #A8AAAF;
+    text-decoration: none;
+    text-shadow: 0 1px 0 white;
   }
 
-  table.success td {
-    background: #5da423;
-    border-color: #457a1a;
-  }
+  /* Body ------------------------------ */
 
-  table.success:hover td {
-    background: #457a1a !important;
+  .email-body {
+    width: 100%;
+    margin: 0;
+    padding: 0;
+    -premailer-width: 100%;
+    -premailer-cellpadding: 0;
+    -premailer-cellspacing: 0;
   }
 
-  table.alert td {
-    background: #c60f13;
-    border-color: #970b0e;
+  .email-body_inner {
+    width: 570px;
+    margin: 0 auto;
+    padding: 0;
+    -premailer-width: 570px;
+    -premailer-cellpadding: 0;
+    -premailer-cellspacing: 0;
+    background-color: #FFFFFF;
   }
 
-  table.alert:hover td {
-    background: #970b0e !important;
+  .email-footer {
+    width: 570px;
+    margin: 0 auto;
+    padding: 0;
+    -premailer-width: 570px;
+    -premailer-cellpadding: 0;
+    -premailer-cellspacing: 0;
+    text-align: center;
   }
 
-  table.radius td {
-    -webkit-border-radius: 3px;
-    -moz-border-radius: 3px;
-    border-radius: 3px;
+  .email-footer p {
+    color: #A8AAAF;
   }
 
-  table.round td {
-    -webkit-border-radius: 500px;
-    -moz-border-radius: 500px;
-    border-radius: 500px;
+  .body-action {
+    width: 100%;
+    margin: 30px auto;
+    padding: 0;
+    -premailer-width: 100%;
+    -premailer-cellpadding: 0;
+    -premailer-cellspacing: 0;
+    text-align: center;
   }
 
-  /* Outlook First */
+  .body-sub {
+    margin-top: 25px;
+    padding-top: 25px;
+    border-top: 1px solid #EAEAEC;
+  }
 
-  body.outlook p {
-    display: inline !important;
+  .content-cell {
+    padding: 40px;
   }
 
-  /*  Media Queries */
+  /*Media Queries ------------------------------ */
 
   @media only screen and (max-width: 600px) {
-
-    table[class="body"] img {
-      max-width: auto !important;
-      max-height: auto !important;
-    }
-
-    table[class="body"] center {
-      min-width: 0 !important;
-    }
-
-    table[class="body"] .container {
-      width: 95% !important;
-    }
-
-    table[class="body"] .row {
+    .email-body_inner,
+    .email-footer {
       width: 100% !important;
-      display: block !important;
-    }
-
-    table[class="body"] .wrapper {
-      display: block !important;
-      padding-right: 0 !important;
-    }
-
-    table[class="body"] .columns,
-    table[class="body"] .column {
-      table-layout: fixed !important;
-      float: none !important;
-      width: 100% !important;
-      padding-right: 0px !important;
-      padding-left: 0px !important;
-      display: block !important;
-    }
-
-    table[class="body"] .wrapper.first .columns,
-    table[class="body"] .wrapper.first .column {
-      display: table !important;
-    }
-
-    table[class="body"] table.columns td,
-    table[class="body"] table.column td {
-      width: 100% !important;
-    }
-
-    table[class="body"] .columns td.one,
-    table[class="body"] .column td.one { width: 8.333333% !important; }
-    table[class="body"] .columns td.two,
-    table[class="body"] .column td.two { width: 16.666666% !important; }
-    table[class="body"] .columns td.three,
-    table[class="body"] .column td.three { width: 25% !important; }
-    table[class="body"] .columns td.four,
-    table[class="body"] .column td.four { width: 33.333333% !important; }
-    table[class="body"] .columns td.five,
-    table[class="body"] .column td.five { width: 41.666666% !important; }
-    table[class="body"] .columns td.six,
-    table[class="body"] .column td.six { width: 50% !important; }
-    table[class="body"] .columns td.seven,
-    table[class="body"] .column td.seven { width: 58.333333% !important; }
-    table[class="body"] .columns td.eight,
-    table[class="body"] .column td.eight { width: 66.666666% !important; }
-    table[class="body"] .columns td.nine,
-    table[class="body"] .column td.nine { width: 75% !important; }
-    table[class="body"] .columns td.ten,
-    table[class="body"] .column td.ten { width: 83.333333% !important; }
-    table[class="body"] .columns td.eleven,
-    table[class="body"] .column td.eleven { width: 91.666666% !important; }
-    table[class="body"] .columns td.twelve,
-    table[class="body"] .column td.twelve { width: 100% !important; }
-
-    table[class="body"] td.offset-by-one,
-    table[class="body"] td.offset-by-two,
-    table[class="body"] td.offset-by-three,
-    table[class="body"] td.offset-by-four,
-    table[class="body"] td.offset-by-five,
-    table[class="body"] td.offset-by-six,
-    table[class="body"] td.offset-by-seven,
-    table[class="body"] td.offset-by-eight,
-    table[class="body"] td.offset-by-nine,
-    table[class="body"] td.offset-by-ten,
-    table[class="body"] td.offset-by-eleven {
-      padding-left: 0 !important;
-    }
-
-    table[class="body"] table.columns td.expander {
-      width: 1px !important;
     }
+  }
 
-    table[class="body"] .right-text-pad,
-    table[class="body"] .text-pad-right {
-      padding-left: 10px !important;
+  @media (prefers-color-scheme: dark) {
+    body,
+    .email-body,
+    .email-body_inner,
+    .email-content,
+    .email-wrapper,
+    .email-masthead,
+    .email-footer {
+      background-color: #333333 !important;
+      color: #FFF !important;
     }
 
-    table[class="body"] .left-text-pad,
-    table[class="body"] .text-pad-left {
-      padding-right: 10px !important;
+    p,
+    ul,
+    ol,
+    blockquote,
+    h1,
+    h2,
+    h3 {
+      color: #FFF !important;
     }
 
-    table[class="body"] .hide-for-small,
-    table[class="body"] .show-for-desktop {
-      display: none !important;
+    .attributes_content,
+    .discount {
+      background-color: #222 !important;
     }
 
-    table[class="body"] .show-for-small,
-    table[class="body"] .hide-for-desktop {
-      display : block !important;
-      width : auto !important;
-      overflow : visible !important;
+    .email-masthead_name {
+      text-shadow: none !important;
     }
   }
 </style>
-
-<style>
-
-  table[class="body"] {
-    margin-top: 20px;
-  }
-
-  .template-label {
-    font-weight: bold;
-    font-size: 11px;
-  }
-
-  .callout .wrapper {
-    padding-bottom: 20px;
-  }
-
-  .callout .panel {
-    background: #ECF8FF;
-    border-color: #b9e5ff;
-  }
-
-  .header {
-    background: #fff;
-  }
-
-  .footer .wrapper {
-    background: #ebebeb;
-  }
-
-  .footer h5 {
-    padding-bottom: 10px;
-  }
-
-  table.columns .text-pad {
-    padding-left: 10px;
-    padding-right: 10px;
-  }
-
-  table.columns .left-text-pad {
-    padding-left: 10px;
-  }
-
-  table.columns .right-text-pad {
-    padding-right: 10px;
-  }
-
-  td.right {
-    text-align: right;
-  }
-
-  @media only screen and (max-width: 600px) {
-
-    table[class="body"] .right-text-pad {
-      padding-left: 10px !important;
-    }
-
-    table[class="body"] .left-text-pad {
-      padding-right: 10px !important;
-    }
-
-    .logo {
-      margin-left: auto;
-      margin-right: auto;
-      float: none !important;
-    }
+<!--[if mso]>
+<style type="text/css">
+  .f-fallback {
+    font-family: Arial, sans-serif;
   }
 </style>
+<![endif]-->