diff options
| author | Phil Hughes <me@iamphill.com> | 2017-07-20 08:36:00 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-07-20 08:36:00 +0000 |
| commit | 445cd22c72ca6fbfdcf18d67fa859c4b5b9e2a6c (patch) | |
| tree | af07e15306e3f8c44b80aa7f04b5fd4e1df22c6a | |
| parent | ad56ae0d17780483b3c71625d24074a90b77f354 (diff) | |
| parent | 7a7bcd1716b4e9489ac31ad9e6d8ccdeb961b1ae (diff) | |
| download | gitlab-ce-pawel/support-specific-colors-for-given-time-series-34629.tar.gz | |
Merge branch '33770-respect-blockquote-line-breaks' into 'master'pawel/support-specific-colors-for-given-time-series-34629
Respect blockquote line breaks in markdown
Closes #33770
See merge request !12977
| -rw-r--r-- | app/assets/stylesheets/framework/typography.scss | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/33770-respect-blockquote-line-breaks.yml | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss index 77b7d901f9a..8a58c1ed567 100644 --- a/app/assets/stylesheets/framework/typography.scss +++ b/app/assets/stylesheets/framework/typography.scss @@ -116,9 +116,12 @@ blockquote p { color: $gl-grayish-blue !important; - margin: 0; font-size: inherit; line-height: 1.5; + + &:last-child { + margin: 0; + } } p { diff --git a/changelogs/unreleased/33770-respect-blockquote-line-breaks.yml b/changelogs/unreleased/33770-respect-blockquote-line-breaks.yml new file mode 100644 index 00000000000..3a45ad88270 --- /dev/null +++ b/changelogs/unreleased/33770-respect-blockquote-line-breaks.yml @@ -0,0 +1,4 @@ +--- +title: Respect blockquote line breaks in markdown +merge_request: +author: |