Download as
Browse Code »

Commit 468a594e91a8b314277ce1ba3a193a95eb0cefb8

Authored by Nathan Broadbent
1 parent c1b84ee1
Exists in master and in 1 other branch production

Updated actionmailer_inline_css, replaced 'embedded_style_tag' with more convent… 

…ional 'stylesheet_link_tag'
Showing 3 changed files with 7 additions and 6 deletions   Show diff stats
@@ -16,7 +16,7 @@ gem 'octokit' @@ -16,7 +16,7 @@ gem 'octokit'
16 gem 'inherited_resources' 16 gem 'inherited_resources'
17 gem 'SystemTimer', :platform => :ruby_18 17 gem 'SystemTimer', :platform => :ruby_18
18 gem 'hoptoad_notifier', "~> 2.4" 18 gem 'hoptoad_notifier', "~> 2.4"
19 -gem 'actionmailer_inline_css', ">= 1.0.1" 19 +gem 'actionmailer_inline_css', "~> 1.1.0"
20 20
21 platform :ruby do 21 platform :ruby do
22 gem 'bson_ext', '~> 1.3.1' 22 gem 'bson_ext', '~> 1.3.1'
@@ -13,7 +13,7 @@ GEM @@ -13,7 +13,7 @@ GEM
13 actionmailer (3.0.10) 13 actionmailer (3.0.10)
14 actionpack (= 3.0.10) 14 actionpack (= 3.0.10)
15 mail (~> 2.2.19) 15 mail (~> 2.2.19)
16 - actionmailer_inline_css (1.0.1) 16 + actionmailer_inline_css (1.1.0)
17 actionmailer (>= 3.0.0) 17 actionmailer (>= 3.0.0)
18 nokogiri (>= 1.4.4) 18 nokogiri (>= 1.4.4)
19 premailer (>= 1.7.1) 19 premailer (>= 1.7.1)
@@ -49,7 +49,8 @@ GEM @@ -49,7 +49,8 @@ GEM
49 builder (2.1.2) 49 builder (2.1.2)
50 columnize (0.3.4) 50 columnize (0.3.4)
51 crack (0.1.8) 51 crack (0.1.8)
52 - css_parser (1.1.9) 52 + css_parser (1.2.5)
  53 + addressable
53 daemons (1.1.4) 54 daemons (1.1.4)
54 database_cleaner (0.6.7) 55 database_cleaner (0.6.7)
55 devise (1.4.2) 56 devise (1.4.2)
@@ -127,7 +128,7 @@ GEM @@ -127,7 +128,7 @@ GEM
127 nokogiri (~> 1.4.1) 128 nokogiri (~> 1.4.1)
128 rest-client (~> 1.5.1) 129 rest-client (~> 1.5.1)
129 polyglot (0.3.2) 130 polyglot (0.3.2)
130 - premailer (1.7.1) 131 + premailer (1.7.3)
131 css_parser (>= 1.1.9) 132 css_parser (>= 1.1.9)
132 htmlentities (>= 4.0.0) 133 htmlentities (>= 4.0.0)
133 rack (1.2.3) 134 rack (1.2.3)
@@ -213,7 +214,7 @@ PLATFORMS @@ -213,7 +214,7 @@ PLATFORMS
213 214
214 DEPENDENCIES 215 DEPENDENCIES
215 SystemTimer 216 SystemTimer
216 - actionmailer_inline_css (>= 1.0.1) 217 + actionmailer_inline_css (~> 1.1.0)
217 bson_ext (~> 1.3.1) 218 bson_ext (~> 1.3.1)
218 database_cleaner (~> 0.6.0) 219 database_cleaner (~> 0.6.0)
219 devise (~> 1.4.0) 220 devise (~> 1.4.0)
app/views/layouts/mailer.html.haml
  Diff comments   View file @468a594
1 %html 1 %html
2 %head 2 %head
3 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> 3 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
4 - = embedded_style_tag 4 + = stylesheet_link_tag 'mailers/mailer'
5 %body(leftmargin="0" marginwidth="0" topmargin="0" marginheight="0" offset="0") 5 %body(leftmargin="0" marginwidth="0" topmargin="0" marginheight="0" offset="0")
6 %center 6 %center
7 %table(cellpadding="0" cellspacing="0" border="0" width="100%") 7 %table(cellpadding="0" cellspacing="0" border="0" width="100%")