summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-02-11 14:40:35 +0000
committerRegis <boudinot.regis@yahoo.com>2017-02-14 15:30:49 -0700
commita3b438c973706da990acafb0346c06685401b144 (patch)
tree6788b7ba861488d2c6beba23c56a574652740924 /app
parentdbb530d1b293e7ed19aa7cc7a2427d12224eb061 (diff)
downloadgitlab-ce-a3b438c973706da990acafb0346c06685401b144.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
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/mailers/highlighted_diff_email.scss7
1 files changed, 7 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;
}