Commit c7191cf5 authored by Beat Seeliger's avatar Beat Seeliger

Merge branch 'Changes/Email-Formatting-and-Email-Footer' into 'develop'

Changes/Email formatting and email footer

See merge request !883
parents 9df4d252 db99d2f5
Pipeline #32549 passed with stage
in 36 minutes and 10 seconds
......@@ -60,7 +60,7 @@ gem 'wkhtmltopdf-binary'
group :development do
gem 'awesome_print'
gem 'i18n_yaml_sorter'
gem 'letter_opener'
gem 'letter_opener_web', '~> 1.0'
gem 'overcommit', require: false
gem 'rubocop', require: false
gem 'scss_lint', require: false
......
......@@ -216,6 +216,10 @@ GEM
addressable (~> 2.3)
letter_opener (1.6.0)
launchy (~> 2.2)
letter_opener_web (1.3.4)
actionmailer (>= 3.2)
letter_opener (~> 1.0)
railties (>= 3.2)
libv8 (3.16.14.19)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
......@@ -475,7 +479,7 @@ DEPENDENCIES
jquery-rails
jquery-ui-rails
js-routes
letter_opener
letter_opener_web (~> 1.0)
listen
lodash-rails
mdb
......@@ -513,4 +517,4 @@ DEPENDENCIES
wkhtmltopdf-binary
BUNDLED WITH
1.16.6
1.17.1
......@@ -13,7 +13,6 @@ $a4-long-side: 297mm;
// Colours
$custom-red: #e63028;
$white: #fff;
$black: #000;
$dark: #333;
......
......@@ -8,32 +8,42 @@ html
box-sizing: border-box;
}
html, body {
font-family: sans-serif;
font-size: 16px;
font-family: Arial,Helvetica Neue, Helvetica, sans-serif;
font-size: 10px;
line-height: 1.4
}
h1 {
font-size: 28px;
font-size: 22px;
}
h2 {
font-size: 25px;
font-size: 19px;
}
h3 {
font-size: 23px;
font-size: 17px;
}
h4 {
font-size: 18px;
font-size: 12px;
margin-bottom: 2px;
margin-top: 8px;
}
h5 {
font-size: 17px;
font-size: 11px;
}
p {
font-size: 16px;
font-size: 10px;
margin-top: 2px;
}
hr {
border-color: #e63028;
}
p .red {
background: none;
color: #e63028;
}
body
= yield
= render 'application/footer'
......@@ -28,7 +28,7 @@ Rails.application.configure do
config.sass.inline_source_maps = true
## in order to activate letter_opener uncomment this line
# config.action_mailer.delivery_method = :letter_opener
config.action_mailer.delivery_method = :letter_opener_web
# Don't care if the mailer can't send.
config.action_mailer.raise_delivery_errors = false
......
......@@ -132,5 +132,7 @@ Rails.application.routes.draw do
post :download, on: :collection
end
mount LetterOpenerWeb::Engine, at: '/letter_opener' if Rails.env.development?
root 'application#home'
end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment