Merge pull request #497 from opscode/responsive-email

Allow emails to be responsive
chef · Jun 24, 2014 · 219929e · 219929e
2 parents 9090d5e + 9cd9662
commit 219929e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/app/assets/stylesheets/mailers.css.scss b/app/assets/stylesheets/mailers.css.scss
@@ -59,7 +59,11 @@ a { color: #404248; }
 /* Chef Styles */
 #wrapper { background-color: #eeeeee; }
 
-.content { margin-bottom: 30px; }
+.content {
+  margin-bottom: 30px;
+  width: 80%;
+  max-width: 720px;
+}
 
 .header {
   height: 120px;
@@ -112,6 +116,11 @@ a { color: #404248; }
 .icon {
   display: inline-block;
   margin: 4px 8px -2px 0;
+  background: #ECEDEF;
+  padding: 2px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  -webkit-border-radius:4px;
 }
 
 .panel {
@@ -162,11 +171,12 @@ a { color: #404248; }
 .button:hover, .button-small:hover { opacity: .8; }
 .button:hover, .button-small:hover{ opacity:.8; }
 .lightbutton { background-color: #a0a9ba; }
-.signedcla { background-color: #f79005; float: right; margin: -35px 0 0 0; }
+.signedcla { background-color: #f79005; }
 
 .accept {
   background-color: #43AC6A;
   padding: 0 50px;
+  margin-bottom: 10px;
 }
 
 .decline {

diff --git a/app/views/cla_signature_mailer/ccla_signature_notification_email.html.erb b/app/views/cla_signature_mailer/ccla_signature_notification_email.html.erb
@@ -1,5 +1,5 @@
 <h1>A new CCLA has been signed.</h1>
-<%= link_to "View Signed CCLA", ccla_signature_url(@ccla_signature), class: "button signedcla" %>
 <p><%= @ccla_signature.name %> signed a CCLA on behalf of <%= @ccla_signature.company %>.</p>
+<%= link_to "View Signed CCLA", ccla_signature_url(@ccla_signature), class: "button signedcla" %>
 
 <%= render 'ccla_signature', signature: @ccla_signature %>
diff --git a/app/views/cla_signature_mailer/icla_signature_notification_email.html.erb b/app/views/cla_signature_mailer/icla_signature_notification_email.html.erb
@@ -1,5 +1,5 @@
 <h1>A new ICLA has been signed.</h1>
-<%= link_to "View Signed ICLA", icla_signature_url(@icla_signature), class: "button signedcla" %>
 <p><%= @icla_signature.name %> signed an ICLA.</p>
+<%= link_to "View Signed ICLA", icla_signature_url(@icla_signature), class: "button signedcla" %>
 
 <%= render 'icla_signature', signature: @icla_signature %>
diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb
@@ -11,7 +11,7 @@
   <table cellpadding="0" cellspacing="0" border="0" width="100%" id="wrapper">
     <tr>
       <td align="center">
-        <table class="content" cellpadding="0" cellspacing="0" border="0" width="720">
+        <table class="content" cellpadding="0" cellspacing="0" border="0">
           <tr>
             <td class="header" align="center">
               <%= image_tag "logo_email.jpg", alt: "Chef Supermarket", title: "Chef Supermarket", width: 251, height: 63, class: "image_fix" %>