diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-02-11 14:40:35 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-02-11 14:40:35 +0000 |
| commit | edb8ed36cd5ce315ca45a047bd06ab1dfcf44203 (patch) | |
| tree | e2a7dc28025c171d3d773e280c8871a0df3a06ac | |
| parent | 8a1441fb025bf9f46d42017e069382a44ade28d0 (diff) | |
| parent | cb40ed82e75e7e168a0788b198a11114fb61903b (diff) | |
| download | gitlab-ce-edb8ed36cd5ce315ca45a047bd06ab1dfcf44203.tar.gz | |
Merge branch '28029-improve-blockquote-formatting-on-emails' into 'master'
Resolve "Improve blockquote formatting in notification emails"
Closes #28029
See merge request !9157
| -rw-r--r-- | app/assets/stylesheets/mailers/highlighted_diff_email.scss | 7 | ||||
| -rw-r--r-- | changelogs/unreleased/28029-improve-blockquote-formatting-on-emails.yml | 4 |
2 files changed, 11 insertions, 0 deletions
diff --git a/app/assets/stylesheets/mailers/highlighted_diff_email.scss b/app/assets/stylesheets/mailers/highlighted_diff_email.scss index 60ff72c703e..ea40f449134 100644 --- a/app/assets/stylesheets/mailers/highlighted_diff_email.scss +++ b/app/assets/stylesheets/mailers/highlighted_diff_email.scss @@ -138,6 +138,13 @@ pre { margin: 0; } +blockquote { + color: $gl-grayish-blue; + padding: 0 0 0 15px; + margin: 0; + border-left: 3px solid $white-dark; +} + span.highlight_word { background-color: $highlighted-highlight-word !important; } diff --git a/changelogs/unreleased/28029-improve-blockquote-formatting-on-emails.yml b/changelogs/unreleased/28029-improve-blockquote-formatting-on-emails.yml new file mode 100644 index 00000000000..be2a0afbc52 --- /dev/null +++ b/changelogs/unreleased/28029-improve-blockquote-formatting-on-emails.yml @@ -0,0 +1,4 @@ +--- +title: Improve blockquote formatting in notification emails +merge_request: +author: |