From 468a594e91a8b314277ce1ba3a193a95eb0cefb8 Mon Sep 17 00:00:00 2001
From: Nathan Broadbent <nathan.f77@gmail.com>
Date: Tue, 13 Sep 2011 22:31:19 +0800
Subject: [PATCH] Updated actionmailer_inline_css, replaced 'embedded_style_tag' with more conventional 'stylesheet_link_tag'

---
 Gemfile                            |  2 +-
 Gemfile.lock                       |  9 +++++----
 app/views/layouts/mailer.html.haml |  2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index 759da1e..e5b7694 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,7 +16,7 @@ gem 'octokit'
 gem 'inherited_resources'
 gem 'SystemTimer', :platform => :ruby_18
 gem 'hoptoad_notifier', "~> 2.4"
-gem 'actionmailer_inline_css', ">= 1.0.1"
+gem 'actionmailer_inline_css', "~> 1.1.0"
 
 platform :ruby do
   gem 'bson_ext', '~> 1.3.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index 9c10f44..a53512b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -13,7 +13,7 @@ GEM
     actionmailer (3.0.10)
       actionpack (= 3.0.10)
       mail (~> 2.2.19)
-    actionmailer_inline_css (1.0.1)
+    actionmailer_inline_css (1.1.0)
       actionmailer (>= 3.0.0)
       nokogiri (>= 1.4.4)
       premailer (>= 1.7.1)
@@ -49,7 +49,8 @@ GEM
     builder (2.1.2)
     columnize (0.3.4)
     crack (0.1.8)
-    css_parser (1.1.9)
+    css_parser (1.2.5)
+      addressable
     daemons (1.1.4)
     database_cleaner (0.6.7)
     devise (1.4.2)
@@ -127,7 +128,7 @@ GEM
       nokogiri (~> 1.4.1)
       rest-client (~> 1.5.1)
     polyglot (0.3.2)
-    premailer (1.7.1)
+    premailer (1.7.3)
       css_parser (>= 1.1.9)
       htmlentities (>= 4.0.0)
     rack (1.2.3)
@@ -213,7 +214,7 @@ PLATFORMS
 
 DEPENDENCIES
   SystemTimer
-  actionmailer_inline_css (>= 1.0.1)
+  actionmailer_inline_css (~> 1.1.0)
   bson_ext (~> 1.3.1)
   database_cleaner (~> 0.6.0)
   devise (~> 1.4.0)
diff --git a/app/views/layouts/mailer.html.haml b/app/views/layouts/mailer.html.haml
index 92edb9c..bddd0ee 100644
--- a/app/views/layouts/mailer.html.haml
+++ b/app/views/layouts/mailer.html.haml
@@ -1,7 +1,7 @@
 %html
   %head
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    = embedded_style_tag
+    = stylesheet_link_tag 'mailers/mailer'
   %body(leftmargin="0" marginwidth="0" topmargin="0" marginheight="0" offset="0")
     %center
       %table(cellpadding="0" cellspacing="0" border="0" width="100%")
--
libgit2 0.21.2