summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2017-01-19 20:24:51 +0000
committerJames Lopez <james@jameslopez.es>2017-01-20 10:16:52 +0100
commitce591492bda4570c0547cddcfeda060eabe2b797 (patch)
tree3e8fb209bd1f67cd7bdee0d8cca83ccd352fb79f
parenta7dc1b5eb2aed64d63983beb995a19cda638a8f8 (diff)
downloadgitlab-ce-ce591492bda4570c0547cddcfeda060eabe2b797.tar.gz
Merge branch '26472-math-margin' into 'master'
Add margin to math blocks Closes #26472 See merge request !8543
-rw-r--r--app/assets/stylesheets/framework/typography.scss2
-rw-r--r--changelogs/unreleased/26472-math-margin.yml4
2 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss
index bd58a26f429..54958973f15 100644
--- a/app/assets/stylesheets/framework/typography.scss
+++ b/app/assets/stylesheets/framework/typography.scss
@@ -10,7 +10,7 @@
max-width: 100%;
}
- *:first-child {
+ *:first-child:not(.katex-display) {
margin-top: 0;
}
diff --git a/changelogs/unreleased/26472-math-margin.yml b/changelogs/unreleased/26472-math-margin.yml
new file mode 100644
index 00000000000..3999f521558
--- /dev/null
+++ b/changelogs/unreleased/26472-math-margin.yml
@@ -0,0 +1,4 @@
+---
+title: Add margin to markdown math blocks
+merge_request:
+author: