Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'private-pull-request-1489' into develop

Browse source
This commit is contained in:
Thorsten Eckel 2017-10-18 11:37:50 +02:00
commit b43dff2be4
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/views/layouts/application.html.erb
View file

@ -3,6 +3,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=1024"> <meta name="viewport" content="width=1024">
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<title><%= Setting.get('product_name') %></title> <title><%= Setting.get('product_name') %></title>
<%= stylesheet_link_tag "application", :media => 'all' %> <%= stylesheet_link_tag "application", :media => 'all' %>
<%= stylesheet_link_tag "application-print", :media => 'print' %> <%= stylesheet_link_tag "application-print", :media => 'print' %>

1
config/initializers/html_email_style.rb
View file

@ -6,6 +6,7 @@ Rails.application.config.html_email_body = <<HERE
<html> <html>
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
<style type="text/css"> <style type="text/css">
body { body {
#{Rails.application.config.html_email_css_font}; #{Rails.application.config.html_email_css_font};