summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/mailers
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2016-08-17 14:16:29 +0100
committerSean McGivern <sean@gitlab.com>2016-08-17 15:55:34 +0100
commit18f13e8bb8b63b28efb7c3b53a3143a068806225 (patch)
treea34ed657f25a660ef2d9df6ac84c35cfcb20c8c0 /app/assets/stylesheets/mailers
parentd1da2e8180d92e5f4a8b5ebb36b0f4e4d0618bf8 (diff)
downloadgitlab-ce-18f13e8bb8b63b28efb7c3b53a3143a068806225.tar.gz
Fix email line-height in Outlookoutlook-email-spacing
Outlook seems to handle `white-space: pre` weirdly, so just use `pre` elements (but only for emails!).
Diffstat (limited to 'app/assets/stylesheets/mailers')
-rw-r--r--app/assets/stylesheets/mailers/repository_push_email.scss5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/stylesheets/mailers/repository_push_email.scss b/app/assets/stylesheets/mailers/repository_push_email.scss
index 33aedf1f7c1..5bfe9bcb443 100644
--- a/app/assets/stylesheets/mailers/repository_push_email.scss
+++ b/app/assets/stylesheets/mailers/repository_push_email.scss
@@ -45,7 +45,6 @@
.line_content {
padding-left: 0.5em;
padding-right: 0.5em;
- white-space: pre;
&.old {
background-color: $line-removed;
@@ -71,6 +70,10 @@
}
}
+pre {
+ margin: 0;
+}
+
span.highlight_word {
background-color: #fafe3d !important;
}