diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-06-05 03:19:24 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-06-05 03:19:24 +0000 |
| commit | e3ebcb68da1266f5b5ede1fd58fe3ffefeff7fa3 (patch) | |
| tree | 36f977208088b574ad5c927a61b37617b07bc449 | |
| parent | 6165f0f7f373f99381a57d66566d65e4ce5b7b7c (diff) | |
| parent | 5e7c0b65f4fb7849bb9e40e9b44141a72aa20ec9 (diff) | |
| download | gitlab-ce-e3ebcb68da1266f5b5ede1fd58fe3ffefeff7fa3.tar.gz | |
Merge branch '47115-fix-markdown-blockquote' into 'master'
Resolve "Markdown blockquote is not displaying properly"
Closes #47115
See merge request gitlab-org/gitlab-ce!19395
| -rw-r--r-- | app/assets/stylesheets/framework/typography.scss | 23 | ||||
| -rw-r--r-- | app/assets/stylesheets/mailers/highlighted_diff_email.scss | 1 |
2 files changed, 13 insertions, 11 deletions
diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss index 97b821e0cb9..9e77ea03a24 100644 --- a/app/assets/stylesheets/framework/typography.scss +++ b/app/assets/stylesheets/framework/typography.scss @@ -114,26 +114,27 @@ font-size: 0.95em; } + blockquote, .blockquote { color: $gl-grayish-blue; font-size: inherit; padding: 8px 24px; margin: 16px 0; border-left: 3px solid $white-dark; - } - .blockquote:dir(rtl) { - border-left: 0; - border-right: 3px solid $white-dark; - } + &:dir(rtl) { + border-left: 0; + border-right: 3px solid $white-dark; + } - .blockquote p { - color: $gl-grayish-blue !important; - font-size: inherit; - line-height: 1.5; + p { + color: $gl-grayish-blue !important; + font-size: inherit; + line-height: 1.5; - &:last-child { - margin: 0; + &:last-child { + margin: 0; + } } } diff --git a/app/assets/stylesheets/mailers/highlighted_diff_email.scss b/app/assets/stylesheets/mailers/highlighted_diff_email.scss index b5eda79e5ed..1835c4364d3 100644 --- a/app/assets/stylesheets/mailers/highlighted_diff_email.scss +++ b/app/assets/stylesheets/mailers/highlighted_diff_email.scss @@ -138,6 +138,7 @@ pre { margin: 0; } +blockquote, .blockquote { color: $gl-grayish-blue; padding: 0 0 0 15px; |