diff options
author | Douwe Maan <douwe@gitlab.com> | 2016-05-19 21:12:53 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2016-05-19 21:12:53 +0000 |
commit | 18ef054bc7eb14a7b817af5f66f140f2f3dd4ae6 (patch) | |
tree | eae7f19fb7c8f6b5009546ef3224e2558bd26560 /app/assets/stylesheets | |
parent | c50e7b1202f8a8534719ae266a53893e1ab3a2fa (diff) | |
parent | a9977f2b7a39d57d0633714616b4653aca103993 (diff) | |
download | gitlab-ce-18ef054bc7eb14a7b817af5f66f140f2f3dd4ae6.tar.gz |
Merge branch '17464-backport-email-syntax-highlighting' into 'master'
Syntax-highlight diffs in push emails
![image](/uploads/8ecbabc65382214b8de63aae24f66cea/image.png)
Based on:
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151
See merge request !4147
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r-- | app/assets/stylesheets/mailers/repository_push_email.scss | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/app/assets/stylesheets/mailers/repository_push_email.scss b/app/assets/stylesheets/mailers/repository_push_email.scss new file mode 100644 index 00000000000..001994db97b --- /dev/null +++ b/app/assets/stylesheets/mailers/repository_push_email.scss @@ -0,0 +1,43 @@ +@import "framework/variables"; + +table.code { + width: 100%; + font-family: monospace; + border: none; + border-collapse: separate; + margin: 0; + padding: 0; + -premailer-cellpadding: 0; + -premailer-cellspacing: 0; + -premailer-width: 100%; + + td { + line-height: $code_line_height; + font-family: monospace; + font-size: $code_font_size; + } + + td.diff-line-num { + margin: 0; + padding: 0; + border: none; + background: $background-color; + color: rgba(0, 0, 0, 0.3); + padding: 0 5px; + border-right: 1px solid $border-color; + text-align: right; + min-width: 35px; + max-width: 50px; + width: 35px; + } + + td.line_content { + display: block; + margin: 0; + padding: 0 0.5em; + border: none; + white-space: pre; + } +} + +@import "highlight/white"; |