summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <ClemMakesApps@gmail.com>2018-06-04 21:54:45 -0500
committerClement Ho <ClemMakesApps@gmail.com>2018-06-04 21:54:45 -0500
commit357e8744d67ebef880e8da6bed037257eee9ff24 (patch)
treefa70be6518f2e92c1749c3f936c935b38f4cb07e
parent2fbbb10a69eff1272229528915fbd5b4ff11c8ff (diff)
downloadgitlab-ce-47115-fix-markdown-blockquote.tar.gz
-rw-r--r--app/assets/stylesheets/framework/typography.scss3
-rw-r--r--app/assets/stylesheets/mailers/highlighted_diff_email.scss3
2 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss
index 1778b9164cd..9e77ea03a24 100644
--- a/app/assets/stylesheets/framework/typography.scss
+++ b/app/assets/stylesheets/framework/typography.scss
@@ -114,7 +114,8 @@
font-size: 0.95em;
}
- blockquote, .blockquote {
+ blockquote,
+ .blockquote {
color: $gl-grayish-blue;
font-size: inherit;
padding: 8px 24px;
diff --git a/app/assets/stylesheets/mailers/highlighted_diff_email.scss b/app/assets/stylesheets/mailers/highlighted_diff_email.scss
index 46843520a9b..1835c4364d3 100644
--- a/app/assets/stylesheets/mailers/highlighted_diff_email.scss
+++ b/app/assets/stylesheets/mailers/highlighted_diff_email.scss
@@ -138,7 +138,8 @@ pre {
margin: 0;
}
-blockquote, .blockquote {
+blockquote,
+.blockquote {
color: $gl-grayish-blue;
padding: 0 0 0 15px;
margin: 0;