diff options
author | Douwe Maan <douwe@selenight.nl> | 2016-01-28 17:54:13 +0100 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2016-03-19 20:04:10 +0100 |
commit | a8aa59e96ef64a11073d7c84a9af93077f98bf8a (patch) | |
tree | 12c521bbf5fc005a88c62cbaeeafb547c107fe9b /app | |
parent | 0ce7c1e494403cba995b77cd9dec09d79256d13d (diff) | |
download | gitlab-ce-a8aa59e96ef64a11073d7c84a9af93077f98bf8a.tar.gz |
Inline mailer CSS using premailer.
# Conflicts:
# Gemfile.lock
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/stylesheets/notify.scss | 24 | ||||
-rw-r--r-- | app/views/layouts/notify.html.haml | 30 |
2 files changed, 27 insertions, 27 deletions
diff --git a/app/assets/stylesheets/notify.scss b/app/assets/stylesheets/notify.scss new file mode 100644 index 00000000000..f1d42f80f56 --- /dev/null +++ b/app/assets/stylesheets/notify.scss @@ -0,0 +1,24 @@ +img { + max-width: 100%; + height: auto; +} +p.details { + font-style:italic; + color:#777 +} +.footer p { + font-size:small; + color:#777 +} +pre.commit-message { + white-space: pre-wrap; +} +.file-stats a { + text-decoration: none; +} +.file-stats .new-file { + color: #090; +} +.file-stats .deleted-file { + color: #B00; +} diff --git a/app/views/layouts/notify.html.haml b/app/views/layouts/notify.html.haml index 37b4d562966..2997f59d946 100644 --- a/app/views/layouts/notify.html.haml +++ b/app/views/layouts/notify.html.haml @@ -1,33 +1,9 @@ %html{lang: "en"} %head %meta{content: "text/html; charset=utf-8", "http-equiv" => "Content-Type"} - %title - GitLab - :css - img { - max-width: 100%; - height: auto; - } - p.details { - font-style:italic; - color:#777 - } - .footer p { - font-size:small; - color:#777 - } - pre.commit-message { - white-space: pre-wrap; - } - .file-stats a { - text-decoration: none; - } - .file-stats .new-file { - color: #090; - } - .file-stats .deleted-file { - color: #B00; - } + %title + GitLab + = stylesheet_link_tag 'notify' %body %div.content = yield |