diff --git a/app/views/devise/mailer/invitation.html.haml b/app/views/devise/mailer/invitation.html.haml index ef582749e..735ee1088 100644 --- a/app/views/devise/mailer/invitation.html.haml +++ b/app/views/devise/mailer/invitation.html.haml @@ -2,45 +2,7 @@ %html %head %meta{"http-equiv"=>"Content-Type", :content=>"text/html; charset=utf-8"}/ - :css - body{ - width:600px; - font-family:'Arial','Helvetica',sans-serif; - font-size:14px; - color:#333; - } - #container{ - margin-bottom:25px - min-height:400px; - padding-left:15px; - } - header{ - background-color:#333; - padding: 15px; - margin-bottom: 25px; - } - p{ - padding:5px; - } - p.small{ - font-size:smaller; - color:#999; - font-style:italic; - } - a{ - color:#107FC9; - font-weight:bold; - } - a:hover{ - color: #22AAE0; - } - a:active{ - color: #005D9C; - } - .large_text{ - font-size:21px; - font-family:"Helvetica Neue",Arial,Helvetica,sans-serif; - } + = render :partial => 'notifier/notifier_css' %body %header = image_tag '/images/diaspora_white.png' diff --git a/spec/models/invitation_spec.rb b/spec/models/invitation_spec.rb index 9fa2e4362..ebe9e3e11 100644 --- a/spec/models/invitation_spec.rb +++ b/spec/models/invitation_spec.rb @@ -102,8 +102,7 @@ describe Invitation do it 'sends an email that includes the right things' do Devise.mailer.deliveries = [] Invitation.create_invitee(:email => @email) - Devise.mailer.deliveries.first.to_s.include?("Hello #{@email}").should == true - + Devise.mailer.deliveries.first.to_s.include?("Welcome #{@email}").should == true end end