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